from:"crossley"

svn commit: r700348 - /forrest/trunk/bin/forrest

2008-09-29 Thread crossley

Author: crossley
Date: Mon Sep 29 22:53:04 2008
New Revision: 700348

URL: http://svn.apache.org/viewvc?rev=700348&view=rev
Log:
Fix a bug that came with r609578 resulting in CLASSPATH not being set properly.
This did not rear its head until i upgraded to Ant-1.7.1 (commit to follow soon)
where our 'validate-xdocs' task failed with OutOfMemoryError.
Need to investigate our Ant classpath settings. But anyway this works now.
Days of work for the sake of an "R" :-(

Modified:
forrest/trunk/bin/forrest

Modified: forrest/trunk/bin/forrest
URL: 
http://svn.apache.org/viewvc/forrest/trunk/bin/forrest?rev=700348&r1=700347&r2=700348&view=diff
==
--- forrest/trunk/bin/forrest (original)
+++ forrest/trunk/bin/forrest Mon Sep 29 22:53:04 2008
@@ -74,7 +74,7 @@
 else
   S=':'
   FORREST_DOT_HOME=$FORREST_HOME
-  FOREST_SHELL_HOME=$FORREST_HOME
+  FORREST_SHELL_HOME=$FORREST_HOME
 fi
 
 # set the ant file to use

svn commit: r699923 - /forrest/trunk/site-author/content/xdocs/docs_0_90/properties.xml

2008-09-28 Thread crossley

Author: crossley
Date: Sun Sep 28 16:51:24 2008
New Revision: 699923

URL: http://svn.apache.org/viewvc?rev=699923&view=rev
Log:
Show the localhost URLs for these property sets.
Issue: FOR-1117

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

Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/properties.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/properties.xml?rev=699923&r1=699922&r2=699923&view=diff
==
--- forrest/trunk/site-author/content/xdocs/docs_0_90/properties.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_90/properties.xml Sun Sep 28 
16:51:24 2008
@@ -58,11 +58,11 @@
 can return any object. This may cause ClassCastExceptions for the 
values.
   
   
-Properties of the 
project input 
-  module - used in the sitemap like 
+http://localhost:/module.properties.properties - 
Properties of the project input 
+  module - used in the sitemap like 
   {properties:content.xdocs}
-Properties of the date 
input 
-  module - we cast an object to a string, but the module 
returns 
+http://localhost:/module.date.properties - 
Properties of the date input 
+  module - we cast an object to a string, but the module returns 
   java.util.Date. This causes a ClassCastException.

svn commit: r699141 - /forrest/trunk/site-author/content/xdocs/docs_0_90/howto/howto-asf-mirror.xml

2008-09-25 Thread crossley

Author: crossley
Date: Thu Sep 25 17:46:34 2008
New Revision: 699141

URL: http://svn.apache.org/viewvc?rev=699141&view=rev
Log:
Fix a replacement which must have gone awry with a regex in r699039
("example comes" => "example.orges").
Issue: FOR-1115

Modified:
forrest/trunk/site-author/content/xdocs/docs_0_90/howto/howto-asf-mirror.xml

Modified: 
forrest/trunk/site-author/content/xdocs/docs_0_90/howto/howto-asf-mirror.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/howto/howto-asf-mirror.xml?rev=699141&r1=699140&r2=699141&view=diff
==
--- 
forrest/trunk/site-author/content/xdocs/docs_0_90/howto/howto-asf-mirror.xml 
(original)
+++ 
forrest/trunk/site-author/content/xdocs/docs_0_90/howto/howto-asf-mirror.xml 
Thu Sep 25 17:46:34 2008
@@ -147,7 +147,7 @@
 in your cli.xconf file ...
   
   
-This example.orges from $FORREST_HOME/site-author/conf/cli.xconf file.
+This example comes from $FORREST_HOME/site-author/conf/cli.xconf file.
 The path is relative to $FORREST_HOME/main/webapp/ directory. A full
 pathname should also work.

svn commit: r698812 - /forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt

2008-09-24 Thread crossley

Author: crossley
Date: Wed Sep 24 21:35:02 2008
New Revision: 698812

URL: http://svn.apache.org/viewvc?rev=698812&view=rev
Log:
Our ant upgrade notes used the wrong SVN revision number.

Modified:
forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt

Modified: forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt
URL: 
http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt?rev=698812&r1=698811&r2=698812&view=diff
==
--- forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt (original)
+++ forrest/trunk/tools/ant/bin/README-forrest-upgrade.txt Wed Sep 24 21:35:02 
2008
@@ -3,6 +3,6 @@
 We have some changes to the Ant scripts.
 See svn log for details.
 
-ant : r8757, r410743
-ant.bat : r8757, r410743
+ant : r8757, r410731
+ant.bat : r8757, r410731
 lcp.bat : r23058

svn propchange: r698746 - svn:log

2008-09-24 Thread crossley

Author: crossley
Revision: 698746
Modified property: svn:log

Modified: svn:log at Wed Sep 24 16:22:13 2008
--
--- svn:log (original)
+++ svn:log Wed Sep 24 16:22:13 2008
@@ -1 +1 @@
-I forgot to add this file as part of the commit to customise publication 
statement info - thanks to Pablo Barrera (ISSUE )
+I forgot to add this file as part of the commit to customise publication 
statement info - thanks to Pablo Barrera (ISSUE FOR-)

svn propchange: r698744 - svn:log

2008-09-24 Thread crossley

Author: crossley
Revision: 698744
Modified property: svn:log

Modified: svn:log at Wed Sep 24 16:21:40 2008
--
--- svn:log (original)
+++ svn:log Wed Sep 24 16:21:40 2008
@@ -1 +1 @@
-only show each link once Thanks to Pablo Barrera (ISSUE 1114)
+only show each link once Thanks to Pablo Barrera (ISSUE FOR-1114)

svn commit: r697445 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs: how/howto-dispatcher-quickstart.xml site.xml

2008-09-20 Thread crossley

Author: crossley
Date: Sat Sep 20 20:28:46 2008
New Revision: 697445

URL: http://svn.apache.org/viewvc?rev=697445&view=rev
Log:
Link to our issues page, rather than direct to jira.

Modified:

forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-quickstart.xml

forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml

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=697445&r1=697444&r2=697445&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
 Sat Sep 20 20:28:46 2008
@@ -298,7 +298,7 @@
   
   
   If you develop a new contract, please provide a patch via our 
-  https://issues.apache.org/jira";>issue tracker so that we 
+  issue tracker so that we 
   can include it in future releases of Forrest.
   
 

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=697445&r1=697444&r2=697445&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
 Sat Sep 20 20:28:46 2008
@@ -61,6 +61,7 @@
   
   
   
+

svn commit: r696120 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-quickstart.xml

2008-09-16 Thread crossley

Author: crossley
Date: Tue Sep 16 18:06:21 2008
New Revision: 696120

URL: http://svn.apache.org/viewvc?rev=696120&view=rev
Log:
Fixed references to an old Forrestbar menu.
Contributed by: Pablo Barrera
Issue: FOR-1106

Modified:

forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-quickstart.xml

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=696120&r1=696119&r2=696120&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
 Tue Sep 16 18:06:21 2008
@@ -146,7 +146,7 @@
   Add a default contract
   
 Forrest provides many default contracts. If you are using the 
Forrestbar
-then choose "Devs => ls.contracts". Otherwise visit
+then choose "dispatcher-devs => ls.contracts". Otherwise visit
 localhost:/ls.contracts.html
   
   
@@ -225,7 +225,7 @@
   
   
 See a list of your project-based contracts and their usage notes via
-Forrestbar "Devs => ls.contracts.project". Otherwise visit
+Forrestbar "dispatcher-devs => ls.contracts.project". Otherwise 
visit
 localhost:/ls.contracts.project.html

svn commit: r696118 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-quickstart.xml

2008-09-16 Thread crossley

Author: crossley
Date: Tue Sep 16 18:03:05 2008
New Revision: 696118

URL: http://svn.apache.org/viewvc?rev=696118&view=rev
Log:
Change the references to pelt-html.panel.xml to pelt-html.header.panel.xml
Contributed by: Pablo Barrera
Issue: FOR-1106

Modified:

forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-quickstart.xml

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=696118&r1=696117&r2=696118&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
 Tue Sep 16 18:03:05 2008
@@ -118,10 +118,10 @@
   
 Copy THEMER_PLUGIN/themes/pelt.fv into your project at
   ${themer.project.dir}/pelt.fv
-  
-Copy THEMER_PLUGIN/themes/pelt/panels/pelt-html.panel.xml into your
-  project at  ${themer.project.dir}/pelt/panels/pelt-html.panel.xml
-  
+
+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:/index.html ... See the same view, now structured
   by us.
@@ -137,7 +137,7 @@
 
   Remove a default contract
   
-Remove the top breadcrumb trail. Edit your pelt-html.panel.xml and 
find the
+Remove the top breadcrumb trail. Edit your 
pelt-html.header.panel.xml, find the
   "branding-breadcrumbs" contract and comment it out.

svn commit: r695122 - in /forrest/trunk/site-author: content/xdocs/docs_0_90/faq.xml content/xdocs/docs_0_90/validation.xml content/xdocs/howto-dev.xml status.xml

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 23:05:28 2008
New Revision: 695122

URL: http://svn.apache.org/viewvc?rev=695122&view=rev
Log:
forrest-core.xconf is now called cocoon.xconf
Issue: FOR-1091

Modified:
forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml
forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml
forrest/trunk/site-author/content/xdocs/howto-dev.xml
forrest/trunk/site-author/status.xml

Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml?rev=695122&r1=695121&r2=695122&view=diff
==
--- forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml Sat Sep 13 
23:05:28 2008
@@ -858,7 +858,7 @@
   Performance Tips and
   http://wiki.apache.org/cocoon/CocoonPerformance";>CocoonPerformance
   and the "Object Stores" section of
-  main/webapp/WEB-INF/forrest-core.xconf
+  main/webapp/WEB-INF/cocoon.xconf
 
 
   Responsiveness can be further enhanced by utilising a transparent

Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml?rev=695122&r1=695121&r2=695122&view=diff
==
--- forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml Sat Sep 13 
23:05:28 2008
@@ -282,7 +282,7 @@
 
   An additional system-wide catalog can be configured for use by
   multiple forrest-based projects. See the "local-catalog" parameter in
-  main/webapp/WEB-INF/xconf/forrest-core.xconf
+  main/webapp/WEB-INF/cocoon.xconf
 
 
   Projects can augment this with their own catalog file located in

Modified: forrest/trunk/site-author/content/xdocs/howto-dev.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/howto-dev.xml?rev=695122&r1=695121&r2=695122&view=diff
==
--- forrest/trunk/site-author/content/xdocs/howto-dev.xml (original)
+++ forrest/trunk/site-author/content/xdocs/howto-dev.xml Sat Sep 13 23:05:28 
2008
@@ -452,7 +452,7 @@
   
 Using Cocoon sitemap execution logger
 
-  In main/webapp/WEB-INF/xconf/forrest-core.xconf search for "sitemap
+  In main/webapp/WEB-INF/cocoon.xconf search for "sitemap
   execution" and uncomment the component. For each sitemap component
   that is executed, a message will go to 
WEB-INF/logs/sitemap-execution.log
 

Modified: forrest/trunk/site-author/status.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=695122&r1=695121&r2=695122&view=diff
==
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Sat Sep 13 23:05:28 2008
@@ -397,7 +397,7 @@
 
 

Updated the 
-forrest-core.xconf and declared the core components that are needed 
+cocoon.xconf and declared the core components that are needed 
 for flow. This makes it possible to use flow in forrest.

svn commit: r695118 - in /forrest/trunk/site-author: content/.htaccess content/xdocs/procedures/How_to_publish_docs.xml content/xdocs/roles.xml content/xdocs/site.xml content/xdocs/tasks.xml status.xm

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 22:46:04 2008
New Revision: 695118

URL: http://svn.apache.org/viewvc?rev=695118&view=rev
Log:
The term "project roles" is better as "project tasks".

Added:
forrest/trunk/site-author/content/xdocs/tasks.xml
  - copied, changed from r695097, 
forrest/trunk/site-author/content/xdocs/roles.xml
Removed:
forrest/trunk/site-author/content/xdocs/roles.xml
Modified:
forrest/trunk/site-author/content/.htaccess
forrest/trunk/site-author/content/xdocs/procedures/How_to_publish_docs.xml
forrest/trunk/site-author/content/xdocs/site.xml
forrest/trunk/site-author/status.xml

Modified: forrest/trunk/site-author/content/.htaccess
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/.htaccess?rev=695118&r1=695117&r2=695118&view=diff
==
--- forrest/trunk/site-author/content/.htaccess (original)
+++ forrest/trunk/site-author/content/.htaccess Sat Sep 13 22:46:04 2008
@@ -34,6 +34,7 @@
 Redirect /howto http://forrest.apache.org/docs_0_80/howto
 
 # Some moved documents
+RedirectMatch ^/roles(.*) http://forrest.apache.org/tasks$1
 
 # handle all DTDs etc.
 

Modified: 
forrest/trunk/site-author/content/xdocs/procedures/How_to_publish_docs.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/procedures/How_to_publish_docs.xml?rev=695118&r1=695117&r2=695118&view=diff
==
--- forrest/trunk/site-author/content/xdocs/procedures/How_to_publish_docs.xml 
(original)
+++ forrest/trunk/site-author/content/xdocs/procedures/How_to_publish_docs.xml 
Sat Sep 13 22:46:04 2008
@@ -40,8 +40,8 @@
 website.
   
   
-See other notes for the Documentation Coordinator
-role.
+See other notes for the Documentation Coordination
+tasks.
   
 
 

Modified: forrest/trunk/site-author/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/site.xml?rev=695118&r1=695117&r2=695118&view=diff
==
--- forrest/trunk/site-author/content/xdocs/site.xml (original)
+++ forrest/trunk/site-author/content/xdocs/site.xml Sat Sep 13 22:46:04 2008
@@ -62,7 +62,7 @@
 
   
   
-  
+  
 
   
   http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/tasks.xml?p2=forrest/trunk/site-author/content/xdocs/tasks.xml&p1=forrest/trunk/site-author/content/xdocs/roles.xml&r1=695097&r2=695118&rev=695118&view=diff
==
--- forrest/trunk/site-author/content/xdocs/roles.xml (original)
+++ forrest/trunk/site-author/content/xdocs/tasks.xml Sat Sep 13 22:46:04 2008
@@ -19,7 +19,7 @@
   "http://forrest.apache.org/dtd/document-v20.dtd";>
 
   
-Project roles
+Project tasks
   
   
 
@@ -27,13 +27,13 @@
   
 There are many tasks that need to be done to keep the project flowing.
 With the tasks being well-defined, the hope is that various people will
-be able to assist to carry out the role and so not rely on a couple of
+be able to assist to carry out the tasks and so not rely on a couple of
 individuals to do all the work.
   
   
 There are no roles for "leadership" of technical areas. We don't have
 the concept of leadership at the ASF. Rather these are "functional
-roles".
+tasks".
   
   
 This is not intended to put pressure on people to force them to do work
@@ -42,34 +42,34 @@
 healthy project.
   
   
-Most roles have minimal tasks and are not too onerous. For example, for
-the "Documentation Coordinator", the only job might be to publish the
+Most tasks are not too onerous. For example, for
+the "Documentation Coordination", the only job might be to publish the
 documentation every Friday. Sure it can be done at other times and 
other
 people can do it too, but at least it gets done once per week.
   
   
-Having a person doing a role does not mean that everyone can leave it 
to
+Having a person doing a task does not mean that everyone can leave it 
to
 them and rely on them. Anyone else can dive in and do the job (for
 example, publish the docs twice per week). The more people who are
-familiar with the role, the better. Perhaps the person who is primarily
-doing that role will notice that there can be improvements to how they
+familiar with the task, the better. Perhaps the person who is primarily
+doing that task will notice that there can be improvements to

svn commit: r695113 - in /forrest/trunk/whiteboard: cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/ dispatcher/java/org/apache/forrest/dispatcher/api/ dispatcher/java/org/apa

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 22:11:13 2008
New Revision: 695113

URL: http://svn.apache.org/viewvc?rev=695113&view=rev
Log:
Remove the few @author tags that have recently crept into our codebase.
Issue: FOR-855

Modified:

forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/ContractBeanDOMImpl.java

forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/api/ContractOld.java

forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/Loggable.java

forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/StAX.java

forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/DefaultContract.java

forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/ContractBeanDOMImpl.java

Modified: 
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/ContractBeanDOMImpl.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/ContractBeanDOMImpl.java?rev=695113&r1=695112&r2=695113&view=diff
==
--- 
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/ContractBeanDOMImpl.java
 (original)
+++ 
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/java/org/apache/forrest/dispatcher/ContractBeanDOMImpl.java
 Sat Sep 13 22:11:13 2008
@@ -41,7 +41,6 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author thorsten
  * 
  */
 public class ContractBeanDOMImpl extends Beans implements ContractBean {

Modified: 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/api/ContractOld.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/api/ContractOld.java?rev=695113&r1=695112&r2=695113&view=diff
==
--- 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/api/ContractOld.java
 (original)
+++ 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/api/ContractOld.java
 Sat Sep 13 22:11:13 2008
@@ -20,7 +20,6 @@
 import java.util.HashMap;
 
 /**
- * @author thorsten
  *
  */
 public interface ContractOld {

Modified: 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/Loggable.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/Loggable.java?rev=695113&r1=695112&r2=695113&view=diff
==
--- 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/Loggable.java
 (original)
+++ 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/Loggable.java
 Sat Sep 13 22:11:13 2008
@@ -22,7 +22,6 @@
 /**
  * Simple wrapper class to easier debug/log.
  * 
- * @author thorsten
  * @version 1.0
  */
 public class Loggable {
@@ -33,4 +32,4 @@
   protected Loggable() {
   }
 
-}
\ No newline at end of file
+}

Modified: 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/StAX.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/StAX.java?rev=695113&r1=695112&r2=695113&view=diff
==
--- 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/StAX.java
 (original)
+++ 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/StAX.java
 Sat Sep 13 22:11:13 2008
@@ -34,7 +34,6 @@
 /**
  * Helper class that eases the usage of StAX in your plugins.
  * 
- * @author thorsten
  * @version 1.0
  * 
  */

Modified: 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/DefaultContract.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/DefaultContract.java?rev=695113&r1=695112&r2=695113&view=diff
==
--- 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/DefaultContract.java
 (original)
+++ 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/DefaultContract.java
 Sat Sep 13 22:11:13 2008
@@ -23,7 +23,6 @@
 import org.apache.forrest.dispatcher.helper.ContractHelperStAX;
 
 /**
- * @author thorsten
  * 
  */
 public class DefaultContract implements ContractOld {

Modified: 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/ContractBeanDOMImpl.java
URL

svn commit: r695103 - in /forrest/trunk: main/webapp/WEB-INF/cocoon.xconf main/webapp/WEB-INF/logkit.xconf site-author/content/xdocs/howto-dev.xml

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 19:40:54 2008
New Revision: 695103

URL: http://svn.apache.org/viewvc?rev=695103&view=rev
Log:
Add a specific "sitemap-execution" log category.
(Note that this is already off by default.)
Added note about FOR-1109: Not available in Cocoon-2.1

Modified:
forrest/trunk/main/webapp/WEB-INF/cocoon.xconf
forrest/trunk/main/webapp/WEB-INF/logkit.xconf
forrest/trunk/site-author/content/xdocs/howto-dev.xml

Modified: forrest/trunk/main/webapp/WEB-INF/cocoon.xconf
URL: 
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/cocoon.xconf?rev=695103&r1=695102&r2=695103&view=diff
==
--- forrest/trunk/main/webapp/WEB-INF/cocoon.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/cocoon.xconf Sat Sep 13 19:40:54 2008
@@ -1018,13 +1018,14 @@
 
 
 
+
 
 
 

Modified: forrest/trunk/main/webapp/WEB-INF/logkit.xconf
URL: 
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/logkit.xconf?rev=695103&r1=695102&r2=695103&view=diff
==
--- forrest/trunk/main/webapp/WEB-INF/logkit.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/logkit.xconf Sat Sep 13 19:40:54 2008
@@ -251,6 +251,11 @@
   
 
 
+
+
+  
+
+
 
   
 

Modified: forrest/trunk/site-author/content/xdocs/howto-dev.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/howto-dev.xml?rev=695103&r1=695102&r2=695103&view=diff
==
--- forrest/trunk/site-author/content/xdocs/howto-dev.xml (original)
+++ forrest/trunk/site-author/content/xdocs/howto-dev.xml Sat Sep 13 19:40:54 
2008
@@ -454,8 +454,11 @@
 
   In main/webapp/WEB-INF/xconf/forrest-core.xconf search for "sitemap
   execution" and uncomment the component. For each sitemap component
-  that is executed, a message will go to WEB-INF/logs/debug.log
+  that is executed, a message will go to 
WEB-INF/logs/sitemap-execution.log
 
+
+See FOR-1109 - Not available in Cocoon-2.1
+
   
   
 Using Cocoon LogTransformer

svn propchange: r695018 - svn:log

2008-09-13 Thread crossley

Author: crossley
Revision: 695018
Modified property: svn:log

Modified: svn:log at Sat Sep 13 18:02:09 2008
--
--- svn:log (original)
+++ svn:log Sat Sep 13 18:02:09 2008
@@ -1,2 +1,2 @@
 Moving main location to the top and better exposing their function.
-issue 1105
+issue FOR-1105

svn commit: r694970 - /forrest/trunk/etc/publishing_our_site.txt

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 08:18:34 2008
New Revision: 694970

URL: http://svn.apache.org/viewvc?rev=694970&view=rev
Log:
Minor text tweaks.
Link to other info about publishing our site with forrestbot.

Modified:
forrest/trunk/etc/publishing_our_site.txt

Modified: forrest/trunk/etc/publishing_our_site.txt
URL: 
http://svn.apache.org/viewvc/forrest/trunk/etc/publishing_our_site.txt?rev=694970&r1=694969&r2=694970&view=diff
==
--- forrest/trunk/etc/publishing_our_site.txt (original)
+++ forrest/trunk/etc/publishing_our_site.txt Sat Sep 13 08:18:34 2008
@@ -4,25 +4,30 @@
 # Create $FORREST_HOME/deploy.svn.settings file. These credentials
 # are needed by forrestbot so that it can do your 'svn add'
 # and 'svn commit' etc. to the forrest/site/ repository.
+# Set its file permissions so that only you can read it.
 # The deploy.svn.settings file looks like:
 
 
   
-  
+  
 
 
 
 # Make changes to sources, and then test, then commit.
 # Use the forrestbot to build and then deploy to svn.apache.org ...
 
-cd site-author
-forrest -f publish.xml build
+]$ cd site-author
+]$ forrest -f publish.xml build
 # ... verify files in build/forrest-docs
-forrest -f publish.xml deploy -Ddeploy.svn.commit-message="my commit message"
+]$ forrest -f publish.xml deploy -Ddeploy.svn.commit-message="my commit 
message"
 
 Now the files are in SVN at forrest/site
