cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r542312 [11/14] - in /cocoon/trunk/blocks: cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/ cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/ cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/ co...
Date Mon, 28 May 2007 20:17:18 GMT
Modified: cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -17,107 +17,107 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Views =================================== -->
+  <!-- =========================== Views =================================== -->
 
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-
-        <!--
-            The debug view can be used to output an intermediate
-            snapshot of the pipeline.
-            Pass cocoon-view=debug as a URL parameter to see
-            the pipeline output produced by the transofrmer
-            labeled "debug". You can move the label to different
-            transformers to understand each processing
-            stage better.
-        -->
-        <map:view name="debug" from-label="debug">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view name="debug1" from-label="debug1">
-            <map:serialize type="xml" />
-        </map:view>
-
-    </map:views>
-
-    <!-- ======================== Resources ============================ -->
-
-    <map:resources>
-        <map:resource name="html">
-            <map:transform src="stylesheets/site2html.xsl" />
-            <map:serialize type="html" />
-        </map:resource>
-    </map:resources>
-
-    <!-- ======================== Flow ================================= -->
-
-    <map:flow language="javascript">
-        <map:script src="flow/PetStoreImpl.js" />
-        <map:script src="flow/petstore.js" />
-    </map:flow>
-
-    <!-- ======================== Pipelines ============================ -->
-
-    <map:pipelines>
-        <map:pipeline>
-            <map:match pattern="*.kont">
-                <!-- This handles sendPage*() continuations.-->
-                <map:call continuation="{1}" />
-            </map:match>
-            <map:match pattern="*.do">
-                <map:call function="main">
-                    <map:parameter name="page" value="{1}" />
-                </map:call>
-            </map:match>
-            <map:match pattern="">
-                <map:call function="index" />
-            </map:match>
-        </map:pipeline>
-        <map:pipeline>
-            <map:match pattern="view/*.xsp">
-                <map:generate src="view/xsp/{1}.xsp" type="serverpages" label="debug" />
-                <map:call resource="html" />
-            </map:match>
-            <map:match pattern="view/*.jxpath">
-                <map:generate src="view/jxpath/{1}.xml" type="file" />
-                <map:transform type="jx" label="debug" />
-                <map:call resource="html" />
-            </map:match>
-            <map:match pattern="view/*.jexl">
-                <map:generate src="view/jexl/{1}.xml" type="jx" label="debug" />
-                <map:call resource="html" />
-            </map:match>
-            <map:match pattern="view/*.vm">
-                <map:generate src="view/velocity/{1}.vm" type="velocity" label="debug" />
-                <map:serialize type="html" />
-            </map:match>
-            <map:match pattern="view/*.cforms">
-                <map:generate src="view/forms/{1}_t.xml" label="debug" />
-                <map:transform type="forms" label="debug1" />
-                <map:call resource="html" />
-            </map:match>
-        </map:pipeline>
-        <map:pipeline>
-            <map:match pattern="images/*.gif">
-                <map:read mime-type="image/gif" src="images/{1}.gif" />
-            </map:match>
-            <map:match pattern="images/*.jpg">
-                <map:read mime-type="image/jpeg" src="images/{1}.jpg" />
-            </map:match>
-        </map:pipeline>
-    </map:pipelines>
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+
+    <!--
+      The debug view can be used to output an intermediate
+      snapshot of the pipeline.
+      Pass cocoon-view=debug as a URL parameter to see
+      the pipeline output produced by the transofrmer
+      labeled "debug". You can move the label to different
+      transformers to understand each processing
+      stage better.
+    -->
+    <map:view name="debug" from-label="debug">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view name="debug1" from-label="debug1">
+      <map:serialize type="xml" />
+    </map:view>
+
+  </map:views>
+
+  <!-- ======================== Resources ============================ -->
+
+  <map:resources>
+    <map:resource name="html">
+      <map:transform src="stylesheets/site2html.xsl" />
+      <map:serialize type="html" />
+    </map:resource>
+  </map:resources>
+
+  <!-- ======================== Flow ================================= -->
+
+  <map:flow language="javascript">
+    <map:script src="flow/PetStoreImpl.js" />
+    <map:script src="flow/petstore.js" />
+  </map:flow>
+
+  <!-- ======================== Pipelines ============================ -->
+
+  <map:pipelines>
+    <map:pipeline>
+      <map:match pattern="*.kont">
+        <!-- This handles sendPage*() continuations.-->
+        <map:call continuation="{1}" />
+      </map:match>
+      <map:match pattern="*.do">
+        <map:call function="main">
+          <map:parameter name="page" value="{1}" />
+        </map:call>
+      </map:match>
+      <map:match pattern="">
+        <map:call function="index" />
+      </map:match>
+    </map:pipeline>
+    <map:pipeline>
+      <map:match pattern="view/*.xsp">
+        <map:generate src="view/xsp/{1}.xsp" type="serverpages" label="debug" />
+        <map:call resource="html" />
+      </map:match>
+      <map:match pattern="view/*.jxpath">
+        <map:generate src="view/jxpath/{1}.xml" type="file" />
+        <map:transform type="jx" label="debug" />
+        <map:call resource="html" />
+      </map:match>
+      <map:match pattern="view/*.jexl">
+        <map:generate src="view/jexl/{1}.xml" type="jx" label="debug" />
+        <map:call resource="html" />
+      </map:match>
+      <map:match pattern="view/*.vm">
+        <map:generate src="view/velocity/{1}.vm" type="velocity" label="debug" />
+        <map:serialize type="html" />
+      </map:match>
+      <map:match pattern="view/*.cforms">
+        <map:generate src="view/forms/{1}_t.xml" label="debug" />
+        <map:transform type="forms" label="debug1" />
+        <map:call resource="html" />
+      </map:match>
+    </map:pipeline>
+    <map:pipeline>
+      <map:match pattern="images/*.gif">
+        <map:read mime-type="image/gif" src="images/{1}.gif" />
+      </map:match>
+      <map:match pattern="images/*.jpg">
+        <map:read mime-type="image/jpeg" src="images/{1}.jpg" />
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/src/main/resources/META-INF/cocoon/spring/cocoon-petstore-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,7 +23,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.petstore.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-petstore-sample" context-path="blockcontext:/cocoon-petstore-sample/" />
-    </bean>
+  <bean id="org.apache.cocoon.petstore.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-petstore-sample" context-path="blockcontext:/cocoon-petstore-sample/" />
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -17,133 +17,133 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components =================================== -->
+  <!-- =========================== Components =================================== -->
 
