From svn-return-9134-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org Wed Dec 11 13:58:17 2013 Return-Path: X-Original-To: apmail-forrest-svn-archive@www.apache.org Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0E1A1108A8 for ; Wed, 11 Dec 2013 13:58:16 +0000 (UTC) Received: (qmail 45728 invoked by uid 500); 11 Dec 2013 13:58:15 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 45698 invoked by uid 500); 11 Dec 2013 13:58:10 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 45659 invoked by uid 99); 11 Dec 2013 13:58:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Dec 2013 13:58:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Dec 2013 13:58:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A70D123888A6; Wed, 11 Dec 2013 13:57:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1550140 - in /forrest/trunk: main/webapp/ main/webapp/WEB-INF/ main/webapp/resources/stylesheets/ site-author/ site-author/content/xdocs/ site-author/content/xdocs/docs_0_100/ Date: Wed, 11 Dec 2013 13:57:22 -0000 To: svn@forrest.apache.org From: crossley@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131211135722.A70D123888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: crossley Date: Wed Dec 11 13:57:21 2013 New Revision: 1550140 URL: http://svn.apache.org/r1550140 Log: Enable per-project configuration of Cocoon error handling. Issue: FOR-1245 Added: forrest/trunk/main/webapp/resources/stylesheets/exception-to-text.xsl - copied, changed from r1546505, forrest/trunk/main/webapp/resources/stylesheets/exception-to-html.xsl Modified: forrest/trunk/main/webapp/WEB-INF/logkit.xconf forrest/trunk/main/webapp/sitemap.xmap forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml forrest/trunk/site-author/content/xdocs/site.xml forrest/trunk/site-author/status.xml Modified: forrest/trunk/main/webapp/WEB-INF/logkit.xconf URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/logkit.xconf?rev=1550140&r1=1550139&r2=1550140&view=diff ============================================================================== --- forrest/trunk/main/webapp/WEB-INF/logkit.xconf (original) +++ forrest/trunk/main/webapp/WEB-INF/logkit.xconf Wed Dec 11 13:57:21 2013 @@ -102,6 +102,14 @@ false + + ${context-root}/WEB-INF/logs/exception.log + + %7.7{priority} %{time} [%{category}] (%{uri}): %{message}\n%{throwable} + + false + + ${context-root}/WEB-INF/logs/idgen.log @@ -246,6 +254,10 @@ + + + + Copied: forrest/trunk/main/webapp/resources/stylesheets/exception-to-text.xsl (from r1546505, forrest/trunk/main/webapp/resources/stylesheets/exception-to-html.xsl) URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/exception-to-text.xsl?p2=forrest/trunk/main/webapp/resources/stylesheets/exception-to-text.xsl&p1=forrest/trunk/main/webapp/resources/stylesheets/exception-to-html.xsl&r1=1546505&r2=1550140&rev=1550140&view=diff ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/exception-to-html.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/exception-to-text.xsl Wed Dec 11 13:57:21 2013 @@ -17,37 +17,19 @@ --> - - - - Exception - - - - - - + xmlns:ex="http://apache.org/cocoon/exception/1.0" + exclude-result-prefixes="ex"> + -

An Error Occurred

-

- It looks like there is a problem with an unresolved hint in the your - locationmap. -

-

- More information can be found in the logs. -

+ It looks like there is a problem with an unresolved hint in your locationmap. +
+ + No such source content. -

An Error Occurred

-

- -

-

- More information can be found in the logs. -

+
Modified: forrest/trunk/main/webapp/sitemap.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/sitemap.xmap?rev=1550140&r1=1550139&r2=1550140&view=diff ============================================================================== --- forrest/trunk/main/webapp/sitemap.xmap (original) +++ forrest/trunk/main/webapp/sitemap.xmap Wed Dec 11 13:57:21 2013 @@ -223,8 +223,9 @@ $Revision: 1.12 $ - + + - + + &handle-errors; Modified: forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml?rev=1550140&r1=1550139&r2=1550140&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml Wed Dec 11 13:57:21 2013 @@ -1313,6 +1313,50 @@ X [0] /docs_0_80/upgrading_08.ht