-Periodically the real website files are updated from there.
-You do not have to do anything else.
+Periodically the real website files are automatically updated from there.
+You do not need to do anything else.
+
+For more information, see:
+http://forrest.apache.org/procedures/How_to_publish_docs.html
+http://forrest.apache.org/howto-forrestbot-svn.html
 
 --
 Note: The first time that you deploy, it will need to do

svn commit: r694968 - /forrest/trunk/main/webapp/WEB-INF/logkit.xconf

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 08:11:09 2008
New Revision: 694968

URL: http://svn.apache.org/viewvc?rev=694968&view=rev
Log:
Refer to wiki ConfiguringTheLogs.
Issue: FOR-1107

Modified:
forrest/trunk/main/webapp/WEB-INF/logkit.xconf

Modified: forrest/trunk/main/webapp/WEB-INF/logkit.xconf
URL: 
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/logkit.xconf?rev=694968&r1=694967&r2=694968&view=diff
==
--- forrest/trunk/main/webapp/WEB-INF/logkit.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/logkit.xconf Sat Sep 13 08:11:09 2008
@@ -16,6 +16,12 @@
   limitations under the License.
 -->
 
+

svn commit: r694962 - /forrest/trunk/main/webapp/WEB-INF/logkit.xconf

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 08:02:26 2008
New Revision: 694962