-    <map:components>
+  <map:components>
 
-        <!-- =========================== Serializers =================================== -->
+    <!-- =========================== Serializers =================================== -->
 
-        <map:serializers default="html">
-            <map:serializer name="xls" src="org.apache.cocoon.serialization.HSSFSerializer" />
-        </map:serializers>
-
-    </map:components>
-
-    <!-- =========================== Views =================================== -->
-
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline>
-
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <map:match pattern="welcome">
-                <map:generate src="samples.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService" mime-type="text/html">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="hello.xls">
-                <map:generate src="servlet:main-sample:/hello-world/hello.xml" />
-                <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2xls.xsl" />
-                <map:serialize type="xls" />
-            </map:match>
-
-            <map:match pattern="*.xls">
-                <map:generate src="content/{1}.xml" />
-                <map:serialize type="xls" />
-            </map:match>
-            <!--
-                <map:match pattern="statetax-sql.xml">
-                <map:generate src="content/dynamic/statetax.xml"/>
-                <map:transform type="sql">
-                <map:parameter name="use-connection" value="personnel"/>
-                </map:transform>
-                <map:serialize type="xml"/>
-                </map:match>
-                
-                <map:match pattern="statetax.xml">
-                <map:generate src="content/dynamic/statetax.xml"/>
-                <map:transform type="sql">
-                <map:parameter name="use-connection" value="personnel"/>
-                </map:transform>
-                <map:transform src="stylesheets/statetax-sql2xls.xsl"/> 
-                <map:serialize type="xml"/>
-                </map:match>
-                
-                <map:match pattern="statetax.xls">
-                <map:generate src="content/dynamic/statetax.xml"/>
-                <map:transform type="sql">
-                <map:parameter name="use-connection" value="personnel"/>
-                </map:transform>
-                <map:transform src="stylesheets/statetax-sql2xls.xsl"/>
-                <map:serialize type="xls"/>
-                </map:match>
-                
-                <map:match pattern="statetax2.xls">
-                <map:generate src="content/dynamic/statetax2.xsp" type="serverpages"/>
-                <map:transform src="stylesheets/statetax-esql2xls.xsl"/>
-                <map:serialize type="xls"/>
-                </map:match>
-                
-                <map:match pattern="sql-xls/*.xls">
-                <map:generate src="context://samples/docs/samples/sql/{1}.xml"/>
-                <map:transform type="sql">
-                <map:parameter name="use-connecton" value="personnel"/>
-                </map:transform>
-                
-                <map:transform src="stylesheets/simple-sql2xls.xsl"/>
-                <map:serialize type="xls"/>
-                </map:match>
-                
-                <map:match pattern="xsp/*">
-                <map:generate src="content/dynamic/{1}.xsp" type="serverpages"/>-->
-            <!--
-                <map:transform src="context://samples/blocks/dynamic-page2html.xsl">
-                <map:parameter name="servletPath" value="{request:servletPath}"/>
-                <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-                <map:parameter name="contextPath" value="{request:contextPath}"/>
-                <map:parameter name="file" value=".xsp"/>
-                </map:transform>
-            -->
-            <!--    <map:serialize type="xml"/>
-                </map:match>
-                
-                
-                <map:match pattern="xspxml/*">
-                <map:generate src="content/dynamic/{1}.xsp" type="serverpages"/>
-                <map:transform src="stylesheets/statetax-esql2xls.xsl"/>
-                <map:serialize type="html"/>
-                </map:match>
-            -->
+    <map:serializers default="html">
+      <map:serializer name="xls" src="org.apache.cocoon.serialization.HSSFSerializer" />
+    </map:serializers>
+
+  </map:components>
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <map:match pattern="welcome">
+        <map:generate src="samples.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService" mime-type="text/html">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="hello.xls">
+        <map:generate src="servlet:main-sample:/hello-world/hello.xml" />
+        <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2xls.xsl" />
+        <map:serialize type="xls" />
+      </map:match>
+
+      <map:match pattern="*.xls">
+        <map:generate src="content/{1}.xml" />
+        <map:serialize type="xls" />
+      </map:match>
+      <!--
+        <map:match pattern="statetax-sql.xml">
+        <map:generate src="content/dynamic/statetax.xml"/>
+        <map:transform type="sql">
+        <map:parameter name="use-connection" value="personnel"/>
+        </map:transform>
+        <map:serialize type="xml"/>
+        </map:match>
+        
+        <map:match pattern="statetax.xml">
+        <map:generate src="content/dynamic/statetax.xml"/>
+        <map:transform type="sql">
+        <map:parameter name="use-connection" value="personnel"/>
+        </map:transform>
+        <map:transform src="stylesheets/statetax-sql2xls.xsl"/> 
+        <map:serialize type="xml"/>
+        </map:match>
+        
+        <map:match pattern="statetax.xls">
+        <map:generate src="content/dynamic/statetax.xml"/>
+        <map:transform type="sql">
+        <map:parameter name="use-connection" value="personnel"/>
+        </map:transform>
+        <map:transform src="stylesheets/statetax-sql2xls.xsl"/>
+        <map:serialize type="xls"/>
+        </map:match>
+        
+        <map:match pattern="statetax2.xls">
+        <map:generate src="content/dynamic/statetax2.xsp" type="serverpages"/>
+        <map:transform src="stylesheets/statetax-esql2xls.xsl"/>
+        <map:serialize type="xls"/>
+        </map:match>
+        
+        <map:match pattern="sql-xls/*.xls">
+        <map:generate src="context://samples/docs/samples/sql/{1}.xml"/>
+        <map:transform type="sql">
+        <map:parameter name="use-connecton" value="personnel"/>
+        </map:transform>
+        
+        <map:transform src="stylesheets/simple-sql2xls.xsl"/>
+        <map:serialize type="xls"/>
+        </map:match>
+        
+        <map:match pattern="xsp/*">
+        <map:generate src="content/dynamic/{1}.xsp" type="serverpages"/>-->
+      <!--
+        <map:transform src="context://samples/blocks/dynamic-page2html.xsl">
+        <map:parameter name="servletPath" value="{request:servletPath}"/>
+        <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+        <map:parameter name="contextPath" value="{request:contextPath}"/>
+        <map:parameter name="file" value=".xsp"/>
+        </map:transform>
+      -->
+      <!--    <map:serialize type="xml"/>
+        </map:match>
+        
+        
+        <map:match pattern="xspxml/*">
+        <map:generate src="content/dynamic/{1}.xsp" type="serverpages"/>
+        <map:transform src="stylesheets/statetax-esql2xls.xsl"/>
+        <map:serialize type="html"/>
+        </map:match>
+      -->
 