+ + How to enable Cocoon error handling? + +

+ When Cocoon encounters an exception then it will present a default + page to explain the error. Better error handling can be configured + by adding a "map:handle-errors" section to each sitemap from which + such exceptions might arise. +

+

+ That is easily added directly to your project sitemap for any + special processing. + However for many cases it needs to be added to the main + webapp/sitemap.xmap file. +

+

+ Do this by adding a "handle-errors" xml entity to your project + "symbols" file (explained above). + For example: +

+ + + + + + + + + + + + +'>]]> +

+ Some exception selectors are configured in webapp/sitemap.xmap file + at the "map:selectors" section. + Please send patches for others if you need them to be added. +

+

+ See further exxplanation. +

+
+
Why are there SVN diffs for some documents, even though they have not changed? Modified: forrest/trunk/site-author/content/xdocs/site.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/site.xml?rev=1550140&r1=1550139&r2=1550140&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/site.xml (original) +++ forrest/trunk/site-author/content/xdocs/site.xml Wed Dec 11 13:57:21 2013 @@ -340,6 +340,7 @@ + Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=1550140&r1=1550139&r2=1550140&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Wed Dec 11 13:57:21 2013 @@ -153,6 +153,11 @@ Added document to facilitate upgrading to v0.10-dev + + + Enable per-project configuration of Cocoon error handling. + Added an FAQ. + Updated JSch to v0.1.50 From svn-return-9135-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org Wed Dec 11 14:03:39 2013 Return-Path: X-Original-To: apmail-forrest-svn-archive@www.apache.org Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C9900108D9 for ; Wed, 11 Dec 2013 14:03:39 +0000 (UTC) Received: (qmail 60421 invoked by uid 500); 11 Dec 2013 14:03:39 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 60354 invoked by uid 500); 11 Dec 2013 14:03:38 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 60340 invoked by uid 99); 11 Dec 2013 14:03:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Dec 2013 14:03:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Dec 2013 14:03:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 941E42388980; Wed, 11 Dec 2013 14:03:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1550141 - /forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml Date: Wed, 11 Dec 2013 14:03:14 -0000 To: svn@forrest.apache.org From: crossley@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131211140314.941E42388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: crossley Date: Wed Dec 11 14:03:14 2013 New Revision: 1550141 URL: http://svn.apache.org/r1550141 Log: Fix xml error with r1550140. Modified: forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml Modified: forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml?rev=1550141&r1=1550140&r2=1550141&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml Wed Dec 11 14:03:14 2013 @@ -1330,7 +1330,7 @@ X [0] /docs_0_80/upgrading_08.ht

Do this by adding a "handle-errors" xml entity to your project - "symbols" file (explained above). + "symbols" file (explained above). For example:

@@ -1353,7 +1353,7 @@ X [0] /docs_0_80/upgrading_08.ht Please send patches for others if you need them to be added.

- See further exxplanation. + See further explanation.

From svn-return-9136-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org Tue Dec 17 05:58:24 2013 Return-Path: X-Original-To: apmail-forrest-svn-archive@www.apache.org Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B84A910CE1 for ; Tue, 17 Dec 2013 05:58:24 +0000 (UTC) Received: (qmail 60751 invoked by uid 500); 17 Dec 2013 05:58:24 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 60703 invoked by uid 500); 17 Dec 2013 05:58:20 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 60691 invoked by uid 99); 17 Dec 2013 05:58:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Dec 2013 05:58:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Dec 2013 05:58:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 40FAD238889B; Tue, 17 Dec 2013 05:57:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1551467 - in /forrest/trunk: main/webapp/sitemap.xmap site-author/content/xdocs/docs_0_100/faq.xml Date: Tue, 17 Dec 2013 05:57:56 -0000 To: svn@forrest.apache.org From: crossley@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131217055756.40FAD238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: crossley Date: Tue Dec 17 05:57:55 2013 New Revision: 1551467 URL: http://svn.apache.org/r1551467 Log: Enable enough rope to configure the top-level sitemap for additional map:selectors per project. Primarily this assists with enabling specific Cocoon error handling. Issue: FOR-1245 Modified: forrest/trunk/main/webapp/sitemap.xmap forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml Modified: forrest/trunk/main/webapp/sitemap.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/sitemap.xmap?rev=1551467&r1=1551466&r2=1551467&view=diff ============================================================================== --- forrest/trunk/main/webapp/sitemap.xmap (original) +++ forrest/trunk/main/webapp/sitemap.xmap Tue Dec 17 05:57:55 2013 @@ -230,6 +230,7 @@ $Revision: 1.12 $
+ &sitemap-selectors;
Modified: forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml?rev=1551467&r1=1551466&r2=1551467&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml Tue Dec 17 05:57:55 2013 @@ -1326,7 +1326,7 @@ X [0] /docs_0_80/upgrading_08.ht That is easily added directly to your project sitemap for any special processing. However for many cases it needs to be added to the main - webapp/sitemap.xmap file. + webapp/sitemap.xmap file.

