You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/10/05 12:41:04 UTC
svn commit: r453181 - in /cocoon/trunk: ./ core/cocoon-core/
core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/
core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/
core/cocoon-core/src/main/java/org/apach...
Author: cziegeler
Date: Thu Oct 5 03:41:03 2006
New Revision: 453181
URL: http://svn.apache.org/viewvc?view=rev&rev=453181
Log:
Update to final release of Spring 2.0
Correct our namespace for spring configuration
Use 2.1 as version for assembly plugin to avoid build problems
Modified:
cocoon/trunk/core/cocoon-core/pom.xml
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonRequestAttributes.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas
cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml
cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd
cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml
cocoon/trunk/dists/cocoon-dist-publishing/pom.xml
cocoon/trunk/dists/cocoon-dist-samples/pom.xml
cocoon/trunk/pom.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/demo-application-context.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Thu Oct 5 03:41:03 2006
@@ -333,31 +333,10 @@
<artifactId>jakarta-bcel</artifactId>
<version>20040329</version>
</dependency>
- <!-- We have to include all relevant spring modules as the poms for 2.0rc2 are not available -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.0-rc2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.0-rc2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>2.0-rc2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.0-rc2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.0-rc2</version>
+ <version>2.0</version>
</dependency>
<!-- OSGi -->
<dependency>
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonRequestAttributes.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonRequestAttributes.java?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonRequestAttributes.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonRequestAttributes.java Thu Oct 5 03:41:03 2006
@@ -20,7 +20,7 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.springframework.web.context.scope.RequestAttributes;
+import org.springframework.web.context.request.RequestAttributes;
/**
* This is an implementation of Springs {@link RequestAttributes} based
@@ -31,7 +31,8 @@
* @version $Id$
* @since 2.2
*/
-public class CocoonRequestAttributes implements RequestAttributes {
+public class CocoonRequestAttributes
+ implements RequestAttributes {
final protected Request request;
@@ -100,4 +101,17 @@
}
}
+ /**
+ * @see org.springframework.web.context.request.RequestAttributes#getSessionId()
+ */
+ public String getSessionId() {
+ return this.request.getSession().getId();
+ }
+
+ /**
+ * @see org.springframework.web.context.request.RequestAttributes#registerDestructionCallback(java.lang.String, java.lang.Runnable, int)
+ */
+ public void registerDestructionCallback(String arg0, Runnable arg1, int arg2) {
+ // we ignore this
+ }
}
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java Thu Oct 5 03:41:03 2006
@@ -25,7 +25,7 @@
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.scope.RequestAttributes;
+import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.support.WebApplicationContextUtils;
/**
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java Thu Oct 5 03:41:03 2006
@@ -36,7 +36,7 @@
import org.apache.excalibur.source.SourceResolver;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.scope.RequestAttributes;
+import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -127,12 +127,12 @@
buffer.append("<beans xmlns=\"http://www.springframework.org/schema/beans\"");
buffer.append(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
buffer.append(" xmlns:util=\"http://www.springframework.org/schema/util\"");
- buffer.append(" xmlns:cocoon=\"http://org.apache.cocoon/core\"");
- buffer.append(" xmlns:avalon=\"http://org.apache.cocoon/avalon\"");
- buffer.append(" xsi:schemaLocation=\"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd");
- buffer.append(" http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd");
- buffer.append(" http://org.apache.cocoon/core http://org.apache.cocoon/core.xsd");
- buffer.append(" http://org.apache.cocoon/avalon http://org.apache.cocoon/avalon.xsd\">\n");
+ buffer.append(" xmlns:cocoon=\"http://cocoon.apache.org/core\"");
+ buffer.append(" xmlns:avalon=\"http://cocoon.apache.org/avalon\"");
+ buffer.append(" xsi:schemaLocation=\"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd");
+ buffer.append(" http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd");
+ buffer.append(" http://cocoon.apache.org/core http://cocoon.apache.org/core.xsd");
+ buffer.append(" http://cocoon.apache.org/avalon http://cocoon.apache.org/avalon.xsd\">\n");
}
protected static void addFooter(StringBuffer buffer) {
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java Thu Oct 5 03:41:03 2006
@@ -44,6 +44,7 @@
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
import org.springframework.beans.factory.config.Scope;
@@ -621,5 +622,33 @@
*/
public String[] getSingletonNames() {
return this.beanFactory.getSingletonNames();
+ }
+
+ /**
+ * @see org.springframework.beans.factory.config.ConfigurableBeanFactory#copyConfigurationFrom(org.springframework.beans.factory.config.ConfigurableBeanFactory)
+ */
+ public void copyConfigurationFrom(ConfigurableBeanFactory arg0) {
+ beanFactory.copyConfigurationFrom(arg0);
+ }
+
+ /**
+ * @see org.springframework.beans.factory.config.ConfigurableBeanFactory#destroyBean(java.lang.String, java.lang.Object)
+ */
+ public void destroyBean(String arg0, Object arg1) {
+ beanFactory.destroyBean(arg0, arg1);
+ }
+
+ /**
+ * @see org.springframework.beans.factory.config.ConfigurableBeanFactory#getRegisteredScope(java.lang.String)
+ */
+ public Scope getRegisteredScope(String arg0) {
+ return beanFactory.getRegisteredScope(arg0);
+ }
+
+ /**
+ * @see org.springframework.beans.factory.config.ConfigurableBeanFactory#getRegisteredScopeNames()
+ */
+ public String[] getRegisteredScopeNames() {
+ return beanFactory.getRegisteredScopeNames();
}
}
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers Thu Oct 5 03:41:03 2006
@@ -17,5 +17,5 @@
# You should NOT change this file directly. Create your own properties
# file and put it in the sub directories for the mode you are running
# Cocoon in.
-http\://org.apache.cocoon/core=org.apache.cocoon.core.container.spring.CocoonNamespaceHandler
-http\://org.apache.cocoon/avalon=org.apache.cocoon.core.container.spring.avalon.AvalonNamespaceHandler
+http\://cocoon.apache.org/core=org.apache.cocoon.core.container.spring.CocoonNamespaceHandler
+http\://cocoon.apache.org/avalon=org.apache.cocoon.core.container.spring.avalon.AvalonNamespaceHandler
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas Thu Oct 5 03:41:03 2006
@@ -17,5 +17,5 @@
# You should NOT change this file directly. Create your own properties
# file and put it in the sub directories for the mode you are running
# Cocoon in.
-http\://org.apache.cocoon/core.xsd=org/apache/cocoon/core/container/spring/cocoon.xsd
-http\://org.apache.cocoon/avalon.xsd=org/apache/cocoon/core/container/spring/avalon/avalon.xsd
+http\://cocoon.apache.org/core.xsd=org/apache/cocoon/core/container/spring/cocoon.xsd
+http\://cocoon.apache.org/avalon.xsd=org/apache/cocoon/core/container/spring/avalon/avalon.xsd
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml Thu Oct 5 03:41:03 2006
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
+ "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd Thu Oct 5 03:41:03 2006
@@ -16,8 +16,8 @@
limitations under the License.
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://org.apache.cocoon/avalon"
- xmlns:tns="http://org.apache.cocoon/avalon">
+ targetNamespace="http://cocoon.apache.org/avalon"
+ xmlns:tns="http://cocoon.apache.org/avalon">
<xsd:element name="avalon" type="tns:avalonType"/>
<xsd:element name="sitemap" type="tns:sitemapType"/>
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd Thu Oct 5 03:41:03 2006
@@ -17,8 +17,8 @@
-->
<!-- @version $Id$ -->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://org.apache.cocoon/core"
- xmlns:tns="http://org.apache.cocoon/core">
+ targetNamespace="http://cocoon.apache.org/core"
+ xmlns:tns="http://cocoon.apache.org/core">
<xsd:element name="settings" type="tns:settingsType"/>
Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml Thu Oct 5 03:41:03 2006
@@ -19,12 +19,12 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
- xmlns:cocoon="http://org.apache.cocoon/core"
- xmlns:avalon="http://org.apache.cocoon/avalon"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
- http://org.apache.cocoon/core http://org.apache.cocoon/core.xsd
- http://org.apache.cocoon/avalon http://org.apache.cocoon/avalon.xsd">
+ xmlns:cocoon="http://cocoon.apache.org/core"
+ xmlns:avalon="http://cocoon.apache.org/avalon"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://cocoon.apache.org/core http://cocoon.apache.org/core.xsd
+ http://cocoon.apache.org/avalon http://cocoon.apache.org/avalon.xsd">
<!-- Load all the properties for Cocoon -->
<cocoon:settings/>
Modified: cocoon/trunk/dists/cocoon-dist-publishing/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/dists/cocoon-dist-publishing/pom.xml?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/dists/cocoon-dist-publishing/pom.xml (original)
+++ cocoon/trunk/dists/cocoon-dist-publishing/pom.xml Thu Oct 5 03:41:03 2006
@@ -53,7 +53,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1</version>
<configuration>
<descriptor>assembly.xml</descriptor>
<outputDirectory>target/dist</outputDirectory>
Modified: cocoon/trunk/dists/cocoon-dist-samples/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/dists/cocoon-dist-samples/pom.xml?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/dists/cocoon-dist-samples/pom.xml (original)
+++ cocoon/trunk/dists/cocoon-dist-samples/pom.xml Thu Oct 5 03:41:03 2006
@@ -53,7 +53,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1</version>
<configuration>
<descriptor>assembly.xml</descriptor>
<outputDirectory>target/dist</outputDirectory>
Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Thu Oct 5 03:41:03 2006
@@ -498,7 +498,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1</version>
<configuration>
<descriptor>assembly.xml</descriptor>
<outputDirectory>target</outputDirectory>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/demo-application-context.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/demo-application-context.xml?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/demo-application-context.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/demo-application-context.xml Thu Oct 5 03:41:03 2006
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
+ "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -17,5 +18,5 @@
limitations under the License.
-->
<beans>
- <bean id="demo" class="demo.MyBean" singleton="true"/>
+ <bean id="demo" class="demo.MyBean" scope="singleton"/>
</beans>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml?view=diff&rev=453181&r1=453180&r2=453181
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml Thu Oct 5 03:41:03 2006
@@ -21,10 +21,10 @@
xmlns:util="http://www.springframework.org/schema/util"
xmlns:cocoon="http://org.apache.cocoon/core"
xmlns:avalon="http://org.apache.cocoon/avalon"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
- http://org.apache.cocoon/core http://org.apache.cocoon/core.xsd
- http://org.apache.cocoon/avalon http://org.apache.cocoon/avalon.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://org.apache.cocoon/core http://cocoon.apache.org/core.xsd
+ http://org.apache.cocoon/avalon http://cocoon.apache.org/avalon.xsd">
<!-- Load all the properties for Cocoon -->
<cocoon:settings/>