-            <!-- delegate to parent sitemap 
-                <map:handle-errors/> -->
+      <!-- delegate to parent sitemap 
+        <map:handle-errors/> -->
 
-        </map:pipeline>
+    </map:pipeline>
 
-    </map:pipelines>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/META-INF/cocoon/spring/cocoon-poi-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/META-INF/cocoon/spring/cocoon-poi-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/META-INF/cocoon/spring/cocoon-poi-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/src/main/resources/META-INF/cocoon/spring/cocoon-poi-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,12 +23,12 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.poi.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-poi-sample" context-path="blockcontext:/cocoon-poi-sample/">
-            <servlet:connections>
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-                <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.poi.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-poi-sample" context-path="blockcontext:/cocoon-poi-sample/">
+      <servlet:connections>
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+        <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-profiler-sitemap.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-profiler-sitemap.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-profiler-sitemap.xconf (original)
+++ cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-profiler-sitemap.xconf Mon May 28 13:17:10 2007
@@ -27,14 +27,14 @@
                    src="org.apache.cocoon.generation.ProfilerGenerator"/>
   </map:generators>
   <map:pipes>
-     <!-- The following two can be used for profiling:-->
-     <map:pipe name="profile-caching"
-                   src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
-     <map:pipe name="profile-noncaching"
-                   src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
-     <map:pipe name="profile-caching-sax"
-                   src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline" sax-stream="true"/>
-     <map:pipe name="profile-noncaching-sax"
-                   src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline" sax-stream="true"/>
+    <!-- The following two can be used for profiling:-->
+    <map:pipe name="profile-caching"
+              src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
+    <map:pipe name="profile-noncaching"
+              src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
+    <map:pipe name="profile-caching-sax"
+              src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline" sax-stream="true"/>
+    <map:pipe name="profile-noncaching-sax"
+              src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline" sax-stream="true"/>
   </map:pipes>
 </map:components>

Modified: cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,112 +18,112 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Views =================================== -->
+  <!-- =========================== Views =================================== -->
 
-    <map:views>
-        <map:view name="content" from-label="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view name="links" from-position="last">
-            <map:serialize type="links" />
-        </map:view>
-
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-
-        <!-- =========================== Cacheable ================================= -->
-
-        <map:pipeline type="profile-caching">
-
-            <map:match pattern="caching-testsite.html">
-                <map:generate src="test.xml" />
-                <map:transform src="test2page.xsl" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
-                </map:serialize>
-            </map:match>
-
-        </map:pipeline>
-
-        <!-- =========================== Noncacheable ================================= -->
-
-        <map:pipeline type="profile-noncaching">
-
-            <map:match pattern="noncaching-testsite.html">
-                <map:generate src="test.xml" />
-                <map:transform src="test2page.xsl" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
-                </map:serialize>
-            </map:match>
-
-        </map:pipeline>
-
-        <!-- =========================== Profiler ================================= -->
-
-        <map:pipeline type="caching">
-
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <map:match pattern="welcome">
-                <map:generate src="samples.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="profile.html">
-                <map:generate type="profiler" />
-                <!-- The type for this transform is set to xalan, because it causes an
-                    ArrayIndexOutOfBoundsException with xsltc (filed as bug 19770) -->
-                <map:transform type="xalan" src="profile2page.xsl">
-                    <map:parameter name="use-request-parameters" value="true" />
-                </map:transform>
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
-                </map:serialize>
-            </map:match>
-
-            <map:match pattern="profile2.html">
-                <map:generate type="profiler" />
-                <map:transform src="profile2html.xsl">
-                    <map:parameter name="use-request-parameters" value="true" />
-                </map:transform>
-                <map:serialize type="html" />
-            </map:match>
-
-            <map:match pattern="profile.xml">
-                <map:generate type="profiler" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="*.css">
-                <map:read src="{1}.css" mime-type="text/css" />
-            </map:match>
-
-            <map:match pattern="*.js">
-                <map:read src="{1}.js" mime-type="text/javascript" />
-            </map:match>
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links" />
+    </map:view>
+
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+
+    <!-- =========================== Cacheable ================================= -->
+
+    <map:pipeline type="profile-caching">
+
+      <map:match pattern="caching-testsite.html">
+        <map:generate src="test.xml" />
+        <map:transform src="test2page.xsl" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+        </map:serialize>
+      </map:match>
+
+    </map:pipeline>
+
+    <!-- =========================== Noncacheable ================================= -->
+
+    <map:pipeline type="profile-noncaching">
+
+      <map:match pattern="noncaching-testsite.html">
+        <map:generate src="test.xml" />
+        <map:transform src="test2page.xsl" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+        </map:serialize>
+      </map:match>
+
+    </map:pipeline>
+
+    <!-- =========================== Profiler ================================= -->
+
+    <map:pipeline type="caching">
+
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <map:match pattern="welcome">
+        <map:generate src="samples.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="profile.html">
+        <map:generate type="profiler" />
+        <!-- The type for this transform is set to xalan, because it causes an
+          ArrayIndexOutOfBoundsException with xsltc (filed as bug 19770) -->
+        <map:transform type="xalan" src="profile2page.xsl">
+          <map:parameter name="use-request-parameters" value="true" />
+        </map:transform>
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/complex-page2html" />
+        </map:serialize>
+      </map:match>
+
+      <map:match pattern="profile2.html">
+        <map:generate type="profiler" />
+        <map:transform src="profile2html.xsl">
+          <map:parameter name="use-request-parameters" value="true" />
+        </map:transform>
+        <map:serialize type="html" />
+      </map:match>
+
+      <map:match pattern="profile.xml">
+        <map:generate type="profiler" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="*.css">
+        <map:read src="{1}.css" mime-type="text/css" />
+      </map:match>
+
+      <map:match pattern="*.js">
+        <map:read src="{1}.js" mime-type="text/javascript" />
+      </map:match>
 
-        </map:pipeline>
+    </map:pipeline>
 
