Return-Path: 
 <svn-return-8528-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 22219 invoked from network); 15 May 2010 11:49:15 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 15 May 2010 11:49:15 -0000
Received: (qmail 13455 invoked by uid 500); 15 May 2010 11:49:15 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 13394 invoked by uid 500); 15 May 2010 11:49:14 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 13387 invoked by uid 99); 15 May 2010 11:49:14 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 May 2010 11:49:14 +0000
X-ASF-Spam-Status: No, hits=-1777.9 required=10.0
	tests=ALL_TRUSTED,AWL
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; Sat, 15 May 2010 11:49:13 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9DF8023888FE; Sat, 15 May 2010 11:48:53 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r944615 - in /forrest/trunk:
 main/webapp/WEB-INF/cocoon.xconf
 site-author/forrest.properties
Date: Sat, 15 May 2010 11:48:53 -0000
To: svn@forrest.apache.org
From: twilliams@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100515114853.9DF8023888FE@eris.apache.org>

Author: twilliams
Date: Sat May 15 11:48:53 2010
New Revision: 944615

URL: http://svn.apache.org/viewvc?rev=944615&view=rev
Log:
Switch to the XPathXMLFileModule re: FOR-591

Modified:
    forrest/trunk/main/webapp/WEB-INF/cocoon.xconf
    forrest/trunk/site-author/forrest.properties

Modified: forrest/trunk/main/webapp/WEB-INF/cocoon.xconf
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/cocoon.xconf?rev=944615&r1=944614&r2=944615&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/cocoon.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/cocoon.xconf Sat May 15 11:48:53 2010
@@ -230,8 +230,10 @@
     </component-instance>
 
     <component-instance
-      class="org.apache.cocoon.components.modules.input.XMLFileModule"
-      logger="core.modules.xml" name="skinconf"/>
+      class="org.apache.cocoon.components.modules.input.XPathXMLFileModule"
+      logger="core.modules.xml" name="skinconf">
+      <file src="{src}"/>
+    </component-instance>
 
     <component-instance
       class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
@@ -244,8 +246,9 @@
 
     <!-- For the site: scheme -->
     <component-instance
-      class="org.apache.cocoon.components.modules.input.XMLFileModule"
+      class="org.apache.cocoon.components.modules.input.XPathXMLFileModule"
       logger="core.modules.mapper.link" name="linkmap">
+      <file src="{src}" reloadable="true"/>
     </component-instance>
 
     <!-- Links to URIs within the site -->

Modified: forrest/trunk/site-author/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/forrest.properties?rev=944615&r1=944614&r2=944615&view=diff
==============================================================================
--- forrest/trunk/site-author/forrest.properties (original)
+++ forrest/trunk/site-author/forrest.properties Sat May 15 11:48:53 2010
@@ -41,6 +41,6 @@ project.required.plugins=org.apache.forr
 
 # Max memory to allocate to Java
 # FIXME: See issue FOR-572
-forrest.maxmemory=256m
+forrest.maxmemory=128m
 
 forrest.validate=true