Do this by adding a "handle-errors" xml entity to your project @@ -1348,9 +1348,36 @@ X [0] /docs_0_80/upgrading_08.ht '>]]>

- Some exception selectors are configured in webapp/sitemap.xmap file - at the "map:selectors" section. - Please send patches for others if you need them to be added. + Some exception selectors are already configured in Forrest's main + webapp/sitemap.xmap file at the "map:selectors" section. + There is a mechanism for declaring more selectors for your project. + As above, add a "sitemap-selectors" xml entity to your project "symbols" file. + For this example, we demonstrate using an extra file for the snippet content. +

+ +]]> +

+ The file will be found relative to your project "symbols" file that declared it. + (If you need to hold a common set of such files elsewhere, then the + project Catalog Entity Resolver could be configured.) + So here is an example "sitemap-selectors" snippet to configure the XPathExceptionSelector + to declare other exception names for use in a more comprehensive + "map:handle-errors" section: +

+ + + + + + +]]> +

+ The "message" text is issued from a stylesheet-directed termination + via ]]> +

+

+ This file-based entity is a very useful technique, as it handles the + case where both double-quotes and single-quotes are required in the entity content.

See further explanation. From svn-return-9137-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org Tue Dec 17 06:05:43 2013 Return-Path: X-Original-To: apmail-forrest-svn-archive@www.apache.org Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B7B1410D24 for ; Tue, 17 Dec 2013 06:05:43 +0000 (UTC) Received: (qmail 66786 invoked by uid 500); 17 Dec 2013 06:05:42 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 66745 invoked by uid 500); 17 Dec 2013 06:05:41 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 66738 invoked by uid 99); 17 Dec 2013 06:05:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Dec 2013 06:05:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Dec 2013 06:05:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A18882388831; Tue, 17 Dec 2013 06:05:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1551468 - in /forrest/trunk: main/webapp/sitemap.xmap site-author/content/xdocs/docs_0_100/faq.xml Date: Tue, 17 Dec 2013 06:05:15 -0000 To: svn@forrest.apache.org From: crossley@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131217060515.A18882388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: crossley Date: Tue Dec 17 06:05:15 2013 New Revision: 1551468 URL: http://svn.apache.org/r1551468 Log: Use consistent names for project sitemap entities. Issue: FOR-1245 Modified: forrest/trunk/main/webapp/sitemap.xmap forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml Modified: forrest/trunk/main/webapp/sitemap.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/sitemap.xmap?rev=1551468&r1=1551467&r2=1551468&view=diff ============================================================================== --- forrest/trunk/main/webapp/sitemap.xmap (original) +++ forrest/trunk/main/webapp/sitemap.xmap Tue Dec 17 06:05:15 2013 @@ -641,6 +641,6 @@ $Revision: 1.12 $ - &handle-errors; + &sitemap-handle-errors; Modified: forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml?rev=1551468&r1=1551467&r2=1551468&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_100/faq.xml Tue Dec 17 06:05:15 2013 @@ -1329,12 +1329,12 @@ X [0] /docs_0_80/upgrading_08.ht webapp/sitemap.xmap file.

- Do this by adding a "handle-errors" xml entity to your project + Do this by adding a "sitemap-handle-errors" xml entity to your project "symbols" file (explained above). For example:

-