-    </map:pipelines>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/META-INF/cocoon/spring/cocoon-profiler-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/META-INF/cocoon/spring/cocoon-profiler-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/META-INF/cocoon/spring/cocoon-profiler-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/src/main/resources/META-INF/cocoon/spring/cocoon-profiler-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.profiler.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-profiler-sample" context-path="blockcontext:/cocoon-profiler-sample/">
-            <servlet:connections>
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.profiler.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-profiler-sample" context-path="blockcontext:/cocoon-profiler-sample/">
+      <servlet:connections>
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -17,61 +17,61 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Views =================================== -->
+  <!-- =========================== Views =================================== -->
 
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-
-        <map:view name="xml" from-label="xml">
-            <map:serialize type="xml" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline>
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <map:match pattern="welcome">
-                <map:generate src="samples.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-        </map:pipeline>
-
-        <!-- pipeline mounting Cocoon hive portal demo -->
-        <map:pipeline>
-            <map:match pattern="cocoonhive/**">
-                <map:mount src="cocoonhive/" uri-prefix="cocoonhive" />
-            </map:match>
-        </map:pipeline>
-
-        <!-- Interactive Web Application Syndication  -->
-        <map:pipeline>
-            <map:match pattern="wsproxy/*">
-                <map:generate type="wsproxy" label="xml" src="http://{request:serverName}:{request:serverPort}{servlet:main-sample:/}hello-world/hello.xml" />
-                <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2html.xsl" />
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize type="html" />
-            </map:match>
-        </map:pipeline>
-    </map:pipelines>
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+
+    <map:view name="xml" from-label="xml">
+      <map:serialize type="xml" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline>
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <map:match pattern="welcome">
+        <map:generate src="samples.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+    </map:pipeline>
+
+    <!-- pipeline mounting Cocoon hive portal demo -->
+    <map:pipeline>
+      <map:match pattern="cocoonhive/**">
+        <map:mount src="cocoonhive/" uri-prefix="cocoonhive" />
+      </map:match>
+    </map:pipeline>
+
+    <!-- Interactive Web Application Syndication  -->
+    <map:pipeline>
+      <map:match pattern="wsproxy/*">
+        <map:generate type="wsproxy" label="xml" src="http://{request:serverName}:{request:serverPort}{servlet:main-sample:/}hello-world/hello.xml" />
+        <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2html.xsl" />
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize type="html" />
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/META-INF/cocoon/spring/cocoon-proxy-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/META-INF/cocoon/spring/cocoon-proxy-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/META-INF/cocoon/spring/cocoon-proxy-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/src/main/resources/META-INF/cocoon/spring/cocoon-proxy-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,12 +23,12 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.proxy.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-proxy-sample" context-path="blockcontext:/cocoon-proxy-sample/">
-            <servlet:connections>
-                <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.proxy.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-proxy-sample" context-path="blockcontext:/cocoon-proxy-sample/">
+      <servlet:connections>
+        <entry key="main-sample" value-ref="org.apache.cocoon.core.main.sample.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/main/resources/META-INF/cocoon/conf/python-language.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/main/resources/META-INF/cocoon/conf/python-language.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/main/resources/META-INF/cocoon/conf/python-language.xconf (original)
+++ cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/main/resources/META-INF/cocoon/conf/python-language.xconf Mon May 28 13:17:10 2007
@@ -17,6 +17,6 @@
 -->
 
 <xconf xpath="cocoon/programming-languages" unless="python-language">
-    <!-- Python language -->
-    <python-language name="python" logger="core.language.python"/>
+  <!-- Python language -->
+  <python-language name="python" logger="core.language.python" />
 </xconf>

Modified: cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/main/resources/META-INF/cocoon/conf/python-xsp.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/main/resources/META-INF/cocoon/conf/python-xsp.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/main/resources/META-INF/cocoon/conf/python-xsp.xconf (original)
+++ cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/main/resources/META-INF/cocoon/conf/python-xsp.xconf Mon May 28 13:17:10 2007
@@ -18,8 +18,8 @@
 
 <xconf xpath="cocoon/markup-languages/xsp-language[@name='xsp']"
        unless="target-language[@name='python']">
-      <!-- XSP in Python -->
-      <target-language name="python">
-        <parameter name="core-logicsheet" value="resource://org/apache/cocoon/components/language/markup/xsp/python/xsp.xsl"/>
-      </target-language>
+  <!-- XSP in Python -->
+  <target-language name="python">
+    <parameter name="core-logicsheet" value="resource://org/apache/cocoon/components/language/markup/xsp/python/xsp.xsl" />
+  </target-language>
 </xconf>

Modified: cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -20,55 +20,55 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Views =================================== -->
+  <!-- =========================== Views =================================== -->
 
-    <map:views>
-        <map:view name="content" from-label="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view name="links" from-position="last">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline>
-
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <map:match pattern="welcome">
-                <map:generate src="samples.xml" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-                </map:serialize>
-            </map:match>
-
-            <!-- Output Javadoc XML: -->
-            <map:match pattern="javadoc-xml/*">
-                <map:generate src="qdox:{1}" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <!-- Output Javadoc HTML: -->
-            <map:match pattern="javadoc/*">
-                <map:generate src="qdox:{1}" />
-                <map:transform src="stylesheets/qdox2html.xsl" />
-                <map:serialize type="html" />
-            </map:match>
-        </map:pipeline>
-    </map:pipelines>
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <map:match pattern="welcome">
+        <map:generate src="samples.xml" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
+        </map:serialize>
+      </map:match>
+
+      <!-- Output Javadoc XML: -->
+      <map:match pattern="javadoc-xml/*">
+        <map:generate src="qdox:{1}" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <!-- Output Javadoc HTML: -->
+      <map:match pattern="javadoc/*">
+        <map:generate src="qdox:{1}" />
+        <map:transform src="stylesheets/qdox2html.xsl" />
+        <map:serialize type="html" />
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/src/main/resources/META-INF/cocoon/spring/cocoon-qdox-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/src/main/resources/META-INF/cocoon/spring/cocoon-qdox-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/src/main/resources/META-INF/cocoon/spring/cocoon-qdox-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/src/main/resources/META-INF/cocoon/spring/cocoon-qdox-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,11 +23,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.qdox.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-qdox-sample" context-path="blockcontext:/cocoon-qdox-sample/">
-            <servlet:connections>
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.qdox.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-qdox-sample" context-path="blockcontext:/cocoon-qdox-sample/">
+      <servlet:connections>
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,246 +18,246 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components =================================== -->
+  <!-- =========================== Components =================================== -->
 
