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/18 08:47:22 UTC

svn commit: r539289 - in /cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample: ./ src/main/resources/COB-INF/ src/main/resources/COB-INF/flow-webservices/ src/main/resources/COB-INF/groovyflow/ src/main/resources/COB-INF/groovyflow/resources...

Author: felixk
Date: Thu May 17 23:47:21 2007
New Revision: 539289

URL: http://svn.apache.org/viewvc?view=rev&rev=539289
Log:
- move to servlet-service
- add blockServlet bean

Added:
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/resources/
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/resources/forms-samples-styling.xsl   (with props)
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml   (with props)
Modified:
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/flow-webservices/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/module-source/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/scratchpad.xsamples
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/xmodule-source/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml?view=diff&rev=539289&r1=539288&r2=539289
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml Thu May 17 23:47:21 2007
@@ -38,7 +38,18 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-scratchpad-impl</artifactId>
-      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-ajax-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-forms-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-samples-style-default</artifactId>
     </dependency>
   </dependencies>
 </project>

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=539289&r1=539288&r2=539289
==============================================================================
--- 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 Thu May 17 23:47:21 2007
@@ -16,23 +16,34 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
     <!-- =========================== Views =================================== -->
+
     <map:views>
         <map:view from-label="content" name="content">
             <map:serialize type="xml" />
         </map:view>
+
         <map:view from-label="content" name="pretty-content">
-            <map:transform src="context://stylesheets/system/xml2html.xslt" />
-            <map:serialize type="html" />
+            <!-- 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>
-    <!-- indicates what flowscript to attach to this sitemap -->
+
+    <!-- =========================== Flowscripts ================================= -->
+
     <map:flow language="javascript">
         <map:script src="flowWebServices.js" />
     </map:flow>
+
+    <!-- =========================== Pipelines ================================= -->
+
     <map:pipelines>
         <map:pipeline>
             <!--+
@@ -40,15 +51,14 @@
                 +-->
             <map:match pattern="page/*">
                 <map:generate type="jx" src="{1}.jx" />
-                <map:transform src="context://samples/common/style/xsl/html/simple-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="remove" value="{0}" />
-                </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:serialize />
             </map:match>
         </map:pipeline>
+       
         <map:pipeline>
             <map:match pattern="*">
                 <map:call function="{1}" />

Added: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/resources/forms-samples-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/resources/forms-samples-styling.xsl?view=auto&rev=539289
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/resources/forms-samples-styling.xsl (added)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/resources/forms-samples-styling.xsl Thu May 17 23:47:21 2007
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!--+ Include styling stylesheets, one for the widgets, the other one for the
+      | page. As 'forms-advanced-field-styling.xsl' is a specialization of
+      | 'forms-field-styling.xsl' the latter one is imported there. If you don't
+      | want advanced styling of widgets, change it here!
+      | See xsl:include as composition and xsl:import as extension/inheritance.
+      +-->
+  <xsl:include href="servlet:forms:/resource/internal/xsl/forms-page-styling.xsl"/>
+  <xsl:include href="servlet:forms:/resource/internal/xsl/forms-advanced-field-styling.xsl"/>
+
+  <!-- Location of the resources directories, where JS libs and icons are stored -->
+  <xsl:param name="dojo-resources"/>
+  <xsl:param name="forms-resources"/>
+  
+  <xsl:template match="head">
+    <head>
+      <xsl:apply-templates select="." mode="forms-page"/>
+      <xsl:apply-templates select="." mode="forms-field"/>
+      <xsl:apply-templates/>
+    </head>
+  </xsl:template>
+
+  <xsl:template match="body">
+    <body>
+      <!--+ !!! If template with mode 'forms-page' adds text or elements
+          |        template with mode 'forms-field' can no longer add attributes!!!
+          +-->
+      <xsl:apply-templates select="." mode="forms-page"/>
+      <xsl:apply-templates select="." mode="forms-field"/>
+      <xsl:apply-templates/>
+    </body>
+  </xsl:template>
+
+</xsl:stylesheet>

Propchange: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/resources/forms-samples-styling.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/resources/forms-samples-styling.xsl
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/sitemap.xmap?view=diff&rev=539289&r1=539288&r2=539289
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/groovyflow/sitemap.xmap Thu May 17 23:47:21 2007
@@ -18,7 +18,12 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
+    <!-- =========================== Components =================================== -->
+
     <map:components>
+
+        <!-- =========================== Transformers =================================== -->
+
         <map:transformers default="xslt">
             <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
                 <catalogues default="other">
@@ -28,15 +33,38 @@
                 <cache-at-startup>true</cache-at-startup>
             </map:transformer>
         </map:transformers>
+
     </map:components>
 
-    <!-- indicates what flow classes to attach to this sitemap -->
+    <!-- =========================== Flowscripts =================================== -->
+
     <map:flow language="groovy">
         <map:script src="flow/CalculatorFlow.gy" />
         <map:script src="flow/FormFlow.gy" />
         <map:script src="flow/PersistenceFlow.gy" />
     </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>
             <!--+
@@ -44,10 +72,10 @@
                 +-->
             <map:match pattern="page/*">
                 <map:generate type="jx" src="../screens/{1}.xml" />
