You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/12/06 23:07:27 UTC
svn commit: r601872 - in
/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation:
content/ilock.xml samples.xml
Author: vgritsenko
Date: Thu Dec 6 14:07:27 2007
New Revision: 601872
URL: http://svn.apache.org/viewvc?rev=601872&view=rev
Log:
cleanup lock test ,add link
Modified:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ilock.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ilock.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ilock.xml?rev=601872&r1=601871&r2=601872&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ilock.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ilock.xml Thu Dec 6 14:07:27 2007
@@ -21,14 +21,12 @@
<title>Include Transformer Lock Test</title>
<content>
- <h3>Including cocoon:/lock</h3>
- <pre><![CDATA[<i:include src="cocoon:/lock"/>]]></pre>
- <i:include src="cocoon:/lock"/>
+ <h3>Including cocoon:/lock as text:</h3>
+ <pre><i:include src="cocoon:/lock" parse="text"/></pre>
<hr/>
- <h3>Including cocoon:/lock second time</h3>
- <pre><![CDATA[<i:include src="cocoon:/lock"/>]]></pre>
- <i:include src="cocoon:/lock"/>
+ <h3>Including cocoon:/lock as text again:</h3>
+ <pre><i:include src="cocoon:/lock" parse="text"/></pre>
<hr/>
</content>
</page>
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml?rev=601872&r1=601871&r2=601872&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml Thu Dec 6 14:07:27 2007
@@ -95,4 +95,12 @@
Example of streaming inclusion using the custom elementpath XPointer scheme.
</sample>
</group>
+
+ <group name="Tests">
+ <sample name="Self Include" href="include-lock">
+ Document created by Cocoon pipeline includes this same pipeline
+ twice, in parallel. Should not cause deadlocks in the caching
+ pipeline (COCOON-1985).
+ </sample>
+ </group>
</samples>