-    <map:components>
-        <map:include-properties dir="properties" />
-        <map:transformers default="xslt">
-            <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
-                <catalogues default="forms">
-                    <catalogue id="local" name="messages" location="i18n" />
-                    <catalogue id="forms" name="FormsMessages" location="servlet:forms:/resource/internal/i18n" />
-                </catalogues>
-                <cache-at-startup>true</cache-at-startup>
-            </map:transformer>
-            <map:transformer name="lucene-indexer" src="org.apache.cocoon.transformation.LuceneIndexTransformer" />
-        </map:transformers>
-        <map:pipes default="caching" />
-    </map:components>
-
-    <!-- =========================== FlowScripts =================================== -->
-
-    <map:flow language="javascript">
-        <map:script src="flow/query.js" />
-        <map:script src="flow/indexer.js" />
-    </map:flow>
-
-    <!-- =========================== Views =================================== -->
-
-    <map:views>
-        <map:view name="content" from-label="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view name="links" from-position="last">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline internal-only="true">
-
-            <map:act type="locale">
-
-                <!-- displays the forms -->
-                <map:match pattern="form/*">
-                    <map:generate type="jx" src="forms/{1}-template.xml" />
-                    <map:transform type="forms">
-                        <map:parameter name="locale" value="{../locale}" />
-                    </map:transform>
-                    <map:transform type="i18n">
-                        <map:parameter name="locale" value="{../locale}" />
-                    </map:transform>
-                    <map:transform src="stylesheets/forms-samples-styling.xsl">
-                        <map:parameter name="dojo-resources" value="{servlet:ajax:/resource/external/dojo}" />
-                        <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}" />
-                    </map:transform>
-                    <!-- Make use of servlet services -->
-                    <map:serialize type="servletService">
-                        <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
-                    </map:serialize>
-                </map:match>
-
-                <!-- prepare the document for indexing -->
-                <map:match pattern="prepare4indexing/**">
-                    <map:generate src="{1}" />
-                    <map:transform src="stylesheets/content2lucene.xsl" />
-                    <map:serialize type="xml" />
-                </map:match>
-
-                <!-- the lucene indexer -->
-                <map:match pattern="screen/indexer">
-                    <map:generate type="jx" src="screens/lucene-indexer.xml" />
-                    <map:transform type="cinclude" />
-                    <map:transform type="lucene-indexer" />
-                    <map:transform src="stylesheets/lucene2simple-page.xsl" />
-                    <!-- Make use of servlet services -->
-                    <map:serialize type="servletService">
-                        <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
-                    </map:serialize>
-                </map:match>
-
-                <!-- displays the rest of the screens -->
-                <map:match pattern="screen/*">
-                    <map:generate type="jx" src="screens/{1}.xml" />
-                    <map:transform type="i18n">
-                        <map:parameter name="locale" value="{../locale}" />
-                    </map:transform>
-                    <!-- Make use of servlet services -->
-                    <map:serialize type="servletService">
-                        <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
-                    </map:serialize>
-                </map:match>
-
-            </map:act>
-
-        </map:pipeline>
-
-        <map:pipeline>
-
-            <!--					
-                Used for CForms Continuations
-                
-                must be placed before external page pipelines
-                and after internal screen pipelines
-                otherwise you get infinite loops					 
-            -->
-            <map:match type="request-parameter" pattern="continuation-id">
-                <map:call continuation="{1}" />
-            </map:match>
-
-            <!-- home page -->
-            <map:match pattern="">
-                <map:redirect-to uri="cocoon:/screen/index" />
-            </map:match>
-            <map:match pattern="welcome">
-                <map:redirect-to uri="cocoon:/screen/index" />
-            </map:match>
-
-            <map:match pattern="images/**">
-                <map:read src="resources/images/{1}" />
-            </map:match>
-
-            <!-- create the index from the contents of a collection -->
-            <map:match pattern="create.html">
-                <map:call function="indexCollection">
-                    <map:parameter name="screen" value="screen/indexer" />
-                    <map:parameter name="lucene-directory" value="{global:lucene-directory}" />
-                    <map:parameter name="lucene-analyzer" value="{global:lucene-analyzer}" />
-                    <map:parameter name="lucene-merge-factor" value="10" />
-                    <map:parameter name="lucene-create-index" value="false" />
-                    <map:parameter name="lucene-content" value="cocoon:/prepare4indexing/" />
-                    <map:parameter name="content-directory" value="context://docs/xdocs" />
-                    <map:parameter name="include-pattern" value="\.xml$" />
-                    <map:parameter name="exclude-pattern" value="/book\.xml$" />
-                    <map:parameter name="result-directory" value="/docs/" />
-                    <map:parameter name="result-suffix" value=".html" />
-                </map:call>
-            </map:match>
-
-            <!-- update the index with a single resource -->
-            <map:match pattern="update/**">
-                <map:call function="indexItem">
-                    <map:parameter name="screen" value="screen/indexer" />
-                    <map:parameter name="lucene-directory" value="{global:lucene-directory}" />
-                    <map:parameter name="lucene-analyzer" value="{global:lucene-analyzer}" />
-                    <map:parameter name="lucene-merge-factor" value="10" />
-                    <map:parameter name="lucene-create-index" value="false" />
-                    <map:parameter name="lucene-content" value="cocoon:/prepare4indexing/" />
-                    <map:parameter name="content-directory" value="{global:root}" />
-                    <map:parameter name="indexer-target" value="{1}" /><!-- the resource to be indexed -->
-                    <map:parameter name="result-directory" value="/docs/" />
-                    <map:parameter name="result-suffix" value=".html" />
-                </map:call>
-            </map:match>
-
-            <!-- list history -->
-            <map:match pattern="history.html">
-                <map:call function="showHistory">
-                    <map:parameter name="screen" value="screen/history" />
-                    <map:parameter name="history" value="{global:history}" />
-                </map:call>
-            </map:match>
-
-            <!-- clear history -->
-            <map:match pattern="clear-history.html">
-                <map:call function="clearHistory">
-                    <map:parameter name="screen" value="screen/history" />
-                    <map:parameter name="history" value="{global:history}" />
-                </map:call>
-            </map:match>
-
-            <!-- list favourites -->
-            <map:match pattern="favourites.html">
-                <map:call function="showFavourites">
-                    <map:parameter name="screen" value="screen/favourites" />
-                    <map:parameter name="user-id" value="anon" />
-                    <!-- NB. this value is for testing .... it is more likely you would use a value like the commented out one below -->
-                    <!--<map:parameter name="user-id" value="{session-context:authentication/authentication/ID}"/>-->
-                </map:call>
-            </map:match>
-
-            <!-- add a history item to the favourites, using the history ID -->
-            <map:match pattern="add-favourite.html">
-                <map:call function="addFavourite">
-                    <map:parameter name="screen" value="screen/favourites" />
-                    <map:parameter name="user-id" value="anon" />
-                    <!-- NB. this value is for testing .... it is more likely you would use a value like the commented out one below -->
-                    <!--<map:parameter name="user-id" value="{session-context:authentication/authentication/ID}"/>-->
-                    <map:parameter name="hid" value="{request-param:hid}" />
-                    <map:parameter name="history" value="{global:history}" />
-                </map:call>
-            </map:match>
-
-            <!-- remove an item from the favourites, using the favourite ID -->
-            <map:match pattern="remove-favourite.html">
-                <map:call function="removeFavourite">
-                    <map:parameter name="screen" value="screen/favourites" />
-                    <map:parameter name="user-id" value="anon" />
-                    <!-- NB. this value is for testing .... it is more likely you would use a value like the commented out one below -->
-                    <!--<map:parameter name="user-id" value="{session-context:authentication/authentication/ID}"/>-->
-                    <map:parameter name="fid" value="{request-param:fid}" />
-                </map:call>
-            </map:match>
-
-            <!-- do the searches -->
-            <map:match pattern="*.html">
-                <map:call function="doSearch">
-                    <map:parameter name="form" value="form/{1}" />
-                    <map:parameter name="form-definition" value="forms/{1}-model.xml" />
-                    <map:parameter name="bindingURI" value="forms/{1}-binding.xml" />
-                    <map:parameter name="lucene-directory" value="{global:lucene-directory}" />
-                    <map:parameter name="lucene-analyzer" value="{global:lucene-analyzer}" />
-                    <map:parameter name="screen" value="screen/results" />
-                    <map:parameter name="history" value="{global:history}" />
-                    <map:parameter name="type" value="{1}" />
-                    <map:parameter name="hid" value="{request-param:hid}" />
-                    <map:parameter name="fid" value="{request-param:fid}" />
-                    <map:parameter name="page" value="{request-param:page}" />
-                    <map:parameter name="query" value="{request-param:query}" />
-                    <map:parameter name="match" value="{request-param:match}" />
-                    <map:parameter name="field" value="{request-param:field}" />
-                    <map:parameter name="size" value="{request-param:size}" />
-                    <map:parameter name="bool" value="{request-param:bool}" />
-                </map:call>
-            </map:match>
-
-            <!-- used in the docs, to show files -->
-            <map:match pattern="**.xml">
-                <map:generate src="{1}.xml" />
-                <map:serialize type="xml" />
-            </map:match>
+  <map:components>
+    <map:include-properties dir="properties" />
+    <map:transformers default="xslt">
+      <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+        <catalogues default="forms">
+          <catalogue id="local" name="messages" location="i18n" />
+          <catalogue id="forms" name="FormsMessages" location="servlet:forms:/resource/internal/i18n" />
+        </catalogues>
+        <cache-at-startup>true</cache-at-startup>
+      </map:transformer>
+      <map:transformer name="lucene-indexer" src="org.apache.cocoon.transformation.LuceneIndexTransformer" />
+    </map:transformers>
+    <map:pipes default="caching" />
+  </map:components>
+
+  <!-- =========================== FlowScripts =================================== -->
+
+  <map:flow language="javascript">
+    <map:script src="flow/query.js" />
+    <map:script src="flow/indexer.js" />
+  </map:flow>
+
+  <!-- =========================== Views =================================== -->
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline internal-only="true">
+
+      <map:act type="locale">
+
+        <!-- displays the forms -->
+        <map:match pattern="form/*">
+          <map:generate type="jx" src="forms/{1}-template.xml" />
+          <map:transform type="forms">
+            <map:parameter name="locale" value="{../locale}" />
+          </map:transform>
+          <map:transform type="i18n">
+            <map:parameter name="locale" value="{../locale}" />
+          </map:transform>
+          <map:transform src="stylesheets/forms-samples-styling.xsl">
+            <map:parameter name="dojo-resources" value="{servlet:ajax:/resource/external/dojo}" />
+            <map:parameter name="forms-resources" value="{servlet:forms:/resource/external/forms}" />
+          </map:transform>
+          <!-- Make use of servlet services -->
+          <map:serialize type="servletService">
+            <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
+          </map:serialize>
+        </map:match>
+
+        <!-- prepare the document for indexing -->
+        <map:match pattern="prepare4indexing/**">
+          <map:generate src="{1}" />
+          <map:transform src="stylesheets/content2lucene.xsl" />
+          <map:serialize type="xml" />
+        </map:match>
+
+        <!-- the lucene indexer -->
+        <map:match pattern="screen/indexer">
+          <map:generate type="jx" src="screens/lucene-indexer.xml" />
+          <map:transform type="cinclude" />
+          <map:transform type="lucene-indexer" />
+          <map:transform src="stylesheets/lucene2simple-page.xsl" />
+          <!-- Make use of servlet services -->
+          <map:serialize type="servletService">
+            <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
+          </map:serialize>
+        </map:match>
+
+        <!-- displays the rest of the screens -->
+        <map:match pattern="screen/*">
+          <map:generate type="jx" src="screens/{1}.xml" />
+          <map:transform type="i18n">
+            <map:parameter name="locale" value="{../locale}" />
+          </map:transform>
+          <!-- Make use of servlet services -->
+          <map:serialize type="servletService">
+            <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
+          </map:serialize>
+        </map:match>
+
+      </map:act>
+
+    </map:pipeline>
+
+    <map:pipeline>
+
+      <!--					
+        Used for CForms Continuations
+        
+        must be placed before external page pipelines
+        and after internal screen pipelines
+        otherwise you get infinite loops					 
+      -->
+      <map:match type="request-parameter" pattern="continuation-id">
+        <map:call continuation="{1}" />
+      </map:match>
+
+      <!-- home page -->
+      <map:match pattern="">
+        <map:redirect-to uri="cocoon:/screen/index" />
+      </map:match>
+      <map:match pattern="welcome">
+        <map:redirect-to uri="cocoon:/screen/index" />
+      </map:match>
+
+      <map:match pattern="images/**">
+        <map:read src="resources/images/{1}" />
+      </map:match>
+
+      <!-- create the index from the contents of a collection -->
+      <map:match pattern="create.html">
+        <map:call function="indexCollection">
+          <map:parameter name="screen" value="screen/indexer" />
+          <map:parameter name="lucene-directory" value="{global:lucene-directory}" />
+          <map:parameter name="lucene-analyzer" value="{global:lucene-analyzer}" />
+          <map:parameter name="lucene-merge-factor" value="10" />
+          <map:parameter name="lucene-create-index" value="false" />
+          <map:parameter name="lucene-content" value="cocoon:/prepare4indexing/" />
+          <map:parameter name="content-directory" value="context://docs/xdocs" />
+          <map:parameter name="include-pattern" value="\.xml$" />
+          <map:parameter name="exclude-pattern" value="/book\.xml$" />
+          <map:parameter name="result-directory" value="/docs/" />
+          <map:parameter name="result-suffix" value=".html" />
+        </map:call>
+      </map:match>
+
+      <!-- update the index with a single resource -->
+      <map:match pattern="update/**">
+        <map:call function="indexItem">
+          <map:parameter name="screen" value="screen/indexer" />
+          <map:parameter name="lucene-directory" value="{global:lucene-directory}" />
+          <map:parameter name="lucene-analyzer" value="{global:lucene-analyzer}" />
+          <map:parameter name="lucene-merge-factor" value="10" />
+          <map:parameter name="lucene-create-index" value="false" />
+          <map:parameter name="lucene-content" value="cocoon:/prepare4indexing/" />
+          <map:parameter name="content-directory" value="{global:root}" />
+          <map:parameter name="indexer-target" value="{1}" /><!-- the resource to be indexed -->
+          <map:parameter name="result-directory" value="/docs/" />
+          <map:parameter name="result-suffix" value=".html" />
+        </map:call>
+      </map:match>
+
+      <!-- list history -->
+      <map:match pattern="history.html">
+        <map:call function="showHistory">
+          <map:parameter name="screen" value="screen/history" />
+          <map:parameter name="history" value="{global:history}" />
+        </map:call>
+      </map:match>
+
+      <!-- clear history -->
+      <map:match pattern="clear-history.html">
+        <map:call function="clearHistory">
+          <map:parameter name="screen" value="screen/history" />
+          <map:parameter name="history" value="{global:history}" />
+        </map:call>
+      </map:match>
+
+      <!-- list favourites -->
+      <map:match pattern="favourites.html">
+        <map:call function="showFavourites">
+          <map:parameter name="screen" value="screen/favourites" />
+          <map:parameter name="user-id" value="anon" />
+          <!-- NB. this value is for testing .... it is more likely you would use a value like the commented out one below -->
+          <!--<map:parameter name="user-id" value="{session-context:authentication/authentication/ID}"/>-->
+        </map:call>
+      </map:match>
+
+      <!-- add a history item to the favourites, using the history ID -->
+      <map:match pattern="add-favourite.html">
+        <map:call function="addFavourite">
+          <map:parameter name="screen" value="screen/favourites" />
+          <map:parameter name="user-id" value="anon" />
+          <!-- NB. this value is for testing .... it is more likely you would use a value like the commented out one below -->
+          <!--<map:parameter name="user-id" value="{session-context:authentication/authentication/ID}"/>-->
+          <map:parameter name="hid" value="{request-param:hid}" />
+          <map:parameter name="history" value="{global:history}" />
+        </map:call>
+      </map:match>
+
+      <!-- remove an item from the favourites, using the favourite ID -->
+      <map:match pattern="remove-favourite.html">
+        <map:call function="removeFavourite">
+          <map:parameter name="screen" value="screen/favourites" />
+          <map:parameter name="user-id" value="anon" />
+          <!-- NB. this value is for testing .... it is more likely you would use a value like the commented out one below -->
+          <!--<map:parameter name="user-id" value="{session-context:authentication/authentication/ID}"/>-->
+          <map:parameter name="fid" value="{request-param:fid}" />
+        </map:call>
+      </map:match>
+
+      <!-- do the searches -->
+      <map:match pattern="*.html">
+        <map:call function="doSearch">
+          <map:parameter name="form" value="form/{1}" />
+          <map:parameter name="form-definition" value="forms/{1}-model.xml" />
+          <map:parameter name="bindingURI" value="forms/{1}-binding.xml" />
+          <map:parameter name="lucene-directory" value="{global:lucene-directory}" />
+          <map:parameter name="lucene-analyzer" value="{global:lucene-analyzer}" />
+          <map:parameter name="screen" value="screen/results" />
+          <map:parameter name="history" value="{global:history}" />
+          <map:parameter name="type" value="{1}" />
+          <map:parameter name="hid" value="{request-param:hid}" />
+          <map:parameter name="fid" value="{request-param:fid}" />
+          <map:parameter name="page" value="{request-param:page}" />
+          <map:parameter name="query" value="{request-param:query}" />
+          <map:parameter name="match" value="{request-param:match}" />
+          <map:parameter name="field" value="{request-param:field}" />
+          <map:parameter name="size" value="{request-param:size}" />
+          <map:parameter name="bool" value="{request-param:bool}" />
+        </map:call>
+      </map:match>
+
+      <!-- used in the docs, to show files -->
+      <map:match pattern="**.xml">
+        <map:generate src="{1}.xml" />
+        <map:serialize type="xml" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/cocoon-query-bean-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/cocoon-query-bean-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/cocoon-query-bean-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/META-INF/cocoon/spring/cocoon-query-bean-sample-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,13 +23,13 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.querybean.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-querybean-sample" context-path="blockcontext:/cocoon-querybean-sample/">
-            <servlet:connections>
-                <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet"/>
-                <entry key="forms" value-ref="org.apache.cocoon.forms.impl.servlet"/>
-                <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-            </servlet:connections>
-        </servlet:context>
-    </bean>
+  <bean id="org.apache.cocoon.querybean.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-querybean-sample" context-path="blockcontext:/cocoon-querybean-sample/">
+      <servlet:connections>
+        <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet" />
+        <entry key="forms" value-ref="org.apache.cocoon.forms.impl.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+      </servlet:connections>
+    </servlet:context>
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -16,53 +16,53 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-  
+
   <map:pipelines>
