Index: src/main/config/james/context/james-mailbox-maildir-context.xml
===================================================================
--- src/main/config/james/context/james-mailbox-maildir-context.xml	(revision 1136533)
+++ src/main/config/james/context/james-mailbox-maildir-context.xml	(working copy)
@@ -21,7 +21,7 @@
 <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 context/XSD/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
 
     <!-- 
       Mailbox Maildir
Index: src/main/config/james/context/james-server-context.xml
===================================================================
--- src/main/config/james/context/james-server-context.xml	(revision 1136533)
+++ src/main/config/james/context/james-server-context.xml	(working copy)
@@ -23,9 +23,9 @@
        xmlns:camel="http://camel.apache.org/schema/spring"
        xmlns:amq="http://activemq.apache.org/schema/core" 
        xsi:schemaLocation="
-          http://www.springframework.org/schema/beans context/XSD/spring-beans-3.0.xsd
-          http://camel.apache.org/schema/spring context/XSD/camel-spring-2.5.0.xsd
-          http://activemq.apache.org/schema/core context/XSD/activemq-core-5.4.2.xsd">
+          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd
+          http://camel.apache.org/schema/spring classpath:camel-spring.xsd
+          http://activemq.apache.org/schema/core classpath:activemq.xsd">
 
     <!-- 
     ===========================================================================
@@ -305,10 +305,10 @@
      
     <bean id="locker" class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
     <bean id="authenticator" class="org.apache.james.adapter.mailbox.store.UserRepositoryAuthenticator"/>
-    <import resource="classpath:context/james-mailbox-jpa-context.xml" />
-    <import resource="classpath:context/james-mailbox-jcr-context.xml" />
-    <import resource="classpath:context/james-mailbox-maildir-context.xml" />
-    <import resource="classpath:context/james-mailbox-memory-context.xml" />
+    <import resource="james-mailbox-jpa-context.xml" />
+    <import resource="james-mailbox-jcr-context.xml" />
+    <import resource="james-mailbox-maildir-context.xml" />
+    <import resource="james-mailbox-memory-context.xml" />
 
     <!-- 
       Mailbox Copier
Index: src/main/config/james/context/james-mailbox-memory-context.xml
===================================================================
--- src/main/config/james/context/james-mailbox-memory-context.xml	(revision 1136533)
+++ src/main/config/james/context/james-mailbox-memory-context.xml	(working copy)
@@ -21,7 +21,7 @@
 <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 context/XSD/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
 
     <!-- 
       Mailbox Memory
Index: src/main/config/james/context/james-mailbox-jcr-context.xml
===================================================================
--- src/main/config/james/context/james-mailbox-jcr-context.xml	(revision 1136533)
+++ src/main/config/james/context/james-mailbox-jcr-context.xml	(working copy)
@@ -21,7 +21,7 @@
 <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 context/XSD/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
 
     <!-- 
       Mailbox JCR
Index: src/main/config/james/context/james-mailbox-jpa-context.xml
===================================================================
--- src/main/config/james/context/james-mailbox-jpa-context.xml	(revision 1136533)
+++ src/main/config/james/context/james-mailbox-jpa-context.xml	(working copy)
@@ -21,7 +21,7 @@
 <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 context/XSD/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
 
     <!-- 
       Mailbox JPA
Index: src/main/webapp/WEB-INF/web.xml
===================================================================
--- src/main/webapp/WEB-INF/web.xml	(revision 1136533)
+++ src/main/webapp/WEB-INF/web.xml	(working copy)
@@ -18,12 +18,12 @@
   <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>
-      /WEB-INF/conf/spring-beans.xml
+      /WEB-INF/conf/context/james-server-context.xml
     </param-value>
   </context-param>
   <context-param>
      <param-name>contextClass</param-name>
-     <param-value>org.apache.james.container.spring.JamesServerWebApplicationContext</param-value>
+     <param-value>org.apache.james.container.spring.context.web.JamesServerWebApplicationContext</param-value>
    </context-param>
    <listener>
       <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>