URL: http://svn.apache.org/viewvc?rev=694962&view=rev
Log:
Fix r694958 - meant to change "sitemap" category from WARN to ERROR.

Modified:
forrest/trunk/main/webapp/WEB-INF/logkit.xconf

Modified: forrest/trunk/main/webapp/WEB-INF/logkit.xconf
URL: 
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/logkit.xconf?rev=694962&r1=694961&r2=694962&view=diff
==
--- forrest/trunk/main/webapp/WEB-INF/logkit.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/logkit.xconf Sat Sep 13 08:02:26 2008
@@ -72,7 +72,7 @@
   false
 
 
-
+
   ${context-root}/WEB-INF/logs/sitemap-execution.log
   
 %7.7{priority} %{time}   [%{category}] (%{uri}) 
%{thread}/%{class:short}: %{message}\n%{throwable}
@@ -231,7 +231,7 @@
   
 
 
-
+

svn commit: r694958 - /forrest/trunk/main/webapp/WEB-INF/logkit.xconf

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 07:50:23 2008
New Revision: 694958

URL: http://svn.apache.org/viewvc?rev=694958&view=rev
Log:
Reduce "sitemap" category from WARN to INFO.

Modified:
forrest/trunk/main/webapp/WEB-INF/logkit.xconf

Modified: forrest/trunk/main/webapp/WEB-INF/logkit.xconf
URL: 
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/logkit.xconf?rev=694958&r1=694957&r2=694958&view=diff
==
--- forrest/trunk/main/webapp/WEB-INF/logkit.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/logkit.xconf Sat Sep 13 07:50:23 2008
@@ -231,7 +231,7 @@
   
 
 