-      <map:pipeline id="service-resource">
-          <!-- 
-              All matcher in this pipeline are intended to be called
-              when making use of servlet services from other blocks 
-          -->
-          <map:match pattern="service/blocks/*">
-              <map:generate src="service-consumer:" />
-              <map:transform src="blocks/{1}.xsl" />
-              <map:transform type="servletLinkRewriter" />
-              <map:serialize type="html" />
-          </map:match>
-          <map:match pattern="service/common/*">
-              <map:generate src="service-consumer:" />
-              <map:transform src="common/style/xsl/html/{1}.xsl" />
-              <map:transform type="servletLinkRewriter" />
-              <map:serialize type="html" />
-          </map:match>
-          <map:match pattern="service/system/*">
-              <map:generate src="service-consumer:" />
-              <map:transform src="stylesheets/system/{1}.xslt" />
-              <map:transform type="servletLinkRewriter" />
-              <map:serialize type="html" />
-          </map:match>
-      </map:pipeline>
+    <map:pipeline id="service-resource">
+      <!-- 
+        All matcher in this pipeline are intended to be called
+        when making use of servlet services from other blocks 
+      -->
+      <map:match pattern="service/blocks/*">
+        <map:generate src="service-consumer:" />
+        <map:transform src="blocks/{1}.xsl" />
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize type="html" />
+      </map:match>
+      <map:match pattern="service/common/*">
+        <map:generate src="service-consumer:" />
+        <map:transform src="common/style/xsl/html/{1}.xsl" />
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize type="html" />
+      </map:match>
+      <map:match pattern="service/system/*">
+        <map:generate src="service-consumer:" />
+        <map:transform src="stylesheets/system/{1}.xslt" />
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize type="html" />
+      </map:match>
+    </map:pipeline>
 
