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
