You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2007/02/04 15:37:20 UTC
svn commit: r503414 - in /cocoon/trunk:
blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/
blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/
blocks/cocoon-forms/cocoon-forms-sampl...
Author: danielf
Date: Sun Feb 4 06:37:20 2007
New Revision: 503414
URL: http://svn.apache.org/viewvc?view=rev&rev=503414
Log:
Using the new servlet service xml format for all all samples that used the blocks-fw before. Removing the dependencies on blocks-fw.
Modified:
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml
cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/spring/cocoon-template-blockServlet.xml
cocoon/trunk/core/cocoon-webapp/pom.xml
cocoon/trunk/core/pom.xml
Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml?view=diff&rev=503414&r1=503413&r2=503414
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml Sun Feb 4 06:37:20 2007
@@ -19,10 +19,11 @@
<!-- @version $Id$ -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="org.apache.cocoon.ajax.block" class="org.apache.cocoon.blocks.BlockServlet">
- <property name="mountPath" value="/cocoon-ajax-sample"/>
- <property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
- <property name="blockContextURL" value="blockcontext:/cocoon-ajax-sample/"/>
- </bean>
+ 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.ajax.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-ajax-sample" context-path="blockcontext:/cocoon-ajax-sample/"/>
+ </bean>
</beans>
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml?view=diff&rev=503414&r1=503413&r2=503414
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-main-sample-blockServlet.xml Sun Feb 4 06:37:20 2007
@@ -19,10 +19,11 @@
<!-- @version $Id$ -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="org.apache.cocoon.core.main.block" class="org.apache.cocoon.blocks.BlockServlet">
- <property name="mountPath" value="/cocoon-core-main-sample"/>
- <property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
- <property name="blockContextURL" value="blockcontext:/cocoon-core-main-sample/"/>
- </bean>
+ 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.core.main.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-core-main-sample" context-path="blockcontext:/cocoon-core-main-sample/"/>
+ </bean>
</beans>
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=503414&r1=503413&r2=503414
==============================================================================
--- 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 Sun Feb 4 06:37:20 2007
@@ -19,10 +19,11 @@
<!-- @version $Id$ -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="org.apache.cocoon.forms.block" class="org.apache.cocoon.blocks.BlockServlet">
- <property name="mountPath" value="/cocoon-forms-sample"/>
- <property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
- <property name="blockContextURL" value="blockcontext:/cocoon-forms-sample/"/>
- </bean>
+ 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.forms.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-forms-sample" context-path="blockcontext:/cocoon-forms-sample/"/>
+ </bean>
</beans>
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/spring/cocoon-template-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/spring/cocoon-template-blockServlet.xml?view=diff&rev=503414&r1=503413&r2=503414
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/spring/cocoon-template-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/META-INF/spring/cocoon-template-blockServlet.xml Sun Feb 4 06:37:20 2007
@@ -19,10 +19,11 @@
<!-- @version $Id$ -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="org.apache.cocoon.template.block" class="org.apache.cocoon.blocks.BlockServlet">
- <property name="mountPath" value="/cocoon-template-sample"/>
- <property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
- <property name="blockContextURL" value="blockcontext:/cocoon-template-sample/"/>
- </bean>
+ 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/"/>
+ </bean>
</beans>
Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?view=diff&rev=503414&r1=503413&r2=503414
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Sun Feb 4 06:37:20 2007
@@ -75,13 +75,6 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks-fw-impl</artifactId>
- <version>1.0.0-M2-SNAPSHOT</version>
- </dependency>
-
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core-main-sample</artifactId>
Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?view=diff&rev=503414&r1=503413&r2=503414
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Sun Feb 4 06:37:20 2007
@@ -34,7 +34,6 @@
<name>Cocoon Core [modules]</name>
<modules>
- <module>cocoon-blocks-fw/cocoon-blocks-fw-impl</module>
<module>cocoon-configuration/cocoon-configuration-api</module>
<module>cocoon-configuration/cocoon-spring-configurator</module>
<module>cocoon-core</module>