-
+

svn commit: r694957 - /forrest/trunk/main/webapp/WEB-INF/logkit.xconf

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 07:35:19 2008
New Revision: 694957

URL: http://svn.apache.org/viewvc?rev=694957&view=rev
Log:
The "debug" log target was not being used by our previous Cocoon-2.2
and we were using that target for "sitemap-execution" messages at level DEBUG..
Now with Cocoon-2.1 it does use the "debug" target. So we were getting verbose.
The last commit added a specific "sitemap-execution" target, so now setting the
"debug" target to default WARN.
Issue: FOR-1107

Modified:
forrest/trunk/main/webapp/WEB-INF/logkit.xconf

Modified: forrest/trunk/main/webapp/WEB-INF/logkit.xconf
URL: 
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/logkit.xconf?rev=694957&r1=694956&r2=694957&view=diff
==
--- forrest/trunk/main/webapp/WEB-INF/logkit.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/logkit.xconf Sat Sep 13 07:35:19 2008
@@ -250,7 +250,7 @@
 
 
 
-
+

svn commit: r694955 - /forrest/trunk/main/webapp/WEB-INF/logkit.xconf

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 07:30:16 2008
New Revision: 694955

URL: http://svn.apache.org/viewvc?rev=694955&view=rev
Log:
Added "deprecation" log target.
Ensured all log targets have the same line format.
Removed duplicate "store" category.
Added some comments from Cocoon-2.1 logkit.xconf file.
Issue: FOR-1107

Modified:
forrest/trunk/main/webapp/WEB-INF/logkit.xconf

Modified: forrest/trunk/main/webapp/WEB-INF/logkit.xconf
URL: 
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/logkit.xconf?rev=694955&r1=694954&r2=694955&view=diff
==
--- forrest/trunk/main/webapp/WEB-INF/logkit.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/logkit.xconf Sat Sep 13 07:30:16 2008
@@ -35,7 +35,7 @@
   -->
   false
   
 
 
+
+  ${context-root}/WEB-INF/logs/deprecation.log
+  
+%7.7{priority} %{time}   [%{category}] (%{uri}) 
%{thread}/%{class:short}: %{message}\n
+  
+  false
+
+
+
+  ${context-root}/WEB-INF/logs/debug.log
+  
+%7.7{priority} %{time}   [%{category}] (%{uri}) 
%{thread}/%{class:short}: %{message}\n%{throwable}
+  
+  false
+
+
 
   ${context-root}/WEB-INF/logs/sitemap.log
+  
+%7.7{priority} %{time}   [%{category}] (%{uri}) 
%{thread}/%{class:short}: %{message}\n%{throwable}
+  
+  false
+
 
+
+  ${context-root}/WEB-INF/logs/sitemap-execution.log
   
 %7.7{priority} %{time}   [%{category}] (%{uri}) 
%{thread}/%{class:short}: %{message}\n%{throwable}
   
@@ -60,7 +83,7 @@
 
   ${context-root}/WEB-INF/logs/linkrewriter.log
   
-%7.7{priority} [%{category}] (%{uri}): %{message}\n%{throwable}
+%7.7{priority} %{time}   [%{category}] (%{uri}): 
%{message}\n%{throwable}
   
   false
 
@@ -68,7 +91,7 @@
 
   ${context-root}/WEB-INF/logs/locationmap.log
   
-%7.7{priority} [%{category}] (%{uri}): %{message}\n%{throwable}
+%7.7{priority} %{time}   [%{category}] (%{uri}): 
%{message}\n%{throwable}
   
   false
 
@@ -76,7 +99,7 @@
 
   ${context-root}/WEB-INF/logs/idgen.log
   
-%7.7{priority} [%{category}] (%{uri}) %{thread}/%{class:short}: 
%{message}\n%{throwable}
+%7.7{priority} %{time}   [%{category}] (%{uri}) 
%{thread}/%{class:short}: %{message}\n%{throwable}
   
   false
 
@@ -119,28 +142,30 @@
 false
   
 
-
- 
-  
-${context-root}/WEB-INF/logs/debug.log
-
-  %7.7{priority} %{time}   [%{category}] (%{uri}) 
%{thread}/%{class:short}: %{message}\n%{throwable}
-
-false
-  
   
 
+  
   
-
 
   
   
@@ -168,12 +193,6 @@
 
   
 
-  
-  
-
-
-  
-
   
   
 
@@ -225,15 +244,24 @@
   
   
 
-
+
+
+  
+
+
+
 
   
 
-  
+
+
 
   
   
 
-  
+

svn commit: r694911 - in /forrest/trunk/site-author/content/xdocs: howto-forrestbot-scp.xml howto-forrestbot-svn.xml

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 02:59:05 2008
New Revision: 694911

URL: http://svn.apache.org/viewvc?rev=694911&view=rev
Log:
Move the ""Further Reading" section to the bottom to use a "references" section.

Modified:
forrest/trunk/site-author/content/xdocs/howto-forrestbot-scp.xml
forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml

Modified: forrest/trunk/site-author/content/xdocs/howto-forrestbot-scp.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/howto-forrestbot-scp.xml?rev=694911&r1=694910&r2=694911&view=diff
==
--- forrest/trunk/site-author/content/xdocs/howto-forrestbot-scp.xml (original)
+++ forrest/trunk/site-author/content/xdocs/howto-forrestbot-scp.xml Sat Sep 13 
02:59:05 2008
@@ -177,10 +177,10 @@
   
 
   
-  
+  
 
   How to deploy documentation with the 
Forrestbot "svn" workstage
   Forrestbot - automated building and 
deploying
 
-  
+  
 

Modified: forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml?rev=694911&r1=694910&r2=694911&view=diff
==
--- forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml (original)
+++ forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml Sat Sep 13 
02:59:05 2008
@@ -184,12 +184,6 @@
   
 
   
-  
-
-  How to deploy documentation with the 
Forrestbot "scp" workstage
-  Forrestbot - automated building and 
deploying
-
-  
   
 Frequently Asked Questions
 
@@ -221,4 +215,10 @@
   
 
   
+  
+
+  How to deploy documentation with the 
Forrestbot "scp" workstage
+  Forrestbot - automated building and 
deploying
+
+

svn commit: r694910 - /forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 02:55:41 2008
New Revision: 694910

URL: http://svn.apache.org/viewvc?rev=694910&view=rev
Log:
Add an FAQs section to the howto.
- Why the svn warnings about "is already under version control".
- Why is every PDF document being deployed.

Modified:
forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml

Modified: forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml?rev=694910&r1=694909&r2=694910&view=diff
==
--- forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml (original)
+++ forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml Sat Sep 13 
02:55:41 2008
@@ -190,4 +190,35 @@
   Forrestbot - automated building and 
deploying
 
   
+  
+Frequently Asked Questions
+
+  General issues
+  
+
+  Why all the svn warnings about "is already under version control"
+
+
+  
+The deploy workstage does 'svn add' for all the generated documents
+that are new - in these cases the normal "A" messages will be 
issued.
+However it just blindly adds all documents that are either new or
+changed. So the warning messages are issued for the existing, 
updated
+documents.
+  
+
+  
+  
+
+  Why is every PDF document being deployed, even though they have not 
changed.
+
+
+  
+The PDF plugins FOP library is automatically adding a datestamp to
+every generated document. We need to find a solution.
+  
+
+  
+
+

svn commit: r694908 - in /forrest/trunk/site-author: ./ content/xdocs/ content/xdocs/docs_0_90/howto/ content/xdocs/procedures/ content/xdocs/tools/

2008-09-13 Thread crossley

Author: crossley
Date: Sat Sep 13 02:37:40 2008
New Revision: 694908

