cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1070396 - in /cocoon/cocoon3/trunk: cocoon-sample/src/main/resources/COB-INF/overview.html cocoon-sample/src/main/resources/COB-INF/sitemap.xmap cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml
Date Mon, 14 Feb 2011 07:04:53 GMT
Author: simonetripodi
Date: Mon Feb 14 07:04:53 2011
New Revision: 1070396

URL: http://svn.apache.org/viewvc?rev=1070396&view=rev
Log:
Cocoon3-55 The XInclude Transformer needs to be integrated in the sitemap - patch provided
by Francesco Chicchiriccò

Modified:
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html
    cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html?rev=1070396&r1=1070395&r2=1070396&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/overview.html Mon Feb 14
07:04:53 2011
@@ -92,6 +92,7 @@
   <h2>Aggregation</h2>
   <ul>
     <li><a href="aggregation/include-transformer">Include-Transformer</a>:
Aggregate XML using the IncludeTransformer.</li>
+    <li><a href="aggregation/xinclude-transformer">XInclude-Transformer</a>:
Aggregate XML using the XIncludeTransformer, working according to the <a href="http://www.w3.org/TR/xinclude/">XInclude
specification</a>.</li>
   </ul>
   <h2>XSLT</h2>
   <ul>

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap?rev=1070396&r1=1070395&r2=1070396&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/COB-INF/sitemap.xmap Mon Feb 14
07:04:53 2011
@@ -357,6 +357,11 @@
         <map:transform type="include" />
         <map:serialize type="xml" />
       </map:match>
+      <map:match equals="aggregation/xinclude-transformer">
+        <map:generate src="aggregation/xinclude.xml" />
+        <map:transform type="xinclude" />
+        <map:serialize type="xml" />
+      </map:match>
       <map:match equals="aggregation/sub-request">
         <map:generate src="aggregation/sub.xml" />
         <map:serialize type="xml" />

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml?rev=1070396&r1=1070395&r2=1070396&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml
Mon Feb 14 07:04:53 2011
@@ -46,6 +46,8 @@
 
   <bean name="transformer:include" class="org.apache.cocoon.sax.component.IncludeTransformer"
scope="prototype" />
 
+  <bean name="transformer:xinclude" class="org.apache.cocoon.sax.component.XIncludeTransformer"
scope="prototype" />
+
   <bean name="transformer:cleaning" class="org.apache.cocoon.sax.component.CleaningTransformer"
scope="prototype" />
 
   <bean name="transformer:logasxml" class="org.apache.cocoon.sax.component.LogAsXMLTransformer"
scope="prototype" />



Mime
View raw message