You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2011/06/16 19:36:46 UTC
svn commit: r1136560 - in /james/server/trunk/container-spring/src/main:
config/james/context/ webapp/WEB-INF/
Author: norman
Date: Thu Jun 16 17:36:46 2011
New Revision: 1136560
URL: http://svn.apache.org/viewvc?rev=1136560&view=rev
Log:
Make sure james also works on a servlet container. Thanks to Tijs Rademakers for the patch. See JAMES-1274
Modified:
james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-jcr-context.xml
james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-jpa-context.xml
james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-maildir-context.xml
james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-memory-context.xml
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
james/server/trunk/container-spring/src/main/webapp/WEB-INF/web.xml
Modified: james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-jcr-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-jcr-context.xml?rev=1136560&r1=1136559&r2=1136560&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-jcr-context.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-jcr-context.xml Thu Jun 16 17:36:46 2011
@@ -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
Modified: james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-jpa-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-jpa-context.xml?rev=1136560&r1=1136559&r2=1136560&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-jpa-context.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-jpa-context.xml Thu Jun 16 17:36:46 2011
@@ -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
Modified: james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-maildir-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-maildir-context.xml?rev=1136560&r1=1136559&r2=1136560&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-maildir-context.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-maildir-context.xml Thu Jun 16 17:36:46 2011
@@ -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
Modified: james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-memory-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-memory-context.xml?rev=1136560&r1=1136559&r2=1136560&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-memory-context.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-memory-context.xml Thu Jun 16 17:36:46 2011
@@ -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
Modified: james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml?rev=1136560&r1=1136559&r2=1136560&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml Thu Jun 16 17:36:46 2011
@@ -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
Modified: james/server/trunk/container-spring/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/webapp/WEB-INF/web.xml?rev=1136560&r1=1136559&r2=1136560&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/webapp/WEB-INF/web.xml (original)
+++ james/server/trunk/container-spring/src/main/webapp/WEB-INF/web.xml Thu Jun 16 17:36:46 2011
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org