-      <map:pipeline id="internal-resource">
-          <map:match pattern="**.css">
-              <map:read src="resources/{1}.css" />
-          </map:match>
-          <map:match pattern="**.gif">
-              <map:read src="resources/{1}.gif" />
-          </map:match>
-          <map:match pattern="**.ico">
-              <map:read src="resources/{1}.ico" />
-          </map:match>
-      </map:pipeline>
+    <map:pipeline id="internal-resource">
+      <map:match pattern="**.css">
+        <map:read src="resources/{1}.css" />
+      </map:match>
+      <map:match pattern="**.gif">
+        <map:read src="resources/{1}.gif" />
+      </map:match>
+      <map:match pattern="**.ico">
+        <map:read src="resources/{1}.ico" />
+      </map:match>
+    </map:pipeline>
 
-      <map:pipeline id="external-resource">
-          <map:match pattern="**.js">
-              <map:read type="servletLinkRewriter" src="resources/{1}.js" />
-          </map:match>
-          <map:match pattern="**">
-              <map:read type="servletLinkRewriter" src="{1}" />
-          </map:match>
-      </map:pipeline>
+    <map:pipeline id="external-resource">
+      <map:match pattern="**.js">
+        <map:read type="servletLinkRewriter" src="resources/{1}.js" />
+      </map:match>
+      <map:match pattern="**">
+        <map:read type="servletLinkRewriter" src="{1}" />
+      </map:match>
+    </map:pipeline>
   </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/META-INF/cocoon/spring/cocoon-samples-style-default-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/META-INF/cocoon/spring/cocoon-samples-style-default-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/META-INF/cocoon/spring/cocoon-samples-style-default-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/META-INF/cocoon/spring/cocoon-samples-style-default-blockServlet.xml Mon May 28 13:17:10 2007