URL: http://svn.apache.org/viewvc?rev=694908&view=rev
Log:
Add two new docs:
"How to deploy documentation with the Forrestbot svn workstage" which
explains how the Apache Forrest project manages their project documentation,
"How to deploy documentation with the Forrestbot scp workstage" which
explains how to manage a personal or company website using Secure Shell
SCP to deploy the generated documents.

Added:
forrest/trunk/site-author/content/xdocs/howto-forrestbot-scp.xml   (with 
props)
forrest/trunk/site-author/content/xdocs/howto-forrestbot-svn.xml
  - copied, changed from r694674, 
forrest/trunk/site-author/content/xdocs/docs_0_90/howto/howto-forrestbot.xml
Removed:
forrest/trunk/site-author/content/xdocs/docs_0_90/howto/howto-forrestbot.xml
Modified:
forrest/trunk/site-author/content/xdocs/procedures/How_to_publish_docs.xml
forrest/trunk/site-author/content/xdocs/site.xml
forrest/trunk/site-author/content/xdocs/tools/forrestbot.xml
forrest/trunk/site-author/status.xml

Added: forrest/trunk/site-author/content/xdocs/howto-forrestbot-scp.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/howto-forrestbot-scp.xml?rev=694908&view=auto
==
--- forrest/trunk/site-author/content/xdocs/howto-forrestbot-scp.xml (added)
+++ forrest/trunk/site-author/content/xdocs/howto-forrestbot-scp.xml Sat Sep 13 
02:37:40 2008
@@ -0,0 +1,186 @@
+
+
+http://forrest.apache.org/dtd/howto-v20.dtd";>
+
+  
+How to deploy documentation with the Forrestbot "scp" 
workstage
+
+  This How-To describes the building and deployment of a documentation set
+  with the help of the forrestbot "scp" workstage.
+
+
+  
+  
+
+  Anyone who generates a static documentation set with Forrest will need
+  to deploy the results, whether that be to a remote server or locally.
+
+  
+  
+
+  This howto will explain one method of using the Forrestbot, by way of the
+  worked example for managing a company or private website, and using 
"Secure Copy (SCP)" to deploy to a remote webserver. The Forrestbot has a 
number of deployment methods. After you understand the principles then you will 
be able to apply that to whatever method is relevant.
+
+
+  The secondary purpose is to explain to ASF committers how to manage
+  project documentation, e.g. for an "Apache Labs" investigation.
+
+
+  This howto also explains the use of the Apache Cocoon "checksums" 
facility
+  to only process and deploy the changed files.
+
+  
+  
+
+  Refer to the Forrestbot documentation.
+  It is not necessary to have thorough knowledge, but a basic understanding
+  will help.
+
+
+  An account on a server configured to use SSH access.
+  e.g. http://apache.org/dev/new-committers-guide.html#ssh";>ASF 
Guide for new committers.
+
+
+  Review the Forrestbot svn howto 
documentation.
+  That explains more generally how to use a Forrestbot.
+
+
+  Therefore this "scp" howto can have minimal content.
+
+  
+  
+
+  Introduction
+  
+  This Forrestbot uses the "getsrc.local" workstage to retrieve the 
sources from the local project workspace filesystem, i.e. from the top-level of 
your Forrest project site.
+  
+  
+This Forrestbot uses the "deploy.scp" workstage to copy the generated 
documents
+to the remote server. They go into a "stage" directory on the web 
server
+which has a .htaccess file to enable selected people to review before 
putting into production.
+  
+
+
+  The deploy.scp.settings file
+  
+Create a file at the top-level of your project site named
+deploy.scp.settings to provide your ssh credentials.
+Set its file permissions so that only you can read it.
+  
+  
+
+
+  The Forrestbot buildfile
+  
+The Forrestbot buildfile sets some properties and declares the 
workstages (i.e. Ant targets) that need to be carried out. Of course this is 
fully explained in the Forrestbot
+documentation.
+  
+  
+Create a file at the top-level of your project website named, e.g.
+publish-stage.xml
+  
+  
+  
+So it gets the sources relative to the current directory. Actually
+it reads the forrest.properties configuration file
+to find out where other stuff is located.
+  
+  
+It deploys the generated files directly to the user's "public_html" 
webspace
+into a "stage" sub-directory. Of course this "deploy.scp.dest" location
+could be a fu

svn commit: r694691 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-quickstart.xml

2008-09-12 Thread crossley

Author: crossley
Date: Fri Sep 12 07:39:13 2008
New Revision: 694691

URL: http://svn.apache.org/viewvc?rev=694691&view=rev
Log:
Explain location of THEMER_PLUGIN. Explain how to show the structurer.
Fix typo with demonstration of switching theme.
Contributed by: Pablo Barrera
Issue: FOR-1106

Modified:

forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-quickstart.xml

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=694691&r1=694690&r2=694691&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
 Fri Sep 12 07:39:13 2008
@@ -84,7 +84,7 @@
 
   Use another theme
   
-Add  
+Add  
   to your forrest.properties.xml
 Re-start 'forrest run'
 localhost:/index.html ... See the new view.
@@ -112,6 +112,9 @@
  ]]>
 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
@@ -123,6 +126,8 @@
 localhost:/index.html ... See the same view, now structured
   by us.
 
+In localhost:/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

svn commit: r694614 - in /forrest/trunk/site-author: content/xdocs/docs_0_90/upgrading_09.xml content/xdocs/site.xml status.xml

2008-09-11 Thread crossley

Author: crossley
Date: Thu Sep 11 23:09:53 2008
New Revision: 694614

