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 21:14:27 UTC
svn commit: r601840 - in
/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation:
./ content/
Author: vgritsenko
Date: Thu Dec 6 12:14:24 2007
New Revision: 601840
URL: http://svn.apache.org/viewvc?rev=601840&view=rev
Log:
minor tweaks. add test for the COCOON-1985
Added:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ilock.xml (contents, props changed)
- copied, changed from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest.xml (contents, props changed)
- copied, changed from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest2.xml (contents, props changed)
- copied, changed from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test2.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest3.xml (contents, props changed)
- copied, changed from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test3.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest4.xml (contents, props changed)
- copied, changed from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test4.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest5.xml (contents, props changed)
- copied, changed from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test5.xml
Removed:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test2.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test3.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test4.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test5.xml
Modified:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest.xml (contents, props changed)
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest2.xml (props changed)
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest3.xml (props changed)
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest4.xml (contents, props changed)
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest5.xml (contents, props changed)
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/sample.xhtml (contents, props changed)
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xbase.xml (contents, props changed)
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xhtml.xml (contents, props changed)
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xloop.xml (contents, props changed)
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/samples.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap
Copied: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ilock.xml (from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest.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?p2=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ilock.xml&p1=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest.xml&r1=601761&r2=601840&rev=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ilock.xml Thu Dec 6 12:14:24 2007
@@ -18,116 +18,17 @@
-->
<page xmlns:i="http://apache.org/cocoon/include/1.0">
- <title>Include Transformer Demo</title>
+ <title>Include Transformer Lock Test</title>
<content>
- <!--
- - Example 1
- -->
- <h3>Include XML source</h3>
- <pre><![CDATA[<i:include src="itest3.xml"/>]]></pre>
- <i:include src="itest3.xml"/>
+ <h3>Including cocoon:/lock</h3>
+ <pre><![CDATA[<i:include src="cocoon:/lock"/>]]></pre>
+ <i:include src="cocoon:/lock"/>
<hr/>
- <!--
- - Example 2
- -->
- <h3>Recursive include</h3>
- <pre><![CDATA[<i:include src="itest4.xml"/>]]></pre>
- <i:include src="itest4.xml"/>
+ <h3>Including cocoon:/lock second time</h3>
+ <pre><![CDATA[<i:include src="cocoon:/lock"/>]]></pre>
+ <i:include src="cocoon:/lock"/>
<hr/>
-
- <!--
- - Example 3
- -->
- <h3>Include with fallback (Ok)</h3>
- <pre><![CDATA[
-<i:include src="itest5.xml">
- <i:fallback>
- <b>Oops!</b> Failed to include a file.
- </i:fallback>
-</i:include>
- ]]></pre>
- <i:include src="itest5.xml">
- <i:fallback>
- <b>Oops!</b> Failed to include a file.
- </i:fallback>
- </i:include>
- <hr/>
-
- <!--
- - Example 4
- -->
- <h3>Include with fallback (missing file)</h3>
- <pre><![CDATA[
-<i:include src="does-not-exist.xml">
- <i:fallback>
- <b>Oops!</b> Failed to include a file.
- </i:fallback>
-</i:include>
- ]]></pre>
- <i:include src="cocoon:does-not-exist.xml">
- <i:fallback>
- <b>Oops!</b> Failed to include a file.
- </i:fallback>
- </i:include>
- <hr/>
-
- <!--
- - Example 5
- -->
- <h3>Include with fallback (malformed file)</h3>
- <pre><![CDATA[
-<i:include src="itest2.xml">
- <i:fallback>
- <b>Oops!</b> Failed to include a file.
- </i:fallback>
-</i:include>
- ]]></pre>
- <i:include src="itest2.xml">
- <i:fallback>
- <b>Oops!</b> Failed to include a file.
- </i:fallback>
- </i:include>
- <hr/>
-
- <!--
- - Example 6
- -->
- <h3>Nested includes with fallbacks</h3>
- <pre><![CDATA[
-<i:include src="itest2.xml">
- <i:fallback>
- <b>Oops!</b> Failed to include a file. Try again:
- <i:include src="itest2.xml">
- <i:fallback>
- <b>Oops!</b> Failed to include a file twice!
- </i:fallback>
- </i:include>
- </i:fallback>
-</i:include>
- ]]></pre>
- <i:include src="itest2.xml">
- <i:fallback>
- <b>Oops!</b> Failed to include a file. Try again:
- <i:include src="itest2.xml">
- <i:fallback>
- <b>Oops!</b> Failed to include a file twice!
- </i:fallback>
- </i:include>
- </i:fallback>
- </i:include>
- <hr/>
-
- <!--
- - Example 6
- -->
- <h3>Text include</h3>
- <pre><![CDATA[<i:include src="itest4.xml" parse="text"/>]]></pre>
- <pre>
-<i:include src="itest4.xml" parse="text"/>
- </pre>
- <hr/>
-
</content>
</page>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ilock.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/ilock.xml
------------------------------------------------------------------------------
svn:keywords = Id Revision Author Date
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest.xml?rev=601840&r1=601839&r2=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest.xml Thu Dec 6 12:14:24 2007
@@ -124,9 +124,7 @@
-->
<h3>Text include</h3>
<pre><![CDATA[<i:include src="itest4.xml" parse="text"/>]]></pre>
- <pre>
-<i:include src="itest4.xml" parse="text"/>
- </pre>
+ <pre><i:include src="itest4.xml" parse="text"/></pre>
<hr/>
</content>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Dec 6 12:14:24 2007
@@ -1 +1 @@
-Id
+Id Revision Author Date
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Dec 6 12:14:24 2007
@@ -1 +1 @@
-Id
+Id Revision Author Date
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest3.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Dec 6 12:14:24 2007
@@ -1 +1 @@
-Id
+Id Revision Author Date
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest4.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest4.xml?rev=601840&r1=601839&r2=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest4.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest4.xml Thu Dec 6 12:14:24 2007
@@ -18,6 +18,6 @@
-->
<para xmlns:i="http://apache.org/cocoon/include/1.0">
- This is content in <b>itest4.xml</b>, will do a include of itest5.xml here:
+ This is content of the <b>itest4.xml</b> file, wich includes <b>itest5.xml</b> file:
<i:include src="itest5.xml"/>
</para>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest4.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Dec 6 12:14:24 2007
@@ -1 +1 @@
-Id
+Id Revision Author Date
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest5.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest5.xml?rev=601840&r1=601839&r2=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest5.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest5.xml Thu Dec 6 12:14:24 2007
@@ -18,5 +18,5 @@
-->
<para>
- This is the content of <b>itest5.xml</b>
+ This is the content of <b>itest5.xml</b> file.
</para>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/itest5.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Dec 6 12:14:24 2007
@@ -1 +1 @@
-Id
+Id Revision Author Date
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/sample.xhtml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/sample.xhtml?rev=601840&r1=601839&r2=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/sample.xhtml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/sample.xhtml Thu Dec 6 12:14:24 2007
@@ -15,6 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<html>
<head>
<title></title>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/sample.xhtml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Dec 6 12:14:24 2007
@@ -1 +1 @@
-Id
+Id Revision Author Date
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xbase.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xbase.xml?rev=601840&r1=601839&r2=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xbase.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xbase.xml Thu Dec 6 12:14:24 2007
@@ -15,21 +15,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<page xmlns:xi="http://www.w3.org/2001/XInclude">
<title>XInclude xml:base demo</title>
<content>
This is a test of the xml:base support.
<hr/>
<dummy xml:base="cocoon:/dir1/dir2/dir3/">
-
- <xi:include href="../../../test3.xml"/>
+ <xi:include href="../../../xtest3.xml"/>
<dummy xml:base="cocoon:/dir1/">
- <xi:include href="../test3.xml"/>
+ <xi:include href="../xtest3.xml"/>
</dummy>
- <xi:include href="../../../test3.xml"/>
-
+ <xi:include href="../../../xtest3.xml"/>
</dummy>
</content>
</page>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xbase.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Dec 6 12:14:24 2007
@@ -1 +1 @@
-Id
+Id Revision Author Date
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xhtml.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xhtml.xml?rev=601840&r1=601839&r2=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xhtml.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xhtml.xml Thu Dec 6 12:14:24 2007
@@ -15,6 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<page xmlns:xi="http://www.w3.org/2001/XInclude">
<title>XInclude demo</title>
<content>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xhtml.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Dec 6 12:14:24 2007
@@ -1 +1 @@
-Id
+Id Revision Author Date
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xloop.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xloop.xml?rev=601840&r1=601839&r2=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xloop.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xloop.xml Thu Dec 6 12:14:24 2007
@@ -15,6 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<page xmlns:xi="http://www.w3.org/2001/XInclude">
<title>XInclude loop inclusion test</title>
<content>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xloop.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Dec 6 12:14:24 2007
@@ -1 +1 @@
-Id
+Id Revision Author Date
Copied: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest.xml (from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest.xml?p2=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest.xml&p1=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test.xml&r1=601761&r2=601840&rev=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest.xml Thu Dec 6 12:14:24 2007
@@ -15,25 +15,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<page xmlns:xi="http://www.w3.org/2001/XInclude">
<title>XInclude demo</title>
<content>
- <para><b><![CDATA[<xi:include href="test3.xml"/>]]></b></para>
- <xi:include href="test3.xml"/>
+ <para><b><![CDATA[<xi:include href="xtest3.xml"/>]]></b></para>
+ <xi:include href="xtest3.xml"/>
<hr/>
- <para><b><![CDATA[<xi:include href="test2.xml#xpointer(/page/content/para[2])"/>]]></b></para>
- <xi:include href="test2.xml#xpointer(/page/content/para[2])"/>
+ <para><b><![CDATA[<xi:include href="xtest2.xml#xpointer(/page/content/para[2])"/>]]></b></para>
+ <xi:include href="xtest2.xml#xpointer(/page/content/para[2])"/>
<hr/>
- <para><b><![CDATA[<xi:include href="test2.xml#xmlns(my=http://localhost/my)xpointer(/page/content/my:abc/*)"/>]]></b></para>
- <xi:include href="test2.xml#xmlns(my=http://localhost/my)xpointer(/page/content/my:abc/*)"/>
+ <para><b><![CDATA[<xi:include href="xtest2.xml#xmlns(my=http://localhost/my)xpointer(/page/content/my:abc/*)"/>]]></b></para>
+ <xi:include href="xtest2.xml#xmlns(my=http://localhost/my)xpointer(/page/content/my:abc/*)"/>
<hr/>
<para><b>Inclusion with an invalid xpointer expression, will cause fallback
element content to be inserted:</b></para>
- <para><b><![CDATA[<xi:include href="test2.xml#xpointer(">]]></b></para>
- <xi:include href="test2.xml#xpointer(">
+ <para><b><![CDATA[<xi:include href="xtest2.xml#xpointer(">]]></b></para>
+ <xi:include href="xtest2.xml#xpointer(">
<a>
<b>
Any random content inside the xi:include element will be ignored.
@@ -54,16 +55,16 @@
<para><b>This sample demonstrates the recursive inclusion: here file4.xml
is included, which in itself includes file5.xml:</b></para>
- <para><b><![CDATA[<xi:include href="test4.xml"/>]]></b></para>
- <xi:include href="test4.xml"/>
+ <para><b><![CDATA[<xi:include href="xtest4.xml"/>]]></b></para>
+ <xi:include href="xtest4.xml"/>
<hr/>
<para><b>This example shows how you can put multiple xpointer expressions
one after the other. If one doesn't return a result, it is skipped and
the next one is evaluated, until one is found that returns a
result.</b></para>
- <para><b><![CDATA[<xi:include href="test2.xml#xpointer(/x)xpointer(/y)xpointer(/z)xpointer(/page/content/para[2])"/>]]></b></para>
- <xi:include href="test2.xml#xpointer(/x)xpointer(/y)xpointer(/z)xpointer(/page/content/para[2])"/>
+ <para><b><![CDATA[<xi:include href="xtest2.xml#xpointer(/x)xpointer(/y)xpointer(/z)xpointer(/page/content/para[2])"/>]]></b></para>
+ <xi:include href="xtest2.xml#xpointer(/x)xpointer(/y)xpointer(/z)xpointer(/page/content/para[2])"/>
<hr/>
</content>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest.xml
------------------------------------------------------------------------------
svn:keywords = Id Revision Author Date
Copied: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest2.xml (from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test2.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest2.xml?p2=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest2.xml&p1=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test2.xml&r1=601761&r2=601840&rev=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test2.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest2.xml Thu Dec 6 12:14:24 2007
@@ -15,12 +15,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<page xmlns:my="http://localhost/my">
- <content>
- <para>This is paragraph 1 from test2.xml</para>
- <para>This is paragraph 2 from test2.xml</para>
- <my:abc>
- <para>This is paragraph 3 from test2.xml (inside my:abc element)</para>
- </my:abc>
- </content>
+ <content>
+ <para>This is paragraph 1 from xtest2.xml</para>
+ <para>This is paragraph 2 from xtest2.xml</para>
+ <my:abc>
+ <para>This is paragraph 3 from xtest2.xml (inside my:abc element)</para>
+ </my:abc>
+ </content>
</page>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest2.xml
------------------------------------------------------------------------------
svn:keywords = Id Revision Author Date
Copied: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest3.xml (from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test3.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest3.xml?p2=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest3.xml&p1=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test3.xml&r1=601761&r2=601840&rev=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test3.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest3.xml Thu Dec 6 12:14:24 2007
@@ -15,4 +15,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<para>This is the content of the test3.xml file.</para>
+
+<para>This is the content of the <b>xtest3.xml</b> file.</para>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest3.xml
------------------------------------------------------------------------------
svn:keywords = Id Revision Author Date
Copied: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest4.xml (from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test4.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest4.xml?p2=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest4.xml&p1=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test4.xml&r1=601761&r2=601840&rev=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test4.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest4.xml Thu Dec 6 12:14:24 2007
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<para xmlns:xi="http://www.w3.org/2001/XInclude">
- This is content in test4.xml, will do a include of test5.xml here:
- <xi:include href="test5.xml#xpointer(/para/node())"/>
+ This is content of the <b>xtest4.xml</b> file, will include content of the <b>xtest5.xml</b> file:
+ <xi:include href="xtest5.xml#xpointer(/para/node())"/>
</para>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest4.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest4.xml
------------------------------------------------------------------------------
svn:keywords = Id Revision Author Date
Copied: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest5.xml (from r601761, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test5.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest5.xml?p2=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest5.xml&p1=cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test5.xml&r1=601761&r2=601840&rev=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/test5.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest5.xml Thu Dec 6 12:14:24 2007
@@ -15,6 +15,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<para>
- This is the content of test5.xml
-</para>
+
+<para>This is the content of <b>xtest5.xml</b> file.</para>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest5.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/content/xtest5.xml
------------------------------------------------------------------------------
svn:keywords = Id Revision Author Date
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=601840&r1=601839&r2=601840&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 12:14:24 2007
@@ -69,28 +69,29 @@
<group name="Include Samples">
<sample name="General" href="include-true-true-test">
- Demonstration of various include features.
+ Demonstration of various include features. Recursive inclusion
+ is on. Inclusion is done in parallel threads.
</sample>
<sample name="Not Recursive" href="include-true-false-test">
- Demonstration of various include features - no recursion.
+ Demonstration of various include features. Recursion is off.
</sample>
<sample name="Not Parallel" href="include-false-true-test">
- Demonstration of various include features - no includes in
- parallel threads.
+ Demonstration of various include features. Parallel threads
+ are off.
</sample>
</group>
<group name="XInclude Samples">
- <sample name="General" href="test.html">
+ <sample name="General" href="xinclude-test">
Demonstration of various XInclude and XPointer features.
</sample>
- <sample name="XML Base" href="xbase.html">
+ <sample name="XML Base" href="xinclude-base">
Demonstration of xml:base support.
</sample>
- <sample name="Loop Inclusion" href="xloop.html">
+ <sample name="Loop Inclusion" href="xinclude-loop">
Example of a loop inclusion. This will show an error page.
</sample>
- <sample name="Elementpath XPointer Scheme" href="xhtml.html">
+ <sample name="Elementpath XPointer Scheme" href="xinclude-html">
Example of streaming inclusion using the custom elementpath XPointer scheme.
</sample>
</group>
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap?rev=601840&r1=601839&r2=601840&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/aggregation/sitemap.xmap Thu Dec 6 12:14:24 2007
@@ -51,10 +51,6 @@
</map:serialize>
</map:match>
- <map:match pattern="sitemap.xmap">
- <map:read src="sitemap.xmap" mime-type="text/xml"/>
- </map:match>
-
<!--
- News sources, post processed using XSLT, for content aggregation
- samples.
@@ -212,12 +208,38 @@
- XInclude Samples
-->
- <map:match pattern="*.html">
- <map:generate src="content/{1}.xml"/>
+ <map:match pattern="xinclude-*">
+ <map:generate src="content/x{1}.xml"/>
<map:transform type="xinclude"/>
<map:serialize type="servletService">
<map:parameter name="service" value="servlet:style:/service/common/simple-page2html"/>
</map:serialize>
+ </map:match>
+
+
+ <!--
+ - COCOON-1985 Pipeline locking and parallel includes:
+ - Generating from cocoon source which includes self, in parallel threads, should not dead lock
+ -->
+ <map:match pattern="lock">
+ <map:generate src="content/ilock.xml"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ <map:match pattern="include-lock">
+ <map:generate src="cocoon:/lock"/>
+ <map:transform type="include">
+ <map:parameter name="parallel" value="true"/>
+ </map:transform>
+ <map:serialize type="servletService">
+ <map:parameter name="service" value="servlet:style:/service/common/simple-page2html"/>
+ </map:serialize>
+ </map:match>
+
+
+ <!-- This Sitemap -->
+ <map:match pattern="sitemap.xmap">
+ <map:read src="sitemap.xmap" mime-type="text/xml"/>
</map:match>
<!-- Source Files -->