You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by fe...@apache.org on 2007/05/28 22:17:18 UTC

svn commit: r542312 [8/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/ coc...

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/sitemap.xmap Mon May 28 13:17:10 2007
@@ -21,92 +21,92 @@
     +-->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components =================================== -->
+  <!-- =========================== Components =================================== -->
 
-    <map:components>
+  <map:components>
 
-        <!-- =========================== Selectors =================================== -->
+    <!-- =========================== Selectors =================================== -->
 
-        <map:selectors>
-            <map:selector name="ajax-request" src="org.apache.cocoon.ajax.AjaxRequestSelector" />
-        </map:selectors>
-
-        <!-- =========================== Transformers =================================== -->
-
-        <map:transformers default="xslt">
-            <map:transformer name="browser-update" src="org.apache.cocoon.ajax.BrowserUpdateTransformer" />
-            <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
-                <catalogues default="forms">
-                    <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n" />
-                </catalogues>
-            </map:transformer>
-        </map:transformers>
-    </map:components>
-
-    <!-- =========================== Flowscripts =================================== -->
-
-    <map:flow>
-        <map:script src="flow/flow.js" />
-        <map:script src="flow/jdbi.js" />
-    </map:flow>
-
-    <!-- =========================== Pipelines =================================== -->
-
-    <map:pipelines>
-        <!-- Public URLs -->
-        <map:pipeline>
-            <!-- Main page: list employees -->
-            <map:match pattern="">
-                <map:redirect-to uri="do_list_employees" />
-            </map:match>
-
-            <map:match pattern="do_*">
-                <map:call function="do_{1}" />
-            </map:match>
-
-            <map:match pattern="continue">
-                <map:call continuation="{request-param:continuation-id}" />
-            </map:match>
-
-        </map:pipeline>
-
-        <!-- Internal URLs -->
-        <map:pipeline internal-only="false">
-
-            <map:match pattern="selection-list/*">
-                <map:call function="selection_list">
-                    <map:parameter name="table" value="{1}" />
-                </map:call>
-            </map:match>
-
-            <map:match pattern="*.xml">
-                <map:generate type="jx" src="{1}.xml" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="viewform-*.html">
-                <map:generate type="jx" src="pages/{1}.xml" />
-                <map:transform type="browser-update" />
-                <map:transform type="i18n" />
-                <map:transform src="../resources/forms-samples-styling.xsl" />
-                <map:select type="ajax-request">
-                    <map:when test="true">
-                        <map:serialize type="xml" />
-                    </map:when>
-                    <map:otherwise>
-                        <map:transform src="resources/page-styling.xsl" />
-                        <map:serialize type="html" />
-                    </map:otherwise>
-                </map:select>
-            </map:match>
-
-            <map:match pattern="*.html">
-                <map:generate type="jx" src="pages/{1}.xml" />
-                <map:transform src="resources/page-styling.xsl" />
-                <map:serialize type="html" />
-            </map:match>
+    <map:selectors>
+      <map:selector name="ajax-request" src="org.apache.cocoon.ajax.AjaxRequestSelector" />
+    </map:selectors>
+
+    <!-- =========================== Transformers =================================== -->
+
+    <map:transformers default="xslt">
+      <map:transformer name="browser-update" src="org.apache.cocoon.ajax.BrowserUpdateTransformer" />
+      <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+        <catalogues default="forms">
+          <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n" />
+        </catalogues>
+      </map:transformer>
+    </map:transformers>
+  </map:components>
+
+  <!-- =========================== Flowscripts =================================== -->
+
+  <map:flow>
+    <map:script src="flow/flow.js" />
+    <map:script src="flow/jdbi.js" />
+  </map:flow>
+
+  <!-- =========================== Pipelines =================================== -->
+
+  <map:pipelines>
+    <!-- Public URLs -->
+    <map:pipeline>
+      <!-- Main page: list employees -->
+      <map:match pattern="">
+        <map:redirect-to uri="do_list_employees" />
+      </map:match>
+
+      <map:match pattern="do_*">
+        <map:call function="do_{1}" />
+      </map:match>
+
+      <map:match pattern="continue">
+        <map:call continuation="{request-param:continuation-id}" />
+      </map:match>
+
+    </map:pipeline>
+
+    <!-- Internal URLs -->
+    <map:pipeline internal-only="false">
+
+      <map:match pattern="selection-list/*">
+        <map:call function="selection_list">
+          <map:parameter name="table" value="{1}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="*.xml">
+        <map:generate type="jx" src="{1}.xml" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="viewform-*.html">
+        <map:generate type="jx" src="pages/{1}.xml" />
+        <map:transform type="browser-update" />
+        <map:transform type="i18n" />
+        <map:transform src="../resources/forms-samples-styling.xsl" />
+        <map:select type="ajax-request">
+          <map:when test="true">
+            <map:serialize type="xml" />
+          </map:when>
+          <map:otherwise>
+            <map:transform src="resources/page-styling.xsl" />
+            <map:serialize type="html" />
+          </map:otherwise>
+        </map:select>
+      </map:match>
+
+      <map:match pattern="*.html">
+        <map:generate type="jx" src="pages/{1}.xml" />
+        <map:transform src="resources/page-styling.xsl" />
+        <map:serialize type="html" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/data/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/data/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/data/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/data/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,186 +18,186 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
- <map:components>
+  <map:components>
 
-  <map:transformers default="xslt">    
-    <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
-      <catalogues default="other">
-        <catalogue id="other" name="OtherMessages" location="messages"/>
-        <catalogue id="forms" name="FormsMessages" location="messages"/>
-      </catalogues>
-    </map:transformer>
-  </map:transformers>
-
-  <map:actions>
-    <map:action name="make-form" src="org.apache.cocoon.forms.acting.MakeFormAction" logger="forms"/>
-    <map:action name="init-form" src="org.apache.cocoon.forms.samples.InitForm1Action" logger="forms"/>
-    <map:action name="handle-form-submit" src="org.apache.cocoon.forms.acting.HandleFormSubmitAction" logger="forms"/>
-  </map:actions>
- </map:components>
-
- <map:views>
-  <map:view name="content" from-label="content">
-   <map:serialize type="xml"/>
-  </map:view>
-
-  <map:view from-label="content" name="pretty-content">
-   <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
-   <map:transform type="servletLinkRewriter"/>
-   <map:serialize type="html"/>
-  </map:view>
-
-  <map:view name="links" from-position="last">
-   <map:serialize type="links"/>
-  </map:view>
- </map:views>
- 
- <map:resources>
-   <!-- this will later become a virtual transformer -->
-   <map:resource name="simple-page2html">
-     <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl">
-       <map:parameter name="servletPath" value="{request:servletPath}"/>
-       <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-       <map:parameter name="file" value="{file}"/>
-       <map:parameter name="remove" value="{../0}"/>
-     </map:transform> 
-   </map:resource>
- </map:resources>
+    <map:transformers default="xslt">
+      <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+        <catalogues default="other">
+          <catalogue id="other" name="OtherMessages" location="messages" />
+          <catalogue id="forms" name="FormsMessages" location="messages" />
+        </catalogues>
+      </map:transformer>
+    </map:transformers>
+
+    <map:actions>
+      <map:action name="make-form" src="org.apache.cocoon.forms.acting.MakeFormAction" logger="forms" />
+      <map:action name="init-form" src="org.apache.cocoon.forms.samples.InitForm1Action" logger="forms" />
+      <map:action name="handle-form-submit" src="org.apache.cocoon.forms.acting.HandleFormSubmitAction" logger="forms" />
+    </map:actions>
+  </map:components>
+
+  <map:views>
+    <map:view name="content" from-label="content">
+      <map:serialize type="xml" />
+    </map:view>
+
+    <map:view from-label="content" name="pretty-content">
+      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt" />
+      <map:transform type="servletLinkRewriter" />
+      <map:serialize type="html" />
+    </map:view>
+
+    <map:view name="links" from-position="last">
+      <map:serialize type="links" />
+    </map:view>
+  </map:views>
+
+  <map:resources>
+    <!-- this will later become a virtual transformer -->
+    <map:resource name="simple-page2html">
+      <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl">
+        <map:parameter name="servletPath" value="{request:servletPath}" />
+        <map:parameter name="sitemapURI" value="{request:sitemapURI}" />
+        <map:parameter name="file" value="{file}" />
+        <map:parameter name="remove" value="{../0}" />
+      </map:transform>
+    </map:resource>
+  </map:resources>
 
   <!-- indicates what flowscript to attach to this sitemap -->
   <map:flow language="javascript">
-    <map:script src="flow/form_model_gui.js"/>
+    <map:script src="flow/form_model_gui.js" />
   </map:flow>
 
- <map:pipelines>
-   <map:pipeline>
+  <map:pipelines>
+    <map:pipeline>
 
-     <map:match pattern="">
-      <map:generate src="index.xml"/>
-      <map:serialize/>
-     </map:match>
-
-     <map:match pattern="*.continue">
-       <map:call continuation="{1}"/>
-     </map:match>
-
-     <map:match pattern="*-display-pipeline">
-       <!-- pipeline to show the form -->
-       <map:generate src="forms/{1}_template.xml"/>
-       <map:transform type="forms"/>
-       <map:transform type="i18n">
-         <map:parameter name="locale" value="en-US"/>
-       </map:transform>
-       <map:call resource="simple-page2html">
-         <map:parameter name="file" value="forms/{1}_template.xml"/>
-       </map:call>
-       <map:transform src="resources/forms-samples-styling.xsl"/>
-       <map:transform type="servletLinkRewriter" />
-       <map:serialize/>
-     </map:match>
-
-     <map:match pattern="*-success-pipeline.jx">
-       <map:generate type="jx" src="forms/{1}_success_jx.xml"/>
-       <map:call resource="simple-page2html">
-         <map:parameter name="file" value="forms/{1}_success_jx.xml"/>
-       </map:call>
-       <map:transform type="servletLinkRewriter" />
-       <map:serialize/>
-     </map:match>
-
-     <map:match pattern="resources/**">
-       <map:read src="{0}"/>
-     </map:match>
+      <map:match pattern="">
+        <map:generate src="index.xml" />
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="*.continue">
+        <map:call continuation="{1}" />
+      </map:match>
+
+      <map:match pattern="*-display-pipeline">
+        <!-- pipeline to show the form -->
+        <map:generate src="forms/{1}_template.xml" />
+        <map:transform type="forms" />
+        <map:transform type="i18n">
+          <map:parameter name="locale" value="en-US" />
+        </map:transform>
+        <map:call resource="simple-page2html">
+          <map:parameter name="file" value="forms/{1}_template.xml" />
+        </map:call>
+        <map:transform src="resources/forms-samples-styling.xsl" />
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="*-success-pipeline.jx">
+        <map:generate type="jx" src="forms/{1}_success_jx.xml" />
+        <map:call resource="simple-page2html">
+          <map:parameter name="file" value="forms/{1}_success_jx.xml" />
+        </map:call>
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="resources/**">
+        <map:read src="{0}" />
+      </map:match>
 
-     <!--
+      <!--
         | Sample building a forms-form-gui editor in forms
         | Doubles as a showcase for class, new, struct, union widgets
-        -->
+      -->
 
-     <map:match pattern="binding.flow">
-       <map:call function="handleForm">
-         <map:parameter name="function" value="binding_gui"/>
-         <map:parameter name="form-definition" value="forms/binding_model.xml"/>
-         <map:parameter name="attribute-name" value="form_binding_gui"/>
-         <map:parameter name="bindingURI" value="forms/binding_binding.xml"/>
-         <!--
-         <map:parameter name="documentURI" value="data/form_template_gui_data.xml"/>
-         -->
-         <!-- TODO: Fix edit-any-file security hole! -->
-         <!-- TODO: Fix file-name-is-not-url-encoded bug -->
-         <map:parameter name="documentURI" value="data/{request-param:file}"/>
-       </map:call>
-     </map:match>
-
-     <map:match pattern="model.flow">
-       <map:call function="handleForm">
-         <map:parameter name="function" value="model_gui"/>
-         <map:parameter name="form-definition" value="forms/model_model.xml"/>
-         <map:parameter name="attribute-name" value="form_model_gui"/>
-         <map:parameter name="bindingURI" value="forms/model_binding.xml"/>
-         <!--
-         <map:parameter name="documentURI" value="data/form_model_gui_data.xml"/>
-         -->
-         <!-- TODO: Fix edit-any-file security hole! -->
-         <!-- TODO: Fix file-name-is-not-url-encoded bug -->
-         <map:parameter name="documentURI" value="data/{request-param:file}"/>
-       </map:call>
-     </map:match>
-
-     <map:match pattern="sitemap.flow">
-       <map:call function="handleForm">
-         <map:parameter name="function" value="sitemap_gui"/>
-         <map:parameter name="form-definition" value="forms/sitemap_model.xml"/>
-         <map:parameter name="attribute-name" value="form_sitemap_gui"/>
-         <map:parameter name="bindingURI" value="forms/sitemap_binding.xml"/>
-         <!--
-         <map:parameter name="documentURI" value="data/form_template_gui_data.xml"/>
-         -->
-         <!-- TODO: Fix edit-any-file security hole! -->
-         <!-- TODO: Fix file-name-is-not-url-encoded bug -->
-         <map:parameter name="documentURI" value="data/{request-param:file}"/>
-       </map:call>
-     </map:match>
-
-     <map:match pattern="template.flow">
-       <map:call function="handleForm">
-         <map:parameter name="function" value="template_gui"/>
-         <map:parameter name="form-definition" value="forms/template_model.xml"/>
-         <map:parameter name="attribute-name" value="form_template_gui"/>
-         <map:parameter name="bindingURI" value="forms/template_binding.xml"/>
-         <!--
-         <map:parameter name="documentURI" value="data/form_template_gui_data.xml"/>
-         -->
-         <!-- TODO: Fix edit-any-file security hole! -->
-         <!-- TODO: Fix file-name-is-not-url-encoded bug -->
-         <map:parameter name="documentURI" value="data/{request-param:file}"/>
-       </map:call>
-     </map:match>
-
-     <map:match pattern="xreport.flow">
-       <map:call function="handleForm">
-         <map:parameter name="function" value="xreport_gui"/>
-         <map:parameter name="form-definition" value="forms/xreport_model.xml"/>
-         <map:parameter name="attribute-name" value="form_xreport_gui"/>
-         <map:parameter name="bindingURI" value="forms/xreport_binding.xml"/>
-         <!--
-         <map:parameter name="documentURI" value="data/form_template_gui_data.xml"/>
-         -->
-         <!-- TODO: Fix edit-any-file security hole! -->
-         <!-- TODO: Fix file-name-is-not-url-encoded bug -->
-         <map:parameter name="documentURI" value="data/{request-param:file}"/>
-       </map:call>
-     </map:match>
-
-    <map:match pattern="*">
-        <map:redirect-to uri="{1}/"/>
-    </map:match>
-
-    <map:match pattern="*/**">
-     <map:mount src="{1}/" uri-prefix="{1}"/>
-   </map:match>
+      <map:match pattern="binding.flow">
+        <map:call function="handleForm">
+          <map:parameter name="function" value="binding_gui" />
+          <map:parameter name="form-definition" value="forms/binding_model.xml" />
+          <map:parameter name="attribute-name" value="form_binding_gui" />
+          <map:parameter name="bindingURI" value="forms/binding_binding.xml" />
+          <!--
+            <map:parameter name="documentURI" value="data/form_template_gui_data.xml"/>
+          -->
+          <!-- TODO: Fix edit-any-file security hole! -->
+          <!-- TODO: Fix file-name-is-not-url-encoded bug -->
+          <map:parameter name="documentURI" value="data/{request-param:file}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="model.flow">
+        <map:call function="handleForm">
+          <map:parameter name="function" value="model_gui" />
+          <map:parameter name="form-definition" value="forms/model_model.xml" />
+          <map:parameter name="attribute-name" value="form_model_gui" />
+          <map:parameter name="bindingURI" value="forms/model_binding.xml" />
+          <!--
+            <map:parameter name="documentURI" value="data/form_model_gui_data.xml"/>
+          -->
+          <!-- TODO: Fix edit-any-file security hole! -->
+          <!-- TODO: Fix file-name-is-not-url-encoded bug -->
+          <map:parameter name="documentURI" value="data/{request-param:file}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="sitemap.flow">
+        <map:call function="handleForm">
+          <map:parameter name="function" value="sitemap_gui" />
+          <map:parameter name="form-definition" value="forms/sitemap_model.xml" />
+          <map:parameter name="attribute-name" value="form_sitemap_gui" />
+          <map:parameter name="bindingURI" value="forms/sitemap_binding.xml" />
+          <!--
+            <map:parameter name="documentURI" value="data/form_template_gui_data.xml"/>
+          -->
+          <!-- TODO: Fix edit-any-file security hole! -->
+          <!-- TODO: Fix file-name-is-not-url-encoded bug -->
+          <map:parameter name="documentURI" value="data/{request-param:file}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="template.flow">
+        <map:call function="handleForm">
+          <map:parameter name="function" value="template_gui" />
+          <map:parameter name="form-definition" value="forms/template_model.xml" />
+          <map:parameter name="attribute-name" value="form_template_gui" />
+          <map:parameter name="bindingURI" value="forms/template_binding.xml" />
+          <!--
+            <map:parameter name="documentURI" value="data/form_template_gui_data.xml"/>
+          -->
+          <!-- TODO: Fix edit-any-file security hole! -->
+          <!-- TODO: Fix file-name-is-not-url-encoded bug -->
+          <map:parameter name="documentURI" value="data/{request-param:file}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="xreport.flow">
+        <map:call function="handleForm">
+          <map:parameter name="function" value="xreport_gui" />
+          <map:parameter name="form-definition" value="forms/xreport_model.xml" />
+          <map:parameter name="attribute-name" value="form_xreport_gui" />
+          <map:parameter name="bindingURI" value="forms/xreport_binding.xml" />
+          <!--
+            <map:parameter name="documentURI" value="data/form_template_gui_data.xml"/>
+          -->
+          <!-- TODO: Fix edit-any-file security hole! -->
+          <!-- TODO: Fix file-name-is-not-url-encoded bug -->
+          <map:parameter name="documentURI" value="data/{request-param:file}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="*">
+        <map:redirect-to uri="{1}/" />
+      </map:match>
+
+      <map:match pattern="*/**">
+        <map:mount src="{1}/" uri-prefix="{1}" />
+      </map:match>
 
-   </map:pipeline>
- </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,172 +18,172 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components =================================== -->
+  <!-- =========================== Components =================================== -->
 
-    <map:components>
+  <map:components>
 
-        <!-- =========================== Transformers =================================== -->
+    <!-- =========================== Transformers =================================== -->
 
-        <map:transformers default="xslt">
-            <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
-                <catalogues default="other">
-                    <catalogue id="other" name="OtherMessages" location="messages" />
-                    <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n" />
-                </catalogues>
-            </map:transformer>
-        </map:transformers>
-
-        <!-- =========================== Actions =================================== -->
-
-        <map:actions>
-            <map:action name="make-form" src="org.apache.cocoon.forms.acting.MakeFormAction" logger="forms" />
-            <map:action name="init-form" src="org.apache.cocoon.forms.samples.InitForm1Action" logger="forms" />
-            <map:action name="handle-form-submit" src="org.apache.cocoon.forms.acting.HandleFormSubmitAction" logger="forms" />
-        </map:actions>
-
-        <!-- =========================== Pipes =================================== -->
-
-        <map:pipes default="caching">
-            <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline" />
-            <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline" />
-        </map:pipes>
-
-    </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>
-
-    <!-- =========================== Flowscripts =================================== -->
-
-    <map:flow language="javascript">
-        <map:script src="flow/swan.js" />
-    </map:flow>
-
-    <!-- =========================== Pipelines =================================== -->
-
-    <map:pipelines>
-        <map:pipeline type="noncaching">
-
-            <map:match pattern="">
-                <map:generate src="index.xml" />
-                <map:serialize />
-            </map:match>
-
-            <map:match pattern="*.continue">
-                <map:call continuation="{1}" />
-            </map:match>
-
-            <map:match pattern="*-display-pipeline">
-                <!-- pipeline to show the form -->
-                <map:generate src="forms/{1}_template.xml" />
-                <map:transform type="forms" />
-                <map:transform type="i18n">
-                    <map:parameter name="locale" value="en-US" />
-                </map:transform>
-                <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
-                <map:transform src="resources/swan.xsl" />
-                <map:transform type="servletLinkRewriter" />
-                <map:serialize />
-            </map:match>
-
-            <map:match pattern="*-error-pipeline">
-                <map:generate src="error.xml" />
-                <map:serialize />
-            </map:match>
-
-            <map:match pattern="*-success-pipeline.jx">
-                <map:generate type="jx" src="forms/{1}_success_jx.xml" />
-                <!-- 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:match pattern="swan/resources/**">
-                <map:read src="resources/{1}" />
-            </map:match>
-
-            <!--
-                | Sample building a forms-form-gui editor in forms
-                | Doubles as a showcase for class, new, struct, union widgets
-            -->
-
-            <!-- TODO: Fix edit-any-file security hole! -->
-            <map:match pattern="binding.flow">
-                <map:call function="handleForm">
-                    <map:parameter name="function" value="binding_gui" />
-                    <map:parameter name="form-definition" value="forms/binding_model.xml" />
-                    <map:parameter name="attribute-name" value="form_binding_gui" />
-                    <map:parameter name="bindingURI" value="forms/binding_binding.xml" />
-                    <map:parameter name="documentURI" value="{request-param:file}" />
-                </map:call>
-            </map:match>
-
-            <map:match pattern="model.flow">
-                <map:call function="handleForm">
-                    <map:parameter name="function" value="model_gui" />
-                    <map:parameter name="form-definition" value="forms/model_model.xml" />
-                    <map:parameter name="attribute-name" value="form_model_gui" />
-                    <map:parameter name="bindingURI" value="forms/model_binding.xml" />
-                    <map:parameter name="documentURI" value="{request-param:file}" />
-                </map:call>
-            </map:match>
-
-            <map:match pattern="sitemap.flow">
-                <map:call function="handleForm">
-                    <map:parameter name="function" value="sitemap_gui" />
-                    <map:parameter name="form-definition" value="forms/sitemap_model.xml" />
-                    <map:parameter name="attribute-name" value="form_sitemap_gui" />
-                    <map:parameter name="bindingURI" value="forms/sitemap_binding.xml" />
-                    <map:parameter name="documentURI" value="{request-param:file}" />
-                </map:call>
-            </map:match>
-
-            <map:match pattern="template.flow">
-                <map:call function="handleForm">
-                    <map:parameter name="function" value="template_gui" />
-                    <map:parameter name="form-definition" value="forms/template_model.xml" />
-                    <map:parameter name="attribute-name" value="form_template_gui" />
-                    <map:parameter name="bindingURI" value="forms/template_binding.xml" />
-                    <map:parameter name="documentURI" value="{request-param:file}" />
-                </map:call>
-            </map:match>
-
-            <map:match pattern="xreport.flow">
-                <map:call function="handleForm">
-                    <map:parameter name="function" value="xreport_gui" />
-                    <map:parameter name="form-definition" value="forms/xreport_model.xml" />
-                    <map:parameter name="attribute-name" value="form_xreport_gui" />
-                    <map:parameter name="bindingURI" value="forms/xreport_binding.xml" />
-                    <map:parameter name="documentURI" value="{request-param:file}" />
-                </map:call>
-            </map:match>
-
-            <map:match pattern="*">
-                <map:redirect-to uri="{1}/" />
-            </map:match>
-
-            <map:match pattern="*/**">
-                <map:mount src="{1}/" uri-prefix="{1}" />
-            </map:match>
+    <map:transformers default="xslt">
+      <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+        <catalogues default="other">
+          <catalogue id="other" name="OtherMessages" location="messages" />
+          <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n" />
+        </catalogues>
+      </map:transformer>
+    </map:transformers>
+
+    <!-- =========================== Actions =================================== -->
+
+    <map:actions>
+      <map:action name="make-form" src="org.apache.cocoon.forms.acting.MakeFormAction" logger="forms" />
+      <map:action name="init-form" src="org.apache.cocoon.forms.samples.InitForm1Action" logger="forms" />
+      <map:action name="handle-form-submit" src="org.apache.cocoon.forms.acting.HandleFormSubmitAction" logger="forms" />
+    </map:actions>
+
+    <!-- =========================== Pipes =================================== -->
+
+    <map:pipes default="caching">
+      <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline" />
+      <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline" />
+    </map:pipes>
+
+  </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>
+
+  <!-- =========================== Flowscripts =================================== -->
+
+  <map:flow language="javascript">
+    <map:script src="flow/swan.js" />
+  </map:flow>
+
+  <!-- =========================== Pipelines =================================== -->
+
+  <map:pipelines>
+    <map:pipeline type="noncaching">
+
+      <map:match pattern="">
+        <map:generate src="index.xml" />
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="*.continue">
+        <map:call continuation="{1}" />
+      </map:match>
+
+      <map:match pattern="*-display-pipeline">
+        <!-- pipeline to show the form -->
+        <map:generate src="forms/{1}_template.xml" />
+        <map:transform type="forms" />
+        <map:transform type="i18n">
+          <map:parameter name="locale" value="en-US" />
+        </map:transform>
+        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-page2html.xsl" />
+        <map:transform src="resources/swan.xsl" />
+        <map:transform type="servletLinkRewriter" />
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="*-error-pipeline">
+        <map:generate src="error.xml" />
+        <map:serialize />
+      </map:match>
+
+      <map:match pattern="*-success-pipeline.jx">
+        <map:generate type="jx" src="forms/{1}_success_jx.xml" />
+        <!-- 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:match pattern="swan/resources/**">
+        <map:read src="resources/{1}" />
+      </map:match>
+
+      <!--
+        | Sample building a forms-form-gui editor in forms
+        | Doubles as a showcase for class, new, struct, union widgets
+      -->
+
+      <!-- TODO: Fix edit-any-file security hole! -->
+      <map:match pattern="binding.flow">
+        <map:call function="handleForm">
+          <map:parameter name="function" value="binding_gui" />
+          <map:parameter name="form-definition" value="forms/binding_model.xml" />
+          <map:parameter name="attribute-name" value="form_binding_gui" />
+          <map:parameter name="bindingURI" value="forms/binding_binding.xml" />
+          <map:parameter name="documentURI" value="{request-param:file}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="model.flow">
+        <map:call function="handleForm">
+          <map:parameter name="function" value="model_gui" />
+          <map:parameter name="form-definition" value="forms/model_model.xml" />
+          <map:parameter name="attribute-name" value="form_model_gui" />
+          <map:parameter name="bindingURI" value="forms/model_binding.xml" />
+          <map:parameter name="documentURI" value="{request-param:file}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="sitemap.flow">
+        <map:call function="handleForm">
+          <map:parameter name="function" value="sitemap_gui" />
+          <map:parameter name="form-definition" value="forms/sitemap_model.xml" />
+          <map:parameter name="attribute-name" value="form_sitemap_gui" />
+          <map:parameter name="bindingURI" value="forms/sitemap_binding.xml" />
+          <map:parameter name="documentURI" value="{request-param:file}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="template.flow">
+        <map:call function="handleForm">
+          <map:parameter name="function" value="template_gui" />
+          <map:parameter name="form-definition" value="forms/template_model.xml" />
+          <map:parameter name="attribute-name" value="form_template_gui" />
+          <map:parameter name="bindingURI" value="forms/template_binding.xml" />
+          <map:parameter name="documentURI" value="{request-param:file}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="xreport.flow">
+        <map:call function="handleForm">
+          <map:parameter name="function" value="xreport_gui" />
+          <map:parameter name="form-definition" value="forms/xreport_model.xml" />
+          <map:parameter name="attribute-name" value="form_xreport_gui" />
+          <map:parameter name="bindingURI" value="forms/xreport_binding.xml" />
+          <map:parameter name="documentURI" value="{request-param:file}" />
+        </map:call>
+      </map:match>
+
+      <map:match pattern="*">
+        <map:redirect-to uri="{1}/" />
+      </map:match>
+
+      <map:match pattern="*/**">
+        <map:mount src="{1}/" uri-prefix="{1}" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-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.forms.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-forms-sample" context-path="blockcontext:/cocoon-forms-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.forms.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-forms-sample" context-path="blockcontext:/cocoon-forms-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-html/cocoon-html-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -23,92 +23,92 @@
 
 <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>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline type="caching">
-
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <!-- list of samples -->
-            <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>
-
-            <!-- ================  TIDY  =========================== -->
-
-            <map:match pattern="apache">
-                <map:generate type="html" src="http://cocoon.apache.org/news">
-                    <map:parameter name="xpath" value="/html" />
-                </map:generate>
-                <map:transform src="stylesheets/apache.xsl" />
-                <map:serialize type="xhtml" />
-            </map:match>
-
-            <!-- ================  NekoHTML  =========================== -->
-
-            <map:match pattern="apache-neko">
-                <map:generate type="nekohtml" src="http://cocoon.apache.org/news" />
-                <map:transform src="stylesheets/apache-no-namespace.xsl" />
-                <map:serialize type="xhtml" />
-            </map:match>
-
-            <!-- ================  HTMLTransformer ================= -->
-
-            <map:match pattern="HTMLTransformer/input.xml">
-                <map:generate src="htmltransformer/input.xml" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="HTMLTransformer/parsed.xml">
-                <map:generate src="htmltransformer/input.xml" />
-                <map:transform type="html">
-                    <map:parameter name="tags" value="description,escaped-html" />
-                </map:transform>
-                <map:transform src="htmltransformer/post-transformer-filter.xsl" />
-                <map:serialize type="xhtml" />
-            </map:match>
-
-            <!-- ================  NekoHTMLTransformer ================= -->
-
-            <map:match pattern="NekoHTMLTransformer/input.xml">
-                <map:generate src="htmltransformer/input.xml" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <map:match pattern="NekoHTMLTransformer/parsed.xml">
-                <map:generate src="htmltransformer/input.xml" />
-                <map:transform type="nekohtml">
-                    <map:parameter name="tags" value="description,escaped-html" />
-                </map:transform>
-                <map:transform src="htmltransformer/post-transformer-filter.xsl" />
-                <map:serialize type="xhtml" />
-            </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>
+
+  <!-- =========================== Pipelines ================================= -->
+
+  <map:pipelines>
+    <map:pipeline type="caching">
+
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <!-- list of samples -->
+      <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>
+
+      <!-- ================  TIDY  =========================== -->
+
+      <map:match pattern="apache">
+        <map:generate type="html" src="http://cocoon.apache.org/news">
+          <map:parameter name="xpath" value="/html" />
+        </map:generate>
+        <map:transform src="stylesheets/apache.xsl" />
+        <map:serialize type="xhtml" />
+      </map:match>
+
+      <!-- ================  NekoHTML  =========================== -->
+
+      <map:match pattern="apache-neko">
+        <map:generate type="nekohtml" src="http://cocoon.apache.org/news" />
+        <map:transform src="stylesheets/apache-no-namespace.xsl" />
+        <map:serialize type="xhtml" />
+      </map:match>
+
+      <!-- ================  HTMLTransformer ================= -->
+
+      <map:match pattern="HTMLTransformer/input.xml">
+        <map:generate src="htmltransformer/input.xml" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="HTMLTransformer/parsed.xml">
+        <map:generate src="htmltransformer/input.xml" />
+        <map:transform type="html">
+          <map:parameter name="tags" value="description,escaped-html" />
+        </map:transform>
+        <map:transform src="htmltransformer/post-transformer-filter.xsl" />
+        <map:serialize type="xhtml" />
+      </map:match>
+
+      <!-- ================  NekoHTMLTransformer ================= -->
+
+      <map:match pattern="NekoHTMLTransformer/input.xml">
+        <map:generate src="htmltransformer/input.xml" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="NekoHTMLTransformer/parsed.xml">
+        <map:generate src="htmltransformer/input.xml" />
+        <map:transform type="nekohtml">
+          <map:parameter name="tags" value="description,escaped-html" />
+        </map:transform>
+        <map:transform src="htmltransformer/post-transformer-filter.xsl" />
+        <map:serialize type="xhtml" />
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/META-INF/cocoon/spring/cocoon-html-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/META-INF/cocoon/spring/cocoon-html-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/META-INF/cocoon/spring/cocoon-html-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/META-INF/cocoon/spring/cocoon-html-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.html.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-html-sample" context-path="blockcontext:/cocoon-html-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.html.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-html-sample" context-path="blockcontext:/cocoon-html-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-imageop/cocoon-imageop-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-imageop.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-imageop.xconf?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-imageop.xconf (original)
+++ cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-imageop.xconf Mon May 28 13:17:10 2007
@@ -18,23 +18,23 @@
 
 <components>
   <!-- Include roles -->
-  <include src="resource://org/apache/cocoon/reading/imageop/imageop.roles"/>
+  <include src="resource://org/apache/cocoon/reading/imageop/imageop.roles" />
+
+  <!-- =============== Image Operations ==================== -->
+  <image-operations>
+    <component-instance name="scale" class="org.apache.cocoon.reading.imageop.ScaleOperation" logger="imageop" />
+    <component-instance name="resize" class="org.apache.cocoon.reading.imageop.ResizeOperation" logger="imageop" />
+    <component-instance name="rotate" class="org.apache.cocoon.reading.imageop.RotateOperation" logger="imageop" />
+    <component-instance name="offset" class="org.apache.cocoon.reading.imageop.OffsetOperation" logger="imageop" />
+    <component-instance name="mirror" class="org.apache.cocoon.reading.imageop.MirrorOperation" logger="imageop" />
+    <component-instance name="affine" class="org.apache.cocoon.reading.imageop.AffineTransformOperation" logger="imageop" />
+    <component-instance name="grayscale" class="org.apache.cocoon.reading.imageop.GrayScaleOperation" logger="imageop" />
+    <component-instance name="convolve" class="org.apache.cocoon.reading.imageop.ConvolveOperation" logger="imageop" />
+    <component-instance name="color" class="org.apache.cocoon.reading.imageop.ColorOperation" logger="imageop" />
+    <component-instance name="shear" class="org.apache.cocoon.reading.imageop.ShearOperation" logger="imageop" />
+    <component-instance name="crop" class="org.apache.cocoon.reading.imageop.CropOperation" logger="imageop" />
+    <component-instance name="overlay" class="org.apache.cocoon.reading.imageop.OverlayOperation" logger="imageop" />
+  </image-operations>
 
-   <!-- =============== Image Operations ==================== -->
-    <image-operations>
-      <component-instance name="scale" class="org.apache.cocoon.reading.imageop.ScaleOperation" logger="imageop" />
-      <component-instance name="resize" class="org.apache.cocoon.reading.imageop.ResizeOperation" logger="imageop" />
-      <component-instance name="rotate" class="org.apache.cocoon.reading.imageop.RotateOperation" logger="imageop" />
-      <component-instance name="offset" class="org.apache.cocoon.reading.imageop.OffsetOperation" logger="imageop" />
-      <component-instance name="mirror" class="org.apache.cocoon.reading.imageop.MirrorOperation" logger="imageop" />
-      <component-instance name="affine" class="org.apache.cocoon.reading.imageop.AffineTransformOperation" logger="imageop" />
-      <component-instance name="grayscale" class="org.apache.cocoon.reading.imageop.GrayScaleOperation" logger="imageop" />
-      <component-instance name="convolve" class="org.apache.cocoon.reading.imageop.ConvolveOperation" logger="imageop" />
-      <component-instance name="color" class="org.apache.cocoon.reading.imageop.ColorOperation" logger="imageop" />
-      <component-instance name="shear" class="org.apache.cocoon.reading.imageop.ShearOperation" logger="imageop" />
-      <component-instance name="crop" class="org.apache.cocoon.reading.imageop.CropOperation" logger="imageop" />
-      <component-instance name="overlay" class="org.apache.cocoon.reading.imageop.OverlayOperation" logger="imageop" />
-    </image-operations>
-    
 </components>
- 
+

Modified: cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,114 +18,114 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Pipelines ================================= -->
+  <!-- =========================== Pipelines ================================= -->
 
-    <map:pipelines>
-        <map:pipeline>
+  <map:pipelines>
+    <map:pipeline>
 
-            <map:match pattern="">
-                <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="image">
-                <map:read src="logo.jpg" />
-            </map:match>
-
-            <map:match pattern="*/scale-*-*">
-                <map:read type="image-op-scale" src="{1}">
-                    <map:parameter name="scale-scale" value="{2}" />
-                    <map:parameter name="output-format" value="{3}" />
-                </map:read>
-            </map:match>
-
-            <map:match pattern="*/resize-*-*">
-                <map:read type="image-op-resize" src="{1}">
-                    <map:parameter name="size-width" value="{2}" />
-                    <map:parameter name="size-height" value="{3}" />
-                </map:read>
-            </map:match>
-
-            <map:match pattern="*/offset-*-*">
-                <map:read type="image-op-offset" src="{1}">
-                    <map:parameter name="offset-up" value="{2}" />
-                    <map:parameter name="offset-left" value="{3}" />
-                </map:read>
-            </map:match>
-
-            <map:match pattern="*/mirror-*">
-                <map:read type="image-op-mirror" src="{1}">
-                    <map:parameter name="mirror-along-y" value="{2}" />
-                </map:read>
-            </map:match>
-
-            <map:match pattern="*/rotate-*">
-                <map:read type="image-op-rotate" src="{1}">
-                    <map:parameter name="rotate-angle" value="{2}" />
-                </map:read>
-            </map:match>
-
-            <map:match pattern="*/grayscale">
-                <map:read type="image-op-grayscale" src="{1}" />
-            </map:match>
-
-            <map:match pattern="*/crop-*">
-                <map:read type="image-op-crop" src="{1}">
-                    <map:parameter name="crop-ratio" value="{2}" />
-                </map:read>
-            </map:match>
-
-            <map:match pattern="*/color-*-*-*-*-*-*">
-                <map:read type="image-op-color" src="{1}">
-                    <map:parameter name="color-scale-red" value="{2}" />
-                    <map:parameter name="color-scale-green" value="{3}" />
-                    <map:parameter name="color-scale-blue" value="{4}" />
-                    <map:parameter name="color-offset-red" value="{5}" />
-                    <map:parameter name="color-offset-green" value="{6}" />
-                    <map:parameter name="color-offset-blue" value="{7}" />
-                </map:read>
-            </map:match>
-
-            <map:match pattern="*/complex-*-*-*-*-*-*-*-*">
-                <map:read type="image-op-complex" src="{1}">
-                    <map:parameter name="mirror-enabled" value="{2}" />
-                    <map:parameter name="size-width" value="{3}" />
-                    <map:parameter name="size-height" value="{4}" />
-                    <map:parameter name="shear-x" value="{5}" />
-                    <map:parameter name="shear-y" value="{6}" />
-                    <map:parameter name="rotate-angle" value="{7}" />
-                    <map:parameter name="offset-up" value="{8}" />
-                    <map:parameter name="offset-left" value="{9}" />
-                </map:read>
-            </map:match>
-
-            <map:match pattern="*/sharpen">
-                <map:read type="image-op-convolve" src="{1}">
-                    <map:parameter name="convolve-height" value="3" />
-                    <map:parameter name="convolve-width" value="3" />
-                    <map:parameter name="convolve-data" value="0.0, -1.0, 0.0, -1.0, 5.0, -1.0, 0.0, -1.0, 0.0" />
-                </map:read>
-            </map:match>
-
-            <map:match pattern="*/blur">
-                <map:read type="image-op-convolve" src="{1}">
-                    <map:parameter name="convolve-height" value="3" />
-                    <map:parameter name="convolve-width" value="3" />
-                    <map:parameter name="convolve-data" value="0.1, 0.1, 0.1, 0.1, 0.2, 0.1, 0.1, 0.1, 0.1" />
-                </map:read>
-            </map:match>
-
-            <map:match pattern="*/overlay/*/*/*">
-                <map:read type="image-op-overlay" src="{1}">
-                    <map:parameter name="overlay-offset-x" value="{3}" />
-                    <map:parameter name="overlay-offset-y" value="{4}" />
-                    <map:parameter name="overlay-source" value="{2}" />
-                </map:read>
-            </map:match>
+      <map:match pattern="">
+        <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="image">
+        <map:read src="logo.jpg" />
+      </map:match>
+
+      <map:match pattern="*/scale-*-*">
+        <map:read type="image-op-scale" src="{1}">
+          <map:parameter name="scale-scale" value="{2}" />
+          <map:parameter name="output-format" value="{3}" />
+        </map:read>
+      </map:match>
+
+      <map:match pattern="*/resize-*-*">
+        <map:read type="image-op-resize" src="{1}">
+          <map:parameter name="size-width" value="{2}" />
+          <map:parameter name="size-height" value="{3}" />
+        </map:read>
+      </map:match>
+
+      <map:match pattern="*/offset-*-*">
+        <map:read type="image-op-offset" src="{1}">
+          <map:parameter name="offset-up" value="{2}" />
+          <map:parameter name="offset-left" value="{3}" />
+        </map:read>
+      </map:match>
+
+      <map:match pattern="*/mirror-*">
+        <map:read type="image-op-mirror" src="{1}">
+          <map:parameter name="mirror-along-y" value="{2}" />
+        </map:read>
+      </map:match>
+
+      <map:match pattern="*/rotate-*">
+        <map:read type="image-op-rotate" src="{1}">
+          <map:parameter name="rotate-angle" value="{2}" />
+        </map:read>
+      </map:match>
+
+      <map:match pattern="*/grayscale">
+        <map:read type="image-op-grayscale" src="{1}" />
+      </map:match>
+
+      <map:match pattern="*/crop-*">
+        <map:read type="image-op-crop" src="{1}">
+          <map:parameter name="crop-ratio" value="{2}" />
+        </map:read>
+      </map:match>
+
+      <map:match pattern="*/color-*-*-*-*-*-*">
+        <map:read type="image-op-color" src="{1}">
+          <map:parameter name="color-scale-red" value="{2}" />
+          <map:parameter name="color-scale-green" value="{3}" />
+          <map:parameter name="color-scale-blue" value="{4}" />
+          <map:parameter name="color-offset-red" value="{5}" />
+          <map:parameter name="color-offset-green" value="{6}" />
+          <map:parameter name="color-offset-blue" value="{7}" />
+        </map:read>
+      </map:match>
+
+      <map:match pattern="*/complex-*-*-*-*-*-*-*-*">
+        <map:read type="image-op-complex" src="{1}">
+          <map:parameter name="mirror-enabled" value="{2}" />
+          <map:parameter name="size-width" value="{3}" />
+          <map:parameter name="size-height" value="{4}" />
+          <map:parameter name="shear-x" value="{5}" />
+          <map:parameter name="shear-y" value="{6}" />
+          <map:parameter name="rotate-angle" value="{7}" />
+          <map:parameter name="offset-up" value="{8}" />
+          <map:parameter name="offset-left" value="{9}" />
+        </map:read>
+      </map:match>
+
+      <map:match pattern="*/sharpen">
+        <map:read type="image-op-convolve" src="{1}">
+          <map:parameter name="convolve-height" value="3" />
+          <map:parameter name="convolve-width" value="3" />
+          <map:parameter name="convolve-data" value="0.0, -1.0, 0.0, -1.0, 5.0, -1.0, 0.0, -1.0, 0.0" />
+        </map:read>
+      </map:match>
+
+      <map:match pattern="*/blur">
+        <map:read type="image-op-convolve" src="{1}">
+          <map:parameter name="convolve-height" value="3" />
+          <map:parameter name="convolve-width" value="3" />
+          <map:parameter name="convolve-data" value="0.1, 0.1, 0.1, 0.1, 0.2, 0.1, 0.1, 0.1, 0.1" />
+        </map:read>
+      </map:match>
+
+      <map:match pattern="*/overlay/*/*/*">
+        <map:read type="image-op-overlay" src="{1}">
+          <map:parameter name="overlay-offset-x" value="{3}" />
+          <map:parameter name="overlay-offset-y" value="{4}" />
+          <map:parameter name="overlay-source" value="{2}" />
+        </map:read>
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-imageop-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-imageop-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-imageop-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-imageop-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.imageop.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-imageop-sample" context-path="blockcontext:/cocoon-imageop-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.imageop.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-imageop-sample" context-path="blockcontext:/cocoon-imageop-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-itext/cocoon-itext-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -24,77 +24,77 @@
 
 <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>
-
-    <!-- =========================== Pipelines ================================= -->
-
-    <map:pipelines>
-        <map:pipeline type="caching">
-
-            <map:match pattern="">
-                <map:redirect-to uri="welcome" />
-            </map:match>
-
-            <!-- list of samples -->
-            <map:match pattern="welcome">
-                <map:generate src="misc/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>
-
-            <!-- hello world -->
-            <map:match pattern="hello.pdf">
-                <map:generate src="servlet:main-sample:/hello-world/hello.xml" />
-                <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2itext.xsl" />
-                <map:serialize type="itext2pdf">
-                    <map:parameter name="page-size" value="A4" />
-                    <map:parameter name="page-orientation" value="portrait" />
-                </map:serialize>
-            </map:match>
-
-            <!-- iText document access -->
-            <map:match pattern="**/*.itext.xml">
-                <map:generate src="{1}/{2}.itext.xml" />
-                <map:serialize type="xml" />
-            </map:match>
-
-            <!-- PDF conversion -->
-            <map:match pattern="**/*.pdf">
-                <map:generate src="cocoon:/{1}/{2}.itext.xml" />
-                <map:serialize type="itext2pdf" />
-            </map:match>
-
-            <!-- This would need to add the cocoon-xsp-sample block. Is this dependency desired? -->
-            <!-- reuse the XSP caching example for our caching test ->
-                <map:match pattern="cache-test-*.pdf">
-                <!- note that caching didn't work when accessing the XSP using the cocoon:/ protocol ->
-                <map:generate src="../xsp/java/cacheable.xsp" type="serverpages"/>
-                <map:transform src="cache-test/xsp-sample-to-itext.xsl">
-                <map:parameter name="pages" value="{1}"/>
-                </map:transform>
-                <map:serialize type="itext2pdf"/>
-                </map:match>
-            -->
+  <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 type="caching">
+
+      <map:match pattern="">
+        <map:redirect-to uri="welcome" />
+      </map:match>
+
+      <!-- list of samples -->
+      <map:match pattern="welcome">
+        <map:generate src="misc/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>
+
+      <!-- hello world -->
+      <map:match pattern="hello.pdf">
+        <map:generate src="servlet:main-sample:/hello-world/hello.xml" />
+        <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2itext.xsl" />
+        <map:serialize type="itext2pdf">
+          <map:parameter name="page-size" value="A4" />
+          <map:parameter name="page-orientation" value="portrait" />
+        </map:serialize>
+      </map:match>
+
+      <!-- iText document access -->
+      <map:match pattern="**/*.itext.xml">
+        <map:generate src="{1}/{2}.itext.xml" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <!-- PDF conversion -->
+      <map:match pattern="**/*.pdf">
+        <map:generate src="cocoon:/{1}/{2}.itext.xml" />
+        <map:serialize type="itext2pdf" />
+      </map:match>
+
+      <!-- This would need to add the cocoon-xsp-sample block. Is this dependency desired? -->
+      <!-- reuse the XSP caching example for our caching test ->
+        <map:match pattern="cache-test-*.pdf">
+        <!- note that caching didn't work when accessing the XSP using the cocoon:/ protocol ->
+        <map:generate src="../xsp/java/cacheable.xsp" type="serverpages"/>
+        <map:transform src="cache-test/xsp-sample-to-itext.xsl">
+        <map:parameter name="pages" value="{1}"/>
+        </map:transform>
+        <map:serialize type="itext2pdf"/>
+        </map:match>
+      -->
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/META-INF/cocoon/spring/cocoon-itext-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/META-INF/cocoon/spring/cocoon-itext-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/META-INF/cocoon/spring/cocoon-itext-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/META-INF/cocoon/spring/cocoon-itext-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.itext.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-itext-sample" context-path="blockcontext:/cocoon-itext-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.itext.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-itext-sample" context-path="blockcontext:/cocoon-itext-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-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/sitemap.xmap Mon May 28 13:17:10 2007
@@ -18,154 +18,154 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-    <!-- =========================== Components =================================== -->
+  <!-- =========================== Components =================================== -->
 
-    <map:components>
+  <map:components>
 
-        <!-- =========================== Generators =================================== -->
+    <!-- =========================== Generators =================================== -->
 
-        <map:generators default="file">
-            <map:generator name="mygenerator" src="org.apache.cocoon.samples.reloading.MyGenerator" />
-        </map:generators>
-
-        <!-- =========================== Transformers =================================== -->
-
-        <map:transformers default="xslt">
-            <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
-                <catalogues default="other">
-                    <catalogue id="other" name="OtherMessages" location="servlet:forms:/resource/internal/i18n" />
-                    <catalogue id="forms" name="FormsMessages" location="servlet:forms:/resource/internal/i18n" />
-                </catalogues>
-                <cache-at-startup>true</cache-at-startup>
-            </map:transformer>
-        </map:transformers>
-
-        <!-- =========================== Classloader =================================== -->
-
-        <map:classloader factory-role="org.apache.cocoon.classloader.ClassLoaderFactory/reloading">
-            <class-dir src="../../../../../../blocks/cocoon-javaflow/cocoon-javaflow-sample/target/classes">
-                <store class="org.apache.cocoon.components.flow.java.JavaflowResourceStore" />
-            </class-dir>
-            <class-dir src="../../../../../../blocks/cocoon-javaflow/cocoon-javaflow-impl/target/classes">
-                <store class="org.apache.cocoon.components.flow.java.JavaflowResourceStore" />
-            </class-dir>
-            <include-classes pattern="org.apache.cocoon.forms.flow.java.FormInstance" />
-            <include-classes pattern="org.apache.cocoon.samples.flow.java.**" />
-            <include-classes pattern="org.apache.cocoon.components.flow.java.AbstractContinuable" />
-        </map:classloader>
-
-        <!--map:classloader factory-role="org.apache.cocoon.classloader.ClassLoaderFactory/reloading">
-            <class-dir src="/home/mau/workspace/cocoon2.2/blocks/cocoon-javaflow/cocoon-javaflow-sample/target/classes">
-            <store class="org.apache.commons.jci.stores.MemoryResourceStore"/>
-            </class-dir>
-            <include-classes pattern="org.apache.cocoon.samples.reloading.java.**"/>
-            </map:classloader-->
-
-    </map:components>
-
-    <!-- =========================== Flows =================================== -->
-
-    <map:flow language="java">
-        <map:script src="org.apache.cocoon.samples.flow.java.CalculatorFlow" />
-        <!--
-            <map:script src="org.apache.cocoon.samples.flow.java.FormFlow"/>
-            <map:script src="org.apache.cocoon.samples.flow.java.PersistenceFlow"/>
-        -->
-    </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>
-            <!--+
-                | produces the screens called by the flowscript
-                +-->
-            <map:match pattern="page/*">
-                <map:generate type="jx" src="screens/{1}.xml" />
-                <!-- 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="form/*">
-                <map:generate src="forms/{1}-template.xml" />
-                <map:transform type="forms" />
-                <map:transform type="i18n">
-                    <map:parameter name="locale" value="en-US" />
-                </map:transform>
-                <map:transform src="resources/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/complex-page2html" />
-                </map:serialize>
-            </map:match>
-
-        </map:pipeline>
-
-        <map:pipeline>
-            <map:match pattern="reloading">
-                <map:generate type="mygenerator" />
-                <map:serialize type="html" />
-            </map:match>
-
-
-            <map:match pattern="">
-                <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>
-
-            <!--+
-                | matches the page with the continuation ID and calls the flowscript
-                | associated to this sitemap with the given continuation ID. The flow
-                | engine will then look into the continuation store, retrieve
-                | the correct continuation and resume execution of the flowscript
-                | with that continuation. This guarantees transparent state 
-                | resumption between requests without the need for anything else
-                | (cookies or URL-encoded session IDs)
-                +-->
-            <map:match pattern="*.cont">
-                <map:call continuation="{1}" />
-            </map:match>
-
-            <!--+
-                | matches the call to the beginning of the flow and calls the flow
-                | from its entry point which, in this case is the 'calculator()'
-                | javascript function.
-                +-->
-            <map:match pattern="*.do">
-                <map:call function="{1}" />
-            </map:match>
-
-            <map:match pattern="resources/**">
-                <map:redirect-to uri="servlet:forms:/resources/{1}" />
-            </map:match>
+    <map:generators default="file">
+      <map:generator name="mygenerator" src="org.apache.cocoon.samples.reloading.MyGenerator" />
+    </map:generators>
+
+    <!-- =========================== Transformers =================================== -->
+
+    <map:transformers default="xslt">
+      <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+        <catalogues default="other">
+          <catalogue id="other" name="OtherMessages" location="servlet:forms:/resource/internal/i18n" />
+          <catalogue id="forms" name="FormsMessages" location="servlet:forms:/resource/internal/i18n" />
+        </catalogues>
+        <cache-at-startup>true</cache-at-startup>
+      </map:transformer>
+    </map:transformers>
+
+    <!-- =========================== Classloader =================================== -->
+
+    <map:classloader factory-role="org.apache.cocoon.classloader.ClassLoaderFactory/reloading">
+      <class-dir src="../../../../../../blocks/cocoon-javaflow/cocoon-javaflow-sample/target/classes">
+        <store class="org.apache.cocoon.components.flow.java.JavaflowResourceStore" />
+      </class-dir>
+      <class-dir src="../../../../../../blocks/cocoon-javaflow/cocoon-javaflow-impl/target/classes">
+        <store class="org.apache.cocoon.components.flow.java.JavaflowResourceStore" />
+      </class-dir>
+      <include-classes pattern="org.apache.cocoon.forms.flow.java.FormInstance" />
+      <include-classes pattern="org.apache.cocoon.samples.flow.java.**" />
+      <include-classes pattern="org.apache.cocoon.components.flow.java.AbstractContinuable" />
+    </map:classloader>
+
+    <!--map:classloader factory-role="org.apache.cocoon.classloader.ClassLoaderFactory/reloading">
+      <class-dir src="/home/mau/workspace/cocoon2.2/blocks/cocoon-javaflow/cocoon-javaflow-sample/target/classes">
+      <store class="org.apache.commons.jci.stores.MemoryResourceStore"/>
+      </class-dir>
+      <include-classes pattern="org.apache.cocoon.samples.reloading.java.**"/>
+      </map:classloader-->
+
+  </map:components>
+
+  <!-- =========================== Flows =================================== -->
+
+  <map:flow language="java">
+    <map:script src="org.apache.cocoon.samples.flow.java.CalculatorFlow" />
+    <!--
+      <map:script src="org.apache.cocoon.samples.flow.java.FormFlow"/>
+      <map:script src="org.apache.cocoon.samples.flow.java.PersistenceFlow"/>
+    -->
+  </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>
+      <!--+
+        | produces the screens called by the flowscript
+        +-->
+      <map:match pattern="page/*">
+        <map:generate type="jx" src="screens/{1}.xml" />
+        <!-- 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="form/*">
+        <map:generate src="forms/{1}-template.xml" />
+        <map:transform type="forms" />
+        <map:transform type="i18n">
+          <map:parameter name="locale" value="en-US" />
+        </map:transform>
+        <map:transform src="resources/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/complex-page2html" />
+        </map:serialize>
+      </map:match>
+
+    </map:pipeline>
+
+    <map:pipeline>
+      <map:match pattern="reloading">
+        <map:generate type="mygenerator" />
+        <map:serialize type="html" />
+      </map:match>
+
+
+      <map:match pattern="">
+        <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>
+
+      <!--+
+        | matches the page with the continuation ID and calls the flowscript
+        | associated to this sitemap with the given continuation ID. The flow
+        | engine will then look into the continuation store, retrieve
+        | the correct continuation and resume execution of the flowscript
+        | with that continuation. This guarantees transparent state 
+        | resumption between requests without the need for anything else
+        | (cookies or URL-encoded session IDs)
+        +-->
+      <map:match pattern="*.cont">
+        <map:call continuation="{1}" />
+      </map:match>
+
+      <!--+
+        | matches the call to the beginning of the flow and calls the flow
+        | from its entry point which, in this case is the 'calculator()'
+        | javascript function.
+        +-->
+      <map:match pattern="*.do">
+        <map:call function="{1}" />
+      </map:match>
+
+      <map:match pattern="resources/**">
+        <map:redirect-to uri="servlet:forms:/resources/{1}" />
+      </map:match>
 
-        </map:pipeline>
-    </map:pipelines>
+    </map:pipeline>
+  </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-sample-blockServlet.xml?view=diff&rev=542312&r1=542311&r2=542312
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/META-INF/cocoon/spring/cocoon-javaflow-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.javaflow.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-        <servlet:context mount-path="/cocoon-javaflow-sample" context-path="blockcontext:/cocoon-javaflow-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.javaflow.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-javaflow-sample" context-path="blockcontext:/cocoon-javaflow-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>