You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/10/24 04:28:47 UTC

svn commit: r587748 [2/2] - in /cocoon/trunk: blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/ blocks/cocoon-apples/cocoon-apples-sample/src/main/resources/META-INF/cocoon/spring/ blocks/cocoon-asciiart/cocoon-asciiart-s...

Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/src/main/resources/META-INF/cocoon/spring/cocoon-session-fw-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,14 +16,16 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.session.fw.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-    <servlet:context mount-path="/cocoon-session-fw-sample" context-path="blockcontext:/cocoon-session-fw-sample/" />
+  <bean name="org.apache.cocoon.session.fw.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-session-fw-sample" context-path="blockcontext:/cocoon-session-fw-sample/"/>
   </bean>
 </beans>

Modified: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slide-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slide-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slide-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slide-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,17 +16,19 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.slide.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.slide.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-slide-sample" context-path="blockcontext:/cocoon-slide-sample/">
       <servlet:connections>
-        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
       </servlet:connections>
     </servlet:context>
   </bean>

Modified: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/src/main/resources/META-INF/cocoon/spring/cocoon-slop-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,17 +16,19 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.slop.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.slop.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-slop-sample" context-path="blockcontext:/cocoon-slop-sample/">
       <servlet:connections>
-        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
       </servlet:connections>
     </servlet:context>
   </bean>

Modified: cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/META-INF/cocoon/spring/cocoon-stx-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/META-INF/cocoon/spring/cocoon-stx-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/META-INF/cocoon/spring/cocoon-stx-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/src/main/resources/META-INF/cocoon/spring/cocoon-stx-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,17 +16,19 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.stx.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.stx.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-stx-sample" context-path="blockcontext:/cocoon-stx-sample/">
       <servlet:connections>
-        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
       </servlet:connections>
     </servlet:context>
   </bean>

Modified: cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/META-INF/cocoon/spring/cocoon-taglib-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/META-INF/cocoon/spring/cocoon-taglib-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/META-INF/cocoon/spring/cocoon-taglib-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/src/main/resources/META-INF/cocoon/spring/cocoon-taglib-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,17 +16,19 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.taglib.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.taglib.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-taglib-sample" context-path="blockcontext:/cocoon-taglib-sample/">
       <servlet:connections>
-        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
       </servlet:connections>
     </servlet:context>
   </bean>

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/cocoon/spring/cocoon-template-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/cocoon/spring/cocoon-template-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/cocoon/spring/cocoon-template-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/cocoon/spring/cocoon-template-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,18 +16,20 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.template.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-    <servlet:context mount-path="/cocoon-template-sample" context-path="blockcontext:/cocoon-template-sample/">
-      <servlet:connections>
-        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
-      </servlet:connections>
+  <bean name="org.apache.cocoon.template.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/cocoon-template-sample" context-path="blockcontext:/cocoon-template-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-tour/cocoon-tour-sample/src/main/resources/META-INF/cocoon/spring/cocoon-tour-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/META-INF/cocoon/spring/cocoon-tour-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/META-INF/cocoon/spring/cocoon-tour-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-tour/cocoon-tour-sample/src/main/resources/META-INF/cocoon/spring/cocoon-tour-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,18 +16,20 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.tour.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.tour.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-tour-sample" context-path="blockcontext:/cocoon-tour-sample/">
       <servlet:connections>
-        <entry key="forms" value-ref="org.apache.cocoon.forms.impl.servlet" />
-        <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet" />
+        <entry key="forms" value-ref="org.apache.cocoon.forms.impl.servlet"/>
+        <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet"/>
       </servlet:connections>
     </servlet:context>
   </bean>

Modified: cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/META-INF/cocoon/spring/cocoon-validation-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/META-INF/cocoon/spring/cocoon-validation-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/META-INF/cocoon/spring/cocoon-validation-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-validation/cocoon-validation-sample/src/main/resources/META-INF/cocoon/spring/cocoon-validation-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,17 +16,19 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.validation.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.validation.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-validation-sample" context-path="blockcontext:/cocoon-validation-sample/">
       <servlet:connections>
-        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
       </servlet:connections>
     </servlet:context>
   </bean>

Modified: cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-velocity/cocoon-velocity-sample/src/main/resources/META-INF/cocoon/spring/cocoon-velocity-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,18 +16,20 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.velocity.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.velocity.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-velocity-sample" context-path="blockcontext:/cocoon-velocity-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" />
+        <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>

Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-sample/src/main/resources/META-INF/cocoon/spring/cocoon-web3-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,17 +16,19 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.web3.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.web3.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-web3-sample" context-path="blockcontext:/cocoon-web3-sample/">
       <servlet:connections>
-        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
       </servlet:connections>
     </servlet:context>
   </bean>

Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/META-INF/cocoon/spring/cocoon-webdav-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/META-INF/cocoon/spring/cocoon-webdav-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/META-INF/cocoon/spring/cocoon-webdav-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/META-INF/cocoon/spring/cocoon-webdav-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,17 +16,19 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.webdavs.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.webdavs.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-webdav-sample" context-path="blockcontext:/cocoon-webdav-sample/">
       <servlet:connections>
-        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
       </servlet:connections>
     </servlet:context>
   </bean>

Modified: cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xmldb-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xmldb-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xmldb-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xmldb-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,17 +16,19 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.xmldb.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.xmldb.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-xmldb-sample" context-path="blockcontext:/cocoon-xmldb-sample/">
       <servlet:connections>
-        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
       </servlet:connections>
     </servlet:context>
   </bean>

Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xsp-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xsp-sample-blockServlet.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xsp-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/src/main/resources/META-INF/cocoon/spring/cocoon-xsp-sample-blockServlet.xml Tue Oct 23 19:28:43 2007
@@ -16,17 +16,19 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $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.xsp.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.xsp.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-xsp-sample" context-path="blockcontext:/cocoon-xsp-sample/">
       <servlet:connections>
-        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />
+        <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet"/>
       </servlet:connections>
     </servlet:context>
   </bean>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-block-servlet-map.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-block-servlet-map.xml?rev=587748&r1=587747&r2=587748&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-block-servlet-map.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-block-servlet-map.xml Tue Oct 23 19:28:43 2007
@@ -15,7 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- SVN $Id: cocoon-servlet-service-block-path-module.xml 504719 2007-02-07 22:17:36Z danielf $ -->
+
+<!--
+  - $Id$
+  -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:configurator="http://cocoon.apache.org/schema/configurator"