@@ -23,7 +23,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-    <bean id="org.apache.cocoon.samples.style.default.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-samples-style-default" context-path="blockcontext:/cocoon-samples-style-default/"/>
-    </bean>
+  <bean id="org.apache.cocoon.samples.style.default.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-samples-style-default" context-path="blockcontext:/cocoon-samples-style-default/" />
+  </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/flow-webservices/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/flow-webservices/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/flow-webservices/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/flow-webservices/sitemap.xmap Mon May 28 13:17:10 2007
@@ -17,52 +17,52 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Views =================================== -->
+  <!-- =========================== Views =================================== -->
 
-    <map:views>
-        <map:view from-label="content" name="content">
-            <map:serialize type="xml" />
-        </map:view>
-
-        <map:view from-label="content" name="pretty-content">
-            <!-- Make use of servlet services -->
-            <map:serialize type="servletService">
-                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
-            </map:serialize>
-        </map:view>
-
-        <map:view from-position="last" name="links">
-            <map:serialize type="links" />
-        </map:view>
-    </map:views>
-
-    <!-- =========================== Flowscripts ================================= -->
-
-    <map:flow language="javascript">
-        <map:script src="flowWebServices.js" />
-    </map:flow>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline>
-            <!--+
-                | produces the screens called by the flowscript
-                +-->
-            <map:match pattern="page/*">
-                <map:generate type="jx" src="{1}.jx" />
-                <!-- Make use of servlet services -->
-                <map:serialize type="servletService">
-                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
-                </map:serialize>
-                <map:serialize />
-            </map:match>
-        </map:pipeline>
-       
-        <map:pipeline>
-            <map:match pattern="*">
-                <map:call function="{1}" />
-            </map:match>
-        </map:pipeline>
-    </map:pipelines>
+  <map:views>
+    <map:view from-label="content" name="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <!-- Make use of servlet services -->
+      <map:serialize type="servletService">
+        <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+      </map:serialize>
+    </map:view>
+
+    <map:view from-position="last" name="links">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <!-- =========================== Flowscripts ================================= -->
+
+  <map:flow language="javascript">
+    <map:script src="flowWebServices.js" />
+  </map:flow>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline>
+      <!--+
+        | produces the screens called by the flowscript
+        +-->
+      <map:match pattern="page/*">
+        <map:generate type="jx" src="{1}.jx" />
+        <!-- Make use of servlet services -->
+        <map:serialize type="servletService">
+          <map:parameter name="service" value="servlet:style-default:/service/common/simple-page2html" />
+        </map:serialize>
+        <map:serialize />
+      </map:match>
+    </map:pipeline>
+
+    <map:pipeline>
+      <map:match pattern="*">
+        <map:call function="{1}" />
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>



Mime
View raw message