Author: norman
Date: Sun Dec 19 18:54:48 2010
New Revision: 1050929
URL: http://svn.apache.org/viewvc?rev=1050929&view=rev
Log:
Adjust package names to match latest refactoring
Modified:
james/server/trunk/container-spring/pom.xml
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
Modified: james/server/trunk/container-spring/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1050929&r1=1050928&r2=1050929&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Sun Dec 19 18:54:48 2010
@@ -64,7 +64,7 @@
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
<environmentSetupFileName>setenv</environmentSetupFileName>
<!-- set some sane defaults for memory -->
- <extraJvmArguments>-Xms128m -Xmx512m
-Djava.system.class.loader=org.apache.james.container.spring.JamesClassLoader
${jmx.system-properties} ${javamail.system-properties}
${james.system-properties}</extraJvmArguments>
+ <extraJvmArguments>-Xms128m -Xmx512m
-Djava.system.class.loader=org.apache.james.container.spring.context.JamesClassLoader
${jmx.system-properties} ${javamail.system-properties}
${james.system-properties}</extraJvmArguments>
<!-- Generate bin scripts for windows and unix per default -->
<platforms>
<platform>windows</platform>
@@ -146,7 +146,7 @@
</property>
<property>
<name>wrapper.java.additional.1</name>
-
<value>-Djava.system.class.loader=org.apache.james.container.spring.JamesClassLoader</value>
+
<value>-Djava.system.class.loader=org.apache.james.container.spring.context.JamesClassLoader</value>
</property>
<property>
<name>wrapper.java.additional.2</name>
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=1050929&r1=1050928&r2=1050929&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
Sun Dec 19 18:54:48 2010
@@ -30,10 +30,10 @@
<!--
File System
-->
- <bean class="org.apache.james.container.spring.FileSystemResolver">
+ <bean class="org.apache.james.container.spring.config.FileSystemResolver">
<property name="fileSystem" ref="filesystem" />
</bean>
- <bean id="filesystem"
class="org.apache.james.container.spring.SpringFileSystem" />
+ <bean id="filesystem"
class="org.apache.james.resolver.spring.SpringFileSystem" />
<!--
Configuration Provider
@@ -42,7 +42,7 @@
<property name="configurationProvider" ref="configurationProvider" />
<property name="order" value="1" />
</bean>
- <bean id="configurationProvider"
class="org.apache.james.container.spring.lifecycle.SpringConfigurationProvider">
+ <bean id="configurationProvider"
class="org.apache.james.container.spring.provider.impl.ResourceLoaderConfigurationProvider">
<property name="configurationMappings">
<map>
<entry key="mailProcessor" value="mailetcontainer"/>
@@ -59,7 +59,7 @@
<property name="logProvider" ref="logProvider" />
<property name="order" value="0" />
</bean>
- <bean id="logProvider"
class="org.apache.james.container.spring.lifecycle.SpringLogProvider">
+ <bean id="logProvider"
class="org.apache.james.container.spring.provider.impl.Log4JLogProvider">
<property name="logMappings">
<map>
<entry key="mailProcessor" value="mailetcontainer"/>
@@ -133,8 +133,8 @@
<bean id="mailProcessor" name="processorRoute"
class="org.apache.james.mailetcontainer.camel.CamelMailProcessorList"/>
<bean id="mailspooler"
class="org.apache.james.mailetcontainer.lib.JamesMailSpooler"/>
<bean id="mailetcontext"
class="org.apache.james.mailetcontainer.lib.JamesMailetContext"/>
- <bean id="mailetloader"
class="org.apache.james.container.spring.mailetcontainer.BeanFactoryMailetLoader"
/>
- <bean id="matcherloader"
class="org.apache.james.container.spring.mailetcontainer.BeanFactoryMatcherLoader"
/>
+ <bean id="mailetloader"
class="org.apache.james.mailetcontainer.spring.BeanFactoryMailetLoader" />
+ <bean id="matcherloader"
class="org.apache.james.mailetcontainer.spring.BeanFactoryMatcherLoader" />
<!--
DNS Service
@@ -147,7 +147,7 @@
<bean id="remotemanager"
class="org.apache.james.remotemanager.netty.RemoteManager" >
<property name="protocolHandlerChain"
ref="remoteProtocolHandlerChain"/>
</bean>
- <bean id="remoteProtocolHandlerChain"
class="org.apache.james.container.spring.SpringProtocolHandlerChain">
+ <bean id="remoteProtocolHandlerChain"
class="org.apache.james.protocols.spring.BeanFactoryProtocolHandlerChain">
<property name="coreHandlersPackage"
value="org.apache.james.remotemanager.core.CoreCmdHandlerLoader"/>
<property name="beanName" value="remotemanager"/>
</bean>
@@ -158,7 +158,7 @@
<bean id="smtpserver" class="org.apache.james.smtpserver.netty.SMTPServer">
<property name="protocolHandlerChain" ref="smtpProtocolHandlerChain"/>
</bean>
- <bean id="smtpProtocolHandlerChain"
class="org.apache.james.container.spring.SpringProtocolHandlerChain">
+ <bean id="smtpProtocolHandlerChain"
class="org.apache.james.protocols.spring.BeanFactoryProtocolHandlerChain">
<property name="coreHandlersPackage"
value="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
<property name="beanName" value="smtpserver"/>
</bean>
@@ -169,7 +169,7 @@
<bean id="lmtpserver" class="org.apache.james.lmtpserver.netty.LMTPServer">
<property name="protocolHandlerChain" ref="lmtpProtocolHandlerChain"/>
</bean>
- <bean id="lmtpProtocolHandlerChain"
class="org.apache.james.container.spring.SpringProtocolHandlerChain">
+ <bean id="lmtpProtocolHandlerChain"
class="org.apache.james.protocols.spring.BeanFactoryProtocolHandlerChain">
<property name="coreHandlersPackage"
value="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
<property name="beanName" value="lmtpserver"/>
</bean>
@@ -185,7 +185,7 @@
<bean id="pop3server"
class="org.apache.james.pop3server.netty.POP3Server" >
<property name="protocolHandlerChain" ref="pop3ProtocolHandlerChain"/>
</bean>
- <bean id="pop3ProtocolHandlerChain"
class="org.apache.james.container.spring.SpringProtocolHandlerChain">
+ <bean id="pop3ProtocolHandlerChain"
class="org.apache.james.protocols.spring.BeanFactoryProtocolHandlerChain">
<property name="coreHandlersPackage"
value="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
<property name="beanName" value="lmtpserver"/>
</bean>
@@ -208,7 +208,7 @@
<!-- BeanFactoryPostProcessor which take care of register beans from james
specific configuration files -->
- <bean
class="org.apache.james.container.spring.JamesLoaderBeanFactoryPostProcessor">
+ <bean
class="org.apache.james.container.spring.config.JamesLoaderBeanFactoryPostProcessor">
<property name="beans">
<map>
<!-- Users-->
@@ -242,7 +242,7 @@
<!--
MailStore
-->
- <bean id="mailrepositorystore"
class="org.apache.james.container.spring.BeanFactoryMailRepositoryStore" />
+ <bean id="mailrepositorystore"
class="org.apache.james.mailrepository.spring.BeanFactoryMailRepositoryStore" />
<!--
Mailbox
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