-                <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-                    <map:parameter name="contextPath" value="{request:contextPath}" />
-                </map:transform>
-                <map:serialize />
+                <!-- 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/*">
@@ -56,11 +84,11 @@
                 <map:transform type="i18n">
                     <map:parameter name="locale" value="en-US" />
                 </map:transform>
-                <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
-                    <map:parameter name="contextPath" value="{request:contextPath}" />
-                </map:transform>
-                <map:transform src="context://samples/blocks/forms/resources/forms-samples-styling.xsl" />
-                <map:serialize />
+                <map:transform src="resources/forms-samples-styling.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>
@@ -68,10 +96,10 @@
         <map:pipeline>
             <map:match pattern="">
                 <map:generate src="samples.xml" />
-                <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
-                    <map:parameter name="contextPath" value="{request:contextPath}" />
-                </map:transform>
-                <map:serialize />
+                <!-- 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>
 
             <!--+
@@ -97,7 +125,7 @@
             </map:match>
 
             <map:match pattern="resources/**">
-                <map:redirect-to uri="/samples/blocks/forms/resources/{1}" />
+                <map:redirect-to uri="{servlet:forms:/}/resources/{1}" />
             </map:match>
 
         </map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/module-source/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/module-source/sitemap.xmap?view=diff&rev=539289&r1=539288&r2=539289
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/module-source/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/module-source/sitemap.xmap Thu May 17 23:47:21 2007
@@ -20,13 +20,36 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
+    <!-- =========================== 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="test1">
                 <map:generate type="text" src="module:request:requestURI" />
-                <map:transform src="context://stylesheets/system/xml2html.xslt" />
-                <map:serialize />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+                </map:serialize>
             </map:match>
 
             <map:match pattern="test2">
@@ -36,8 +59,10 @@
 
             <map:match pattern="test2-post">
                 <map:generate type="text" src="module:request-param:text" />
-                <map:transform src="context://stylesheets/system/xml2html.xslt" />
-                <map:serialize />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+                </map:serialize>
             </map:match>
 
             <!-- post an xml file to test3 with e.g.
@@ -54,8 +79,10 @@
 
             <map:match pattern="test4-post">
                 <map:generate src="module:raw-request-param:text" />
-                <map:transform src="context://stylesheets/system/xml2html.xslt" />
-                <map:serialize />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+                </map:serialize>
             </map:match>
 
         </map:pipeline>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/scratchpad.xsamples
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/scratchpad.xsamples?view=diff&rev=539289&r1=539288&r2=539289
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/scratchpad.xsamples (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/scratchpad.xsamples Thu May 17 23:47:21 2007
@@ -19,7 +19,7 @@
 <xsamples xpath="/samples" unless="group[@name='Scratchpad Samples']">
   
   <group name="Scratchpad Samples">
-    <sample name="Scratchpad Block" href="scratchpad/">
+    <sample name="Scratchpad Block" href="/cocoon-scratchpad-samples/">
       Here you find the samples about the functionality included in the scratchpad, which is the 
       place where new stuff is developed but not yet considered stable enough for production.
     </sample>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539289&r1=539288&r2=539289
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 23:47:21 2007
@@ -31,8 +31,10 @@
         </map:view>
 
         <map:view from-label="content" name="pretty-content">
-            <map:transform src="context://stylesheets/system/xml2html.xslt" />
-            <map:serialize type="html" />
+            <!-- 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">
@@ -51,10 +53,10 @@
             <!-- list of samples -->
             <map:match pattern="welcome">
                 <map:generate src="scratchpad-samples.xml" />
-                <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
-                    <map:parameter name="contextPath" value="{request:contextPath}" />
-                </map:transform>
-                <map:serialize />
+                <!-- 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>
 
             <!-- ======================== Automount =============================== -->

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/xmodule-source/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/xmodule-source/sitemap.xmap?view=diff&rev=539289&r1=539288&r2=539289
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/xmodule-source/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/COB-INF/xmodule-source/sitemap.xmap Thu May 17 23:47:21 2007
@@ -20,10 +20,33 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
+    <!-- =========================== 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>
+
+    <!-- =========================== Flowscripts =================================== -->
+
     <map:flow language="javascript">
         <map:script src="xmodule.js" />
     </map:flow>
 
+    <!-- =========================== Pipelines ================================= -->
+
     <map:pipelines>
         <map:pipeline>
 
@@ -42,8 +65,10 @@
 
             <map:match pattern="test-view">
                 <map:generate src="{request-param:url}#{request-param:xPathIn}" />
-                <map:transform src="context://stylesheets/system/xml2html.xslt" />
-                <map:serialize />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
+                </map:serialize>
             </map:match>
 
         </map:pipeline>

Added: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml?view=auto&rev=539289
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml Thu May 17 23:47:21 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- @version $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+       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.scratchpad.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-scratchpad-sample" context-path="blockcontext:/cocoon-scratchpad-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>

Propchange: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/src/main/resources/META-INF/cocoon/spring/cocoon-scratchpad-sample-blockServlet.xml
------------------------------------------------------------------------------
    svn:keywords = Id