Author: crossley
Date: Mon Aug 29 21:49:45 2005
New Revision: 264705
URL: http://svn.apache.org/viewcvs?rev=264705&view=rev
Log:
Enable Cocoon Profiler block.
Submiited by: Ron Blaschke
Issue: FOR-572
Modified:
forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
forrest/trunk/main/webapp/profiler.xmap
forrest/trunk/main/webapp/sitemap.xmap
Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=264705&r1=264704&r2=264705&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Mon Aug 29 21:49:45 2005
@@ -733,4 +733,6 @@
<cocoon-crawler logger="core.search.crawler"/>
<lucene-xml-indexer logger="core.search.lucene"/>
+ <include src="resource://org/apache/cocoon/components/profiler/profiler.roles"/>
+
</components>
Modified: forrest/trunk/main/webapp/profiler.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/profiler.xmap?rev=264705&r1=264704&r2=264705&view=diff
==============================================================================
--- forrest/trunk/main/webapp/profiler.xmap (original)
+++ forrest/trunk/main/webapp/profiler.xmap Mon Aug 29 21:49:45 2005
@@ -42,7 +42,7 @@
<map:pipelines>
<map:pipeline>
- <map:match pattern="profiler">
+ <map:match pattern="profile.html">
<map:generate type="profiler"/>
<map:transform src="{forrest:stylesheets}/profile2page.xsl">
<map:parameter name="use-request-parameters" value="true"/>
Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/sitemap.xmap?rev=264705&r1=264704&r2=264705&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Mon Aug 29 21:49:45 2005
@@ -205,11 +205,16 @@
</map:selectors>
<map:pipes default="caching">
+ <!-- standard pipes -->
<map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
- <!--
<map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
- <map:pipe name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
- <map:pipe name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
+
+ <!-- profiling pipes -->
+ <!-- See FOR-572 and when you want to do profiling, then
+ replace the standards pipes above -->
+ <!--
+ <map:pipe name="caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
+ <map:pipe name="noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
-->
</map:pipes>
</map:components>
@@ -537,6 +542,10 @@
</map:pipeline>
<map:pipeline internal-only="false">
+ <map:match pattern="profile.html">
+ <map:mount uri-prefix="" src="profiler.xmap" check-reload="yes" />
+ </map:match>
+
<!--pipeline that "marries" the docs in the root dir with the skin to produce html-->
<map:match pattern="*.html">
<map:aggregate element="site">
@@ -619,9 +628,6 @@
<map:serialize type="xml"/>
</map:match>
- <map:match pattern="profiler">
- <map:mount uri-prefix="" src="profiler.xmap" check-reload="yes" />
- </map:match>
<map:match pattern="**.lucene">
<map:mount uri-prefix="" src="search.xmap" check-reload="yes" />
|