URL: http://svn.apache.org/viewvc?rev=694614&view=rev
Log:
Added notes about our Cocoon upgrade.
Issue: FOR-955

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

Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/upgrading_09.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/upgrading_09.xml?rev=694614&r1=694613&r2=694614&view=diff
==
--- forrest/trunk/site-author/content/xdocs/docs_0_90/upgrading_09.xml 
(original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_90/upgrading_09.xml Thu Sep 
11 23:09:53 2008
@@ -51,6 +51,10 @@
 for each plugin.
   
   
+
+  Our packaged Apache Cocoon is upgraded, along with various other
+  important supporting products such as Apache Xerces and Apache 
Xalan, etc.
+
 [Placeholder]
   
   
@@ -60,6 +64,65 @@
 Status of Themes: Skins and 
Dispatcher.
   
 
+
+  Notes about Cocoon version
+  
+Our packaged version of Apache Cocoon has been upgraded to use the
+latest version of their stable 2.1 branch. This is a major step forward
+for Forrest. It enables us to use a reliable and up-to-date Cocoon.
+Forrest developers can again participate at Cocoon to fix issues or
+develop new blocks. A number of major performance issues are already
+fixed in this version.
+  
+  
+In previous versions of Forrest we were using a development version of
+Cocoon trunk (i.e. 2.2). A number of things happened which caused us to
+fall out of synchronisation with Cocoon. They started using Maven as a
+build system, which took a long time to settle down. In turn that meant
+that Apache Gump could not perform continuous integration, which shut
+Forrest off. At the same time Cocoon trunk was making technical 
advances
+which changed some of the ways that Forrest interacts with Cocoon. In
+particular the command-line interface which Forrest uses to build a
+complete static site.
+See other notes via http://issues.apache.org/jira/browse/FOR-1017";>FOR-1017.
+  
+  
+Cocoon-2.1 is closer to our stalled version of Cocoon-2.2 than the
+current head of Cocoon-2.2 trunk.
+  
+  
+Note that this move does not preclude us from future updates to other
+versions of Cocoon or even to another xml processing framework.
+  
+  
+If you want to use your own version of Cocoon-2.1, for example to add
+another Cocoon Block or to enhance a particular existing block, then
+see the notes in the $FORREST_HOME/etc/cocoon_upgrade
+directory.
+  
+
+  
+Cocoon upgrade issues
+
+  There are only two minor issues for those upgrading from the previous
+  version of Forrest:
+
+
+  When you first use this in your existing projects, there will 
probably
+  be a message about a certain cache item. On the second run all is 
well.
+  A way to avoid that would be to do 'forrest clean-work' in each of
+  your projects to remove the old Cocoon cache.
+
+
+  Our previous version of Cocoon had a facility called "Running modes"
+  which enabled one set of a minimal group of properties for 
development
+  and a different set for production. This is not available in 
Cocoon-2.1
+  version. If you were using this feature, then simply move your 
defined
+  properties into the 
main/webapp/WEB-INF/properties/core.properties
+  file.
+
+  
+
 
   Missing project symbols file in some projects
   Users of 0.8, and developers with older 0.9-dev, who based their 
sites on 'forrest seed-basic' rather than 'forrest seed-sample' will be 
affected by FOR-1075. There was a partially implemented xml catalog with 
missing symbols file.
@@ -77,7 +140,7 @@
 cp 
$FORREST_HOME/main/fresh-site/src/documentation/resources/schema/symbols-project-v10.ent
 $PROJECT/src/documentation/resources/schema/symbols-project-v10.ent
   
   
-This "project symbols" ability using xml entities is useful in two 
ways. 
+This "project symbols" ability using xml entities is useful in two 
ways.
 To provide commons symbols, words, and phrases, in your source 
documents
 (added in v0.8 - FAQ).
 To configure some Cocoon sitemap components
@@ -115,7 +178,7 @@
 
   Remove project sitemap if not necessary
   
-It has come

svn commit: r694599 - /forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml

2008-09-11 Thread crossley

Author: crossley
Date: Thu Sep 11 21:04:15 2008
New Revision: 694599

URL: http://svn.apache.org/viewvc?rev=694599&view=rev
Log:
Link to notes for upgrading and new features.

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

Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml?rev=694599&r1=694598&r2=694599&view=diff
==
--- forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml Thu Sep 11 
21:04:15 2008
@@ -33,6 +33,11 @@
   Using Forrest guide.
 
 
+  There are some upgrading notes for people
+  updating from previous versions of Forrest, along with summaries of some
+  new features.
+
+
   In the How-To section you will find 
various
   practical guides on how to achieve common objectives in Forrest.

svn commit: r694181 - in /forrest/zone/htdocs: ft/forrest-docs.xml index.html

2008-09-11 Thread crossley

Author: crossley
Date: Thu Sep 11 01:50:25 2008
New Revision: 694181

URL: http://svn.apache.org/viewvc?rev=694181&view=rev
Log:
Add another forrestbot to build our main docs. This uses lots of other plugins, 
so is a good test.

Added:
forrest/zone/htdocs/ft/forrest-docs.xml   (with props)
Modified:
forrest/zone/htdocs/index.html

Added: forrest/zone/htdocs/ft/forrest-docs.xml
URL: 
http://svn.apache.org/viewvc/forrest/zone/htdocs/ft/forrest-docs.xml?rev=694181&view=auto
==
--- forrest/zone/htdocs/ft/forrest-docs.xml (added)
+++ forrest/zone/htdocs/ft/forrest-docs.xml Thu Sep 11 01:50:25 2008
@@ -0,0 +1,35 @@
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  http://svn.apache.org/repos/asf/forrest/trunk/site-author"/>
+  
+  
+  
+  
+  
+
+  
+

Propchange: forrest/zone/htdocs/ft/forrest-docs.xml
--
svn:eol-style = native

Modified: forrest/zone/htdocs/index.html
URL: 
http://svn.apache.org/viewvc/forrest/zone/htdocs/index.html?rev=694181&r1=694180&r2=694181&view=diff
==
--- forrest/zone/htdocs/index.html (original)
+++ forrest/zone/htdocs/index.html Thu Sep 11 01:50:25 2008
@@ -45,15 +45,27 @@
 Errors are notified to dev at forrest.
   
   
-forrest-seed-site
-- Built by the forrestbot via cron. Every hour the sources are removed
+forrest-seed-sample
+- The main "seed-sample" site.
+Built by the forrestbot via cron every two hours.
+The sources are removed
 and a new 'forrest seed' is installed. Uses "forrest-trunk" which
 is also updated every hour. Errors are notified to dev at forrest.
   
   
 forrest-sample-2
 - Same as above, but enabled with "dispatcher" (in development).
-- Built by the forrestbot via cron every three hours.
+Built by the forrestbot via cron every two hours.
+Uses "forrest-trunk".
+Errors are notified to dev at forrest.
+  
+  
+forrest-docs
+- The main Forrest project documentation.
+(NOTE: Please use the official
+http://forrest.apache.org/";>forrest.apache.org site for 
general
+reference.)
+Built by the forrestbot via cron every two hours.
 Uses "forrest-trunk".
 Errors are notified to dev at forrest.

svn commit: r694171 - /forrest/trunk/etc/cocoon_upgrade/README.txt

2008-09-11 Thread crossley

Author: crossley
Date: Thu Sep 11 01:26:29 2008
New Revision: 694171

URL: http://svn.apache.org/viewvc?rev=694171&view=rev
Log:
Emphasise the note about "Cocoon SVN revision number".

Modified:
forrest/trunk/etc/cocoon_upgrade/README.txt

Modified: forrest/trunk/etc/cocoon_upgrade/README.txt
URL: 
http://svn.apache.org/viewvc/forrest/trunk/etc/cocoon_upgrade/README.txt?rev=694171&r1=694170&r2=694171&view=diff
==
--- forrest/trunk/etc/cocoon_upgrade/README.txt (original)
+++ forrest/trunk/etc/cocoon_upgrade/README.txt Thu Sep 11 01:26:29 2008
@@ -75,7 +75,9 @@
 new "forrest seed" sites.
 
 12. Now do 'svn commit' for the changed/new files in forrest/lib
-and use the Cocoon SVN revision number in your log message.
+
+NOTE: Use the Cocoon SVN revision number in your log message.
+If you forget, then follow up with 'svn propedit svn:log --revprop -r ...'
 
 
 Cleanup

svn commit: r694169 - /forrest/trunk/etc/cocoon_upgrade/README.txt

2008-09-11 Thread crossley

Author: crossley
Date: Thu Sep 11 01:22:06 2008
New Revision: 694169

URL: http://svn.apache.org/viewvc?rev=694169&view=rev
Log:
Remember to set minimum required Java version.

Modified:
forrest/trunk/etc/cocoon_upgrade/README.txt

Modified: forrest/trunk/etc/cocoon_upgrade/README.txt
URL: 
http://svn.apache.org/viewvc/forrest/trunk/etc/cocoon_upgrade/README.txt?rev=694169&r1=694168&r2=694169&view=diff
==
--- forrest/trunk/etc/cocoon_upgrade/README.txt (original)
+++ forrest/trunk/etc/cocoon_upgrade/README.txt Thu Sep 11 01:22:06 2008
@@ -9,6 +9,9 @@
 export COCOON_HOME=/home/me/svn/asf/cocoon-branch-2_1_X
 and do a 'build clean' there.
 
+Set the required Java version to what is specifed
+as Forrest's minimum requirement in $FORREST_HOME/README.txt
+
 -
 0. cd $FORREST_HOME/etc/cocoon_upgrade

svn commit: r694142 - /forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 23:06:10 2008
New Revision: 694142

URL: http://svn.apache.org/viewvc?rev=694142&view=rev
Log:
Use "site:" URIs for all links.

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

Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml
URL: 
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml?rev=694142&r1=694141&r2=694142&view=diff
==
--- forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_90/index.xml Wed Sep 10 
23:06:10 2008
@@ -30,20 +30,20 @@
 
 
   A good place to get started in our docs is the
-  Using Forrest guide.
+  Using Forrest guide.
 
 
-  In the How-To section you will find 
various
+  In the How-To section you will find 
various
   practical guides on how to achieve common objectives in Forrest.
 
 
-  We also have a FAQ list that you should consult
+  We also have a FAQ list that you should consult
   before posting questions to our user list.
 
 
   The documentation Table of Contents provides a
-  useful overview of the main documentation. This
-  FAQ explains that there is other documentation at the example forrest
+  useful overview of the main documentation. This FAQ
+  explains that there is other documentation at the example forrest
   seed site and that each plugin has its own documentation.

svn commit: r694134 - /forrest/branches/forrest_07_branch/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 22:06:42 2008
New Revision: 694134

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

Added:
forrest/branches/forrest_07_branch/STATUS.txt   (with props)

Added: forrest/branches/forrest_07_branch/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/forrest_07_branch/STATUS.txt?rev=694134&view=auto
==
--- forrest/branches/forrest_07_branch/STATUS.txt (added)
+++ forrest/branches/forrest_07_branch/STATUS.txt Wed Sep 10 22:06:42 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/forrest_07_branch/STATUS.txt
--
svn:eol-style = native

svn commit: r694133 - /forrest/branches/forrest_06_branch/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 22:05:09 2008
New Revision: 694133

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

Added:
forrest/branches/forrest_06_branch/STATUS.txt   (with props)

Added: forrest/branches/forrest_06_branch/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/forrest_06_branch/STATUS.txt?rev=694133&view=auto
==
--- forrest/branches/forrest_06_branch/STATUS.txt (added)
+++ forrest/branches/forrest_06_branch/STATUS.txt Wed Sep 10 22:05:09 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/forrest_06_branch/STATUS.txt
--
svn:eol-style = native

svn commit: r694132 - /forrest/branches/LINKMAP_BRANCH/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 22:02:47 2008
New Revision: 694132

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

Added:
forrest/branches/LINKMAP_BRANCH/STATUS.txt   (with props)

Added: forrest/branches/LINKMAP_BRANCH/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/LINKMAP_BRANCH/STATUS.txt?rev=694132&view=auto
==
--- forrest/branches/LINKMAP_BRANCH/STATUS.txt (added)
+++ forrest/branches/LINKMAP_BRANCH/STATUS.txt Wed Sep 10 22:02:47 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/LINKMAP_BRANCH/STATUS.txt
--
svn:eol-style = native

svn commit: r694131 - /forrest/branches/with_pdf_images/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 22:00:47 2008
New Revision: 694131

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

Added:
forrest/branches/with_pdf_images/STATUS.txt   (with props)

Added: forrest/branches/with_pdf_images/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/with_pdf_images/STATUS.txt?rev=694131&view=auto
==
--- forrest/branches/with_pdf_images/STATUS.txt (added)
+++ forrest/branches/with_pdf_images/STATUS.txt Wed Sep 10 22:00:47 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/with_pdf_images/STATUS.txt
--
svn:eol-style = native

svn commit: r694130 - /forrest/branches/UpdateFOPto094/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 22:00:35 2008
New Revision: 694130

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

Added:
forrest/branches/UpdateFOPto094/STATUS.txt   (with props)

Added: forrest/branches/UpdateFOPto094/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/STATUS.txt?rev=694130&view=auto
==
--- forrest/branches/UpdateFOPto094/STATUS.txt (added)
+++ forrest/branches/UpdateFOPto094/STATUS.txt Wed Sep 10 22:00:35 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/UpdateFOPto094/STATUS.txt
--
svn:eol-style = native

svn commit: r694127 - /forrest/branches/PDF_IMAGE_BRANCH/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 21:59:55 2008
New Revision: 694127

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

Added:
forrest/branches/PDF_IMAGE_BRANCH/STATUS.txt   (with props)

Added: forrest/branches/PDF_IMAGE_BRANCH/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/PDF_IMAGE_BRANCH/STATUS.txt?rev=694127&view=auto
==
--- forrest/branches/PDF_IMAGE_BRANCH/STATUS.txt (added)
+++ forrest/branches/PDF_IMAGE_BRANCH/STATUS.txt Wed Sep 10 21:59:55 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/PDF_IMAGE_BRANCH/STATUS.txt
--
svn:eol-style = native

svn commit: r694129 - /forrest/branches/unlabeled-1.1.2/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 22:00:23 2008
New Revision: 694129

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

Added:
forrest/branches/unlabeled-1.1.2/STATUS.txt   (with props)

Added: forrest/branches/unlabeled-1.1.2/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/unlabeled-1.1.2/STATUS.txt?rev=694129&view=auto
==
--- forrest/branches/unlabeled-1.1.2/STATUS.txt (added)
+++ forrest/branches/unlabeled-1.1.2/STATUS.txt Wed Sep 10 22:00:23 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/unlabeled-1.1.2/STATUS.txt
--
svn:eol-style = native

svn commit: r694126 - /forrest/branches/locationmap_branch/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 21:59:42 2008
New Revision: 694126

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

Added:
forrest/branches/locationmap_branch/STATUS.txt   (with props)

Added: forrest/branches/locationmap_branch/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/locationmap_branch/STATUS.txt?rev=694126&view=auto
==
--- forrest/branches/locationmap_branch/STATUS.txt (added)
+++ forrest/branches/locationmap_branch/STATUS.txt Wed Sep 10 21:59:42 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/locationmap_branch/STATUS.txt
--
svn:eol-style = native

svn commit: r694128 - /forrest/branches/sitemap-plugins/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 22:00:07 2008
New Revision: 694128

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

Added:
forrest/branches/sitemap-plugins/STATUS.txt   (with props)

Added: forrest/branches/sitemap-plugins/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/sitemap-plugins/STATUS.txt?rev=694128&view=auto
==
--- forrest/branches/sitemap-plugins/STATUS.txt (added)
+++ forrest/branches/sitemap-plugins/STATUS.txt Wed Sep 10 22:00:07 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/sitemap-plugins/STATUS.txt
--
svn:eol-style = native

svn commit: r694125 - /forrest/branches/FORRESTON_BRANCH/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 21:59:31 2008
New Revision: 694125

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

Added:
forrest/branches/FORRESTON_BRANCH/STATUS.txt   (with props)

Added: forrest/branches/FORRESTON_BRANCH/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/FORRESTON_BRANCH/STATUS.txt?rev=694125&view=auto
==
--- forrest/branches/FORRESTON_BRANCH/STATUS.txt (added)
+++ forrest/branches/FORRESTON_BRANCH/STATUS.txt Wed Sep 10 21:59:31 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/FORRESTON_BRANCH/STATUS.txt
--
svn:eol-style = native

svn commit: r694124 - /forrest/branches/FORREST_05_BRANCH/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 21:59:20 2008
New Revision: 694124

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

Added:
forrest/branches/FORREST_05_BRANCH/STATUS.txt   (with props)

Added: forrest/branches/FORREST_05_BRANCH/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/FORREST_05_BRANCH/STATUS.txt?rev=694124&view=auto
==
--- forrest/branches/FORREST_05_BRANCH/STATUS.txt (added)
+++ forrest/branches/FORREST_05_BRANCH/STATUS.txt Wed Sep 10 21:59:20 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/FORREST_05_BRANCH/STATUS.txt
--
svn:eol-style = native

svn commit: r694122 - /forrest/branches/FORREST_03_BRANCH/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 21:58:55 2008
New Revision: 694122

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

Added:
forrest/branches/FORREST_03_BRANCH/STATUS.txt   (with props)

Added: forrest/branches/FORREST_03_BRANCH/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/FORREST_03_BRANCH/STATUS.txt?rev=694122&view=auto
==
--- forrest/branches/FORREST_03_BRANCH/STATUS.txt (added)
+++ forrest/branches/FORREST_03_BRANCH/STATUS.txt Wed Sep 10 21:58:55 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/FORREST_03_BRANCH/STATUS.txt
--
svn:eol-style = native

svn commit: r694123 - /forrest/branches/FORREST_04_BRANCH/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 21:59:07 2008
New Revision: 694123

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

Added:
forrest/branches/FORREST_04_BRANCH/STATUS.txt   (with props)

Added: forrest/branches/FORREST_04_BRANCH/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/FORREST_04_BRANCH/STATUS.txt?rev=694123&view=auto
==
--- forrest/branches/FORREST_04_BRANCH/STATUS.txt (added)
+++ forrest/branches/FORREST_04_BRANCH/STATUS.txt Wed Sep 10 21:59:07 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/FORREST_04_BRANCH/STATUS.txt
--
svn:eol-style = native

svn commit: r694120 - /forrest/branches/copyless/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 21:58:30 2008
New Revision: 694120

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

Added:
forrest/branches/copyless/STATUS.txt   (with props)

Added: forrest/branches/copyless/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/copyless/STATUS.txt?rev=694120&view=auto
==
--- forrest/branches/copyless/STATUS.txt (added)
+++ forrest/branches/copyless/STATUS.txt Wed Sep 10 21:58:30 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/copyless/STATUS.txt
--
svn:eol-style = native

svn commit: r694119 - /forrest/branches/apache/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 21:58:17 2008
New Revision: 694119

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

Added:
forrest/branches/apache/STATUS.txt   (with props)

Added: forrest/branches/apache/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/apache/STATUS.txt?rev=694119&view=auto
==
--- forrest/branches/apache/STATUS.txt (added)
+++ forrest/branches/apache/STATUS.txt Wed Sep 10 21:58:17 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/apache/STATUS.txt
--
svn:eol-style = native

svn commit: r694121 - /forrest/branches/FORREST_02_BRANCH/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 21:58:41 2008
New Revision: 694121

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

Added:
forrest/branches/FORREST_02_BRANCH/STATUS.txt   (with props)

Added: forrest/branches/FORREST_02_BRANCH/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/FORREST_02_BRANCH/STATUS.txt?rev=694121&view=auto
==
--- forrest/branches/FORREST_02_BRANCH/STATUS.txt (added)
+++ forrest/branches/FORREST_02_BRANCH/STATUS.txt Wed Sep 10 21:58:41 2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/FORREST_02_BRANCH/STATUS.txt
--
svn:eol-style = native

svn commit: r694114 - /forrest/branches/docs_reorg_200506_branch/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 21:45:28 2008
New Revision: 694114

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

Added:
forrest/branches/docs_reorg_200506_branch/STATUS.txt   (with props)

Added: forrest/branches/docs_reorg_200506_branch/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/docs_reorg_200506_branch/STATUS.txt?rev=694114&view=auto
==
--- forrest/branches/docs_reorg_200506_branch/STATUS.txt (added)
+++ forrest/branches/docs_reorg_200506_branch/STATUS.txt Wed Sep 10 21:45:28 
2008
@@ -0,0 +1 @@
+This branch is closed.

Propchange: forrest/branches/docs_reorg_200506_branch/STATUS.txt
--
svn:eol-style = native

svn commit: r694103 - /forrest/branches/update_cocoon_2.1.12-dev/STATUS.txt

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 20:53:47 2008
New Revision: 694103

URL: http://svn.apache.org/viewvc?rev=694103&view=rev
Log:
This branch is now closed. It was merged to trunk in r694101.

Added:
forrest/branches/update_cocoon_2.1.12-dev/STATUS.txt   (with props)

Added: forrest/branches/update_cocoon_2.1.12-dev/STATUS.txt
URL: 
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/STATUS.txt?rev=694103&view=auto
==
--- forrest/branches/update_cocoon_2.1.12-dev/STATUS.txt (added)
+++ forrest/branches/update_cocoon_2.1.12-dev/STATUS.txt Wed Sep 10 20:53:47 
2008
@@ -0,0 +1 @@
+This branch is now closed. It was merged to trunk in r694101.

Propchange: forrest/branches/update_cocoon_2.1.12-dev/STATUS.txt
--
svn:eol-style = native

svn commit: r694101 [1/3] - in /forrest/trunk: etc/cocoon_upgrade/ lib/core/ lib/endorsed/ main/java/org/apache/forrest/locationmap/lm/ main/java/org/apache/forrest/util/ main/targets/ main/var/ main/

2008-09-10 Thread crossley

Author: crossley
Date: Wed Sep 10 20:45:49 2008
New Revision: 694101

URL: http://svn.apache.org/viewvc?rev=694101&view=rev
Log:
Merged branch update_cocoon_2.1.12-dev 687269:HEAD into the trunk.
Issue: FOR-955

Added:
forrest/trunk/lib/core/cocoon-2.1.12-dev.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-2.1.12-dev.jar
forrest/trunk/lib/core/cocoon-asciiart-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-asciiart-block.jar
forrest/trunk/lib/core/cocoon-auth-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-auth-block.jar
forrest/trunk/lib/core/cocoon-batik-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-batik-block.jar
forrest/trunk/lib/core/cocoon-chaperon-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-chaperon-block.jar
forrest/trunk/lib/core/cocoon-fop-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-fop-block.jar
forrest/trunk/lib/core/cocoon-html-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-html-block.jar
forrest/trunk/lib/core/cocoon-linkrewriter-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-linkrewriter-block.jar
forrest/trunk/lib/core/cocoon-lucene-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-lucene-block.jar
forrest/trunk/lib/core/cocoon-profiler-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-profiler-block.jar
forrest/trunk/lib/core/cocoon-template-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-template-block.jar
forrest/trunk/lib/core/cocoon-validation-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-validation-block.jar
forrest/trunk/lib/core/cocoon-xsp-block.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/cocoon-xsp-block.jar
forrest/trunk/lib/core/commons-collections-3.2.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/commons-collections-3.2.jar
forrest/trunk/lib/core/commons-collections-3.2.jar.license.txt
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/commons-collections-3.2.jar.license.txt
forrest/trunk/lib/core/commons-lang-2.4.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/commons-lang-2.4.jar
forrest/trunk/lib/core/commons-lang-2.4.jar.license.txt
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/commons-lang-2.4.jar.license.txt
forrest/trunk/lib/core/ehcache-1.2.3.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/ehcache-1.2.3.jar
forrest/trunk/lib/core/excalibur-component-2.1.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/excalibur-component-2.1.jar
forrest/trunk/lib/core/excalibur-component-2.1.jar.license.txt
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/excalibur-component-2.1.jar.license.txt
forrest/trunk/lib/core/excalibur-sourceresolve-2.2.3.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/excalibur-sourceresolve-2.2.3.jar
forrest/trunk/lib/core/excalibur-sourceresolve-2.2.3.jar.license.txt
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/core/excalibur-sourceresolve-2.2.3.jar.license.txt
forrest/trunk/lib/endorsed/jakarta-regexp-1.5.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/jakarta-regexp-1.5.jar
forrest/trunk/lib/endorsed/jakarta-regexp-1.5.jar.license.txt
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/jakarta-regexp-1.5.jar.license.txt
forrest/trunk/lib/endorsed/xalan-2.7.1.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/xalan-2.7.1.jar
forrest/trunk/lib/endorsed/xalan-2.7.1.jar.license.txt
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/xalan-2.7.1.jar.license.txt
forrest/trunk/lib/endorsed/xercesImpl-2.9.1.jar
  - copied unchanged from r694088, 
forrest/branches/update_cocoon_2.1.12-dev/lib/endorsed/xercesImpl-2.9.1.jar
forrest/trunk/lib/endorsed/xercesImpl-2.9.1.jar.license.txt
  - copied unchanged

svn commit: r694101 [3/3] - in /forrest/trunk: etc/cocoon_upgrade/ lib/core/ lib/endorsed/ main/java/org/apache/forrest/locationmap/lm/ main/java/org/apache/forrest/util/ main/targets/ main/var/ main/

2008-09-10 Thread crossley

Modified: 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/DispatcherHelper.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/DispatcherHelper.java?rev=694101&r1=694100&r2=694101&view=diff
==
--- 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/DispatcherHelper.java
 (original)
+++ 
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/DispatcherHelper.java
 Wed Sep 10 20:45:49 2008
@@ -27,10 +27,10 @@
 import javax.xml.transform.TransformerFactory;
 
 import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.xml.XMLUtils;
 import org.apache.cocoon.xml.dom.DOMBuilder;
 import org.apache.excalibur.source.SourceNotFoundException;
+import org.apache.excalibur.source.SourceResolver;
 import org.apache.forrest.dispatcher.lenya.xml.NamespaceHelper;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -53,7 +53,7 @@
 
 private NamespaceHelper namespaceHelper;
 
-private ServiceManager manager;
+private SourceResolver resolver;
 
 /**
  * Create a DOM representation of this dispatcher.
@@ -72,7 +72,7 @@
  */
 public Document getDocument(String uri) throws Exception {
 Document doc = org.apache.forrest.dispatcher.util.SourceUtil.readDOM(
-uri, this.manager);
+uri, this.resolver);
 if (doc != null) {
 this.namespaceHelper = new NamespaceHelper(
 DISPATCHER_NAMESPACE_URI, DISPATCHER_PREFIX, doc);
@@ -184,9 +184,9 @@
 
 }
 
-public DispatcherHelper(ServiceManager manager)
+public DispatcherHelper(SourceResolver resolver)
 throws ParserConfigurationException {
-this.manager = manager;
+this.resolver = resolver;
 this.namespaceHelper = new NamespaceHelper(DISPATCHER_NAMESPACE_URI,
 DISPATCHER_PREFIX, "foo");
 }

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=694101&r1=694100&r2=694101&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 Sep 10 20:45:49 2008
@@ -30,37 +30,35 @@
 import org.apache.cocoon.environment.Redirector;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
+import org.apache.forrest.dispatcher.DispatcherException;
 
 /**
- * Selects the first of a set of Sources that exists in the context.
+ * Calculates which location to return for a given directory.
+ * Here we are traversing the tree till we reach its root. 
  * 
- * For example, we could define a SourceExistsSelector with:
- * 
- * 
- * 
- *  
- *  
- * 
- * 
- * And use it to build a PDF from XSL:FO or a higher-level XML format with:
- * 
- * 
+ * We are looking first in the request string and then using a 
+ * fallback algorithm to find alternative fallbacks.
+ *  
+ * e.g. the request is "sample/index". First choice is to find: 
+ * {$projectDir}sample/index{$projectExtension}
+ * If the file does not exist we will try with the fallback file
+ * {$projectDir}sample/{$projectFallback}{$projectExtension}
+ * The last file we will try in our example is 
+ * {$projectDir}{$projectFallback}{$projectExtension}.
+ * With this we have reached the root directory and we cannot find the
+ * requested file the action will return null.
+ * 
+ * 
+ *   
+ *   
+ *   
+ *   
+ *