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 ie...@apache.org on 2013/02/09 20:05:15 UTC
svn commit: r1444410 - in /james/server/trunk:
fetchmail/src/main/resources/META-INF/spring/
mailetcontainer-camel/src/main/resources/META-INF/spring/
protocols/protocols-imap4/src/main/resources/META-INF/spring/
protocols/protocols-lmtp/src/main/resou...
Author: ieugen
Date: Sat Feb 9 19:05:14 2013
New Revision: 1444410
URL: http://svn.apache.org/r1444410
Log:
Spring context refactoring
* added file-queue spring context
* moved OSGi service declarations from loaders-osgi.xml
* moved more bean post-processors in loaders-context.xml
* importing activemq bean definitions from activemq-context.xml
Added:
james/server/trunk/queue/queue-file/src/main/resources/
james/server/trunk/queue/queue-file/src/main/resources/META-INF/
james/server/trunk/queue/queue-file/src/main/resources/META-INF/spring/
james/server/trunk/queue/queue-file/src/main/resources/META-INF/spring/file-queue-context.xml
james/server/trunk/queue/queue-file/src/main/resources/META-INF/spring/file-queue-osgi.xml
- copied, changed from r1444081, james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml
Modified:
james/server/trunk/fetchmail/src/main/resources/META-INF/spring/fetchmail-context.xml
james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
james/server/trunk/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-context.xml
james/server/trunk/protocols/protocols-lmtp/src/main/resources/META-INF/spring/lmtpserver-context.xml
james/server/trunk/protocols/protocols-lmtp/src/main/resources/lmtpserver.xml
james/server/trunk/protocols/protocols-pop3/src/main/resources/META-INF/spring/pop3server-context.xml
james/server/trunk/protocols/protocols-smtp/src/main/resources/META-INF/spring/smtpserver-context.xml
james/server/trunk/queue/queue-activemq/pom.xml
james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/filesystem/ResourceLoaderFileSystem.java
james/server/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
james/server/trunk/spring/src/main/resources/META-INF/spring/loaders-context.xml
james/server/trunk/spring/src/main/resources/META-INF/spring/loaders-osgi.xml
Modified: james/server/trunk/fetchmail/src/main/resources/META-INF/spring/fetchmail-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/resources/META-INF/spring/fetchmail-context.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/resources/META-INF/spring/fetchmail-context.xml (original)
+++ james/server/trunk/fetchmail/src/main/resources/META-INF/spring/fetchmail-context.xml Sat Feb 9 19:05:14 2013
@@ -14,19 +14,11 @@
governing permissions and limitations ! ! under the License. !
-->
-
<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-3.0.xsd">
-
- <!-- Import PostBeanProcessors -->
- <import resource="classpath*:org/apache/james/container/spring/server-context.xml"/>
-
- <!--
- ===========================================================================
- FetchMail
- ===========================================================================
- -->
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
- <bean id="fetchmail" class="org.apache.james.fetchmail.FetchScheduler"/>
+ <!-- FetchMail -->
+ <bean id="fetchmail" class="org.apache.james.fetchmail.FetchScheduler" autowire="byName"/>
</beans>
Modified: james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/resources/META-INF/spring/mailetcontainer-context.xml Sat Feb 9 19:05:14 2013
@@ -1,34 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- ! Licensed to the Apache Software Foundation (ASF) under one ! ! or
- more contributor license agreements. See the NOTICE file ! !
- distributed with this work for additional information ! ! regarding
- copyright ownership. The ASF licenses this file ! ! to you under the
- Apache License, Version 2.0 (the ! ! "License"); you may not use this
- file except in compliance ! ! with the License. You may obtain a copy
- of the License at ! ! ! ! http://www.apache.org/licenses/LICENSE-2.0 !
- ! ! ! Unless required by applicable law or agreed to in writing, ! !
- software distributed under the License is distributed on an ! ! "AS
- IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ! ! KIND, either
- express or implied. See the License for the ! ! specific language
- governing permissions and limitations ! ! under the License. !
- -->
-
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one ! ! or
+ more contributor license agreements. See the NOTICE file ! !
+ distributed with this work for additional information ! ! regarding
+ copyright ownership. The ASF licenses this file ! ! to you under the
+ Apache License, Version 2.0 (the ! ! "License"); you may not use this
+ file except in compliance ! ! with the License. You may obtain a copy
+ of the License at ! ! ! ! http://www.apache.org/licenses/LICENSE-2.0 !
+ ! ! ! Unless required by applicable law or agreed to in writing, ! !
+ software distributed under the License is distributed on an ! ! "AS
+ IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ! ! KIND, either
+ express or implied. See the License for the ! ! specific language
+ governing permissions and limitations ! ! under the License. !
+-->
-<beans xmlns="http://www.springframework.org/schema/beans"
+<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-3.0.xsd">
-
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
<!--
- Mailet Container Beans.
- -->
- <bean id="mailprocessor" name="processorRoute" class="org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor"/>
-
+ Mailet Container Beans.
+ -->
+ <bean id="mailprocessor" name="processorRoute"
+ class="org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor" autowire="byType"/>
+
<!--
mailcontext bean must be defined after mailProcessor
otherwise LogEnabled injection via LogEnabledBeanPostProcessor will not occur before
it is used - Seems like a Spring bug.
-->
- <bean id="mailetcontext" class="org.apache.james.mailetcontainer.impl.JamesMailetContext"/>
- <bean id="mailspooler" class="org.apache.james.mailetcontainer.impl.JamesMailSpooler"/>
+ <bean id="mailetcontext" class="org.apache.james.mailetcontainer.impl.JamesMailetContext" autowire="byType"/>
+ <bean id="mailspooler" class="org.apache.james.mailetcontainer.impl.JamesMailSpooler" autowire="byType"/>
</beans>
Modified: james/server/trunk/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-context.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-context.xml (original)
+++ james/server/trunk/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-context.xml Sat Feb 9 19:05:14 2013
@@ -1,26 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- ! Licensed to the Apache Software Foundation (ASF) under one ! ! or
- more contributor license agreements. See the NOTICE file ! !
- distributed with this work for additional information ! ! regarding
- copyright ownership. The ASF licenses this file ! ! to you under the
- Apache License, Version 2.0 (the ! ! "License"); you may not use this
- file except in compliance ! ! with the License. You may obtain a copy
- of the License at ! ! ! ! http://www.apache.org/licenses/LICENSE-2.0 !
- ! ! ! Unless required by applicable law or agreed to in writing, ! !
- software distributed under the License is distributed on an ! ! "AS
- IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ! ! KIND, either
- express or implied. See the License for the ! ! specific language
- governing permissions and limitations ! ! under the License. !
- -->
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one ! ! or
+ more contributor license agreements. See the NOTICE file ! !
+ distributed with this work for additional information ! ! regarding
+ copyright ownership. The ASF licenses this file ! ! to you under the
+ Apache License, Version 2.0 (the ! ! "License"); you may not use this
+ file except in compliance ! ! with the License. You may obtain a copy
+ of the License at ! ! ! ! http://www.apache.org/licenses/LICENSE-2.0 !
+ ! ! ! Unless required by applicable law or agreed to in writing, ! !
+ software distributed under the License is distributed on an ! ! "AS
+ IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ! ! KIND, either
+ express or implied. See the License for the ! ! specific language
+ governing permissions and limitations ! ! under the License. !
+-->
-<beans xmlns="http://www.springframework.org/schema/beans"
+<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-3.0.xsd">
- <!--
- IMAP Server
- -->
- <bean id="imapserver" class="org.apache.james.imapserver.netty.IMAPServer"/>
+ <bean id="imapserver" class="org.apache.james.imapserver.netty.IMAPServerFactory">
+ <property name="imapProcessor" ref="imapProcessor"/>
+ <property name="imapEncoder" ref="imapEncoder"/>
+ <property name="imapDecoder" ref="imapDecoder"/>
+ <property name="fileSystem" ref="filesystem"/>
+ </bean>
+
</beans>
Modified: james/server/trunk/protocols/protocols-lmtp/src/main/resources/META-INF/spring/lmtpserver-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-lmtp/src/main/resources/META-INF/spring/lmtpserver-context.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-lmtp/src/main/resources/META-INF/spring/lmtpserver-context.xml (original)
+++ james/server/trunk/protocols/protocols-lmtp/src/main/resources/META-INF/spring/lmtpserver-context.xml Sat Feb 9 19:05:14 2013
@@ -17,9 +17,9 @@
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-3.0.xsd">
- <!--
- LMTP Server
- -->
- <bean id="lmtpserver" class="org.apache.james.lmtpserver.netty.LMTPServer"/>
+ <bean id="lmtpserver" class="org.apache.james.lmtpserver.netty.LMTPServerFactory">
+ <property name="protocolHandlerLoader" ref="protocolhandlerloader"/>
+ <property name="fileSystem" ref="filesystem"/>
+ </bean>
</beans>
Modified: james/server/trunk/protocols/protocols-lmtp/src/main/resources/lmtpserver.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-lmtp/src/main/resources/lmtpserver.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-lmtp/src/main/resources/lmtpserver.xml (original)
+++ james/server/trunk/protocols/protocols-lmtp/src/main/resources/lmtpserver.xml Sat Feb 9 19:05:14 2013
@@ -21,17 +21,17 @@
<!-- See http://james.apache.org/server/3/config.html for usage -->
<lmtpservers>
- <lmtpserver enabled="false">
- <jmxName>lmtpserver</jmxName>
- <bind>127.0.0.1:24</bind>
- <connectionBacklog>200</connectionBacklog>
- <connectiontimeout>1200</connectiontimeout>
- <connectionLimit> 0 </connectionLimit>
- <connectionLimitPerIP> 0 </connectionLimitPerIP>
- <maxmessagesize>0</maxmessagesize>
- <handlerchain enableJmx="true">
- <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
- </handlerchain>
- </lmtpserver>
+ <lmtpserver enabled="false">
+ <jmxName>lmtpserver</jmxName>
+ <bind>127.0.0.1:24</bind>
+ <connectionBacklog>200</connectionBacklog>
+ <connectiontimeout>1200</connectiontimeout>
+ <connectionLimit>0</connectionLimit>
+ <connectionLimitPerIP>0</connectionLimitPerIP>
+ <maxmessagesize>0</maxmessagesize>
+ <handlerchain enableJmx="true">
+ <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
+ </handlerchain>
+ </lmtpserver>
</lmtpservers>
Modified: james/server/trunk/protocols/protocols-pop3/src/main/resources/META-INF/spring/pop3server-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/src/main/resources/META-INF/spring/pop3server-context.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/src/main/resources/META-INF/spring/pop3server-context.xml (original)
+++ james/server/trunk/protocols/protocols-pop3/src/main/resources/META-INF/spring/pop3server-context.xml Sat Feb 9 19:05:14 2013
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- ! Licensed to the Apache Software Foundation (ASF) under one ! ! or
- more contributor license agreements. See the NOTICE file ! !
- distributed with this work for additional information ! ! regarding
- copyright ownership. The ASF licenses this file ! ! to you under the
- Apache License, Version 2.0 (the ! ! "License"); you may not use this
- file except in compliance ! ! with the License. You may obtain a copy
- of the License at ! ! ! ! http://www.apache.org/licenses/LICENSE-2.0 !
- ! ! ! Unless required by applicable law or agreed to in writing, ! !
- software distributed under the License is distributed on an ! ! "AS
- IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ! ! KIND, either
- express or implied. See the License for the ! ! specific language
- governing permissions and limitations ! ! under the License. !
- -->
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one ! ! or
+ more contributor license agreements. See the NOTICE file ! !
+ distributed with this work for additional information ! ! regarding
+ copyright ownership. The ASF licenses this file ! ! to you under the
+ Apache License, Version 2.0 (the ! ! "License"); you may not use this
+ file except in compliance ! ! with the License. You may obtain a copy
+ of the License at ! ! ! ! http://www.apache.org/licenses/LICENSE-2.0 !
+ ! ! ! Unless required by applicable law or agreed to in writing, ! !
+ software distributed under the License is distributed on an ! ! "AS
+ IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ! ! KIND, either
+ express or implied. See the License for the ! ! specific language
+ governing permissions and limitations ! ! under the License. !
+-->
-<beans xmlns="http://www.springframework.org/schema/beans"
+<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-3.0.xsd">
-
- <!--
- POP3 Server
- -->
- <bean id="pop3server" class="org.apache.james.pop3server.netty.POP3Server"/>
-
+
+ <bean id="pop3server" class="org.apache.james.pop3server.netty.POP3ServerFactory">
+ <property name="protocolHandlerLoader" ref="protocolhandlerloader"/>
+ <property name="fileSystem" ref="filesystem"/>
+ </bean>
+
</beans>
Modified: james/server/trunk/protocols/protocols-smtp/src/main/resources/META-INF/spring/smtpserver-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/resources/META-INF/spring/smtpserver-context.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/resources/META-INF/spring/smtpserver-context.xml (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/resources/META-INF/spring/smtpserver-context.xml Sat Feb 9 19:05:14 2013
@@ -18,9 +18,10 @@
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-3.0.xsd">
- <!--
- SMTP Server
- -->
- <bean id="smtpserver" class="org.apache.james.smtpserver.netty.SMTPServer"/>
+ <bean id="smtpserver" class="org.apache.james.smtpserver.netty.SMTPServerFactory">
+ <property name="protocolHandlerLoader" ref="protocolhandlerloader"/>
+ <property name="fileSystem" ref="filesystem"/>
+ <property name="dnsService" ref="dnsservice"/>
+ </bean>
</beans>
Modified: james/server/trunk/queue/queue-activemq/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-activemq/pom.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/queue/queue-activemq/pom.xml (original)
+++ james/server/trunk/queue/queue-activemq/pom.xml Sat Feb 9 19:05:14 2013
@@ -34,7 +34,7 @@
<name>Apache James :: Server :: Mail Queue :: ActiveMQ</name>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-queue-api</artifactId>
@@ -94,18 +94,18 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<!-- testing -->
Modified: james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml (original)
+++ james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml Sat Feb 9 19:05:14 2013
@@ -1,59 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- ! Licensed to the Apache Software Foundation (ASF) under one ! ! or
- more contributor license agreements. See the NOTICE file ! !
- distributed with this work for additional information ! ! regarding
- copyright ownership. The ASF licenses this file ! ! to you under the
- Apache License, Version 2.0 (the ! ! "License"); you may not use this
- file except in compliance ! ! with the License. You may obtain a copy
- of the License at ! ! ! ! http://www.apache.org/licenses/LICENSE-2.0 !
- ! ! ! Unless required by applicable law or agreed to in writing, ! !
- software distributed under the License is distributed on an ! ! "AS
- IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ! ! KIND, either
- express or implied. See the License for the ! ! specific language
- governing permissions and limitations ! ! under the License. !
- -->
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one ! ! or
+ more contributor license agreements. See the NOTICE file ! !
+ distributed with this work for additional information ! ! regarding
+ copyright ownership. The ASF licenses this file ! ! to you under the
+ Apache License, Version 2.0 (the ! ! "License"); you may not use this
+ file except in compliance ! ! with the License. You may obtain a copy
+ of the License at ! ! ! ! http://www.apache.org/licenses/LICENSE-2.0 !
+ ! ! ! Unless required by applicable law or agreed to in writing, ! !
+ software distributed under the License is distributed on an ! ! "AS
+ IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ! ! KIND, either
+ express or implied. See the License for the ! ! specific language
+ governing permissions and limitations ! ! under the License. !
+-->
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
- xmlns:ctx="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
- http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context.xsd">
-
- <!-- Configuration Admin entries so the user can overwrite them if needed -->
- <osgix:cm-properties id="cmProps" persistent-id="org.apache.james.activemq">
- <prop key="brokerURL">vm://james?create=false</prop>
- <prop key="sessionCacheSize">10</prop>
- <prop key="baseDir">/var/store/activemq/</prop>
- <prop key="useBlobMessages">true</prop>
- </osgix:cm-properties>
-
- <!-- placeholder configurer -->
- <ctx:property-placeholder properties-ref="cmProps" />
-
- <!--
- ===========================================================================
- ActiveMQ Queue and Camel
- ===========================================================================
- -->
-
- <!--
- James Mail Queue Factory
- -->
- <bean id="mailqueuefactory" class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory" depends-on="broker">
- <property name="useBlobMessages" value="${useBlobMessages}"/>
- </bean>
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://activemq.apache.org/schema/core
+ http://activemq.apache.org/schema/core/activemq-core.xsd">
+
+ <!-- James Mail Queue Factory -->
+ <bean id="mailqueuefactory" class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory" depends-on="broker"/>
<!--
ActiveMQ Broker, Connections, Blob
-->
- <amq:broker useJmx="true" persistent="true" brokerName="james" dataDirectory="${baseDir}/brokers" useShutdownHook="false" schedulerSupport="false" id="broker">
+ <amq:broker useJmx="true" persistent="true" brokerName="james"
+ dataDirectory="filesystem=file://var/store/activemq/brokers"
+ useShutdownHook="false" schedulerSupport="false" id="broker">
<amq:destinationPolicy>
<amq:policyMap>
<amq:policyEntries>
@@ -73,10 +51,11 @@
<amq:statisticsBrokerPlugin/>
</amq:plugins>
<amq:transportConnectors>
- <amq:transportConnector uri="tcp://localhost:0" />
+ <amq:transportConnector uri="tcp://localhost:0"/>
</amq:transportConnectors>
</amq:broker>
- <amq:connectionFactory id="amqConnectionFactory" brokerURL="${brokerURL}">
+
+ <amq:connectionFactory id="amqConnectionFactory" brokerURL="vm://james?create=false">
<amq:prefetchPolicy>
<!-- Disable prefetch so slow consuming can not block other threads -->
<!-- See JAMES-1253 -->
@@ -84,15 +63,19 @@
</amq:prefetchPolicy>
<property name="blobTransferPolicy" ref="blobTransferPolicy"/>
</amq:connectionFactory>
- <bean id="blobTransferPolicy" class="org.apache.james.queue.activemq.FileSystemBlobTransferPolicy">
- <property name="defaultUploadUrl" value="${baseDir}/blob-transfer"/>
+
+ <bean id="blobTransferPolicy" class="org.apache.james.queue.activemq.FileSystemBlobTransferPolicy"
+ autowire="byName">
+ <property name="defaultUploadUrl" value="file://var/store/activemq/blob-transfer"/>
</bean>
+
<bean id="jmsConnectionFactory" class="org.springframework.jms.connection.CachingConnectionFactory">
- <property name="targetConnectionFactory" ref="amqConnectionFactory"/>
- <property name="sessionCacheSize" value="${sessionCacheSize}"/>
- <property name="cacheConsumers" value="false"/>
- <property name="cacheProducers" value="true"/>
+ <property name="targetConnectionFactory" ref="amqConnectionFactory"/>
+ <property name="sessionCacheSize" value="10"/>
+ <property name="cacheConsumers" value="false"/>
+ <property name="cacheProducers" value="true"/>
</bean>
+
<bean id="jmsTransactionManager" class="org.springframework.jms.connection.JmsTransactionManager">
<property name="connectionFactory" ref="jmsConnectionFactory"/>
</bean>
Modified: james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml (original)
+++ james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml Sat Feb 9 19:05:14 2013
@@ -17,20 +17,32 @@
specific language governing permissions and limitations
under the License.
-->
-<beans:beans
- xmlns="http://www.springframework.org/schema/osgi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:beans="http://www.springframework.org/schema/beans"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/osgi
+<beans:beans
+ xmlns="http://www.springframework.org/schema/osgi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xsi:schemaLocation="http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+ <!-- Configuration Admin entries so the user can overwrite them if needed -->
+ <!--<osgix:cm-properties id="cmProps" persistent-id="org.apache.james.activemq">-->
+ <!--<prop key="brokerURL">vm://james?create=false</prop>-->
+ <!--<prop key="sessionCacheSize">10</prop>-->
+ <!--<prop key="baseDir">/var/store/activemq/</prop>-->
+ <!--<prop key="useBlobMessages">true</prop>-->
+ <!--</osgix:cm-properties>-->
+
+ <!-- placeholder configurer -->
+ <!--<ctx:property-placeholder properties-ref="cmProps"/>-->
+
<osgi:service ref="mailqueuefactory">
- <osgi:interfaces>
- <beans:value> org.apache.james.queue.api.MailQueueFactory</beans:value>
- </osgi:interfaces>
- </osgi:service>
-
+ <osgi:interfaces>
+ <beans:value>org.apache.james.queue.api.MailQueueFactory</beans:value>
+ </osgi:interfaces>
+ </osgi:service>
+
</beans:beans>
Added: james/server/trunk/queue/queue-file/src/main/resources/META-INF/spring/file-queue-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-file/src/main/resources/META-INF/spring/file-queue-context.xml?rev=1444410&view=auto
==============================================================================
--- james/server/trunk/queue/queue-file/src/main/resources/META-INF/spring/file-queue-context.xml (added)
+++ james/server/trunk/queue/queue-file/src/main/resources/META-INF/spring/file-queue-context.xml Sat Feb 9 19:05:14 2013
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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="mailqueuefactory" class="org.apache.james.queue.file.FileMailQueueFactory"/>
+
+</beans>
\ No newline at end of file
Copied: james/server/trunk/queue/queue-file/src/main/resources/META-INF/spring/file-queue-osgi.xml (from r1444081, james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-file/src/main/resources/META-INF/spring/file-queue-osgi.xml?p2=james/server/trunk/queue/queue-file/src/main/resources/META-INF/spring/file-queue-osgi.xml&p1=james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml&r1=1444081&r2=1444410&rev=1444410&view=diff
==============================================================================
--- james/server/trunk/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-osgi.xml (original)
+++ james/server/trunk/queue/queue-file/src/main/resources/META-INF/spring/file-queue-osgi.xml Sat Feb 9 19:05:14 2013
@@ -1,36 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans:beans
- xmlns="http://www.springframework.org/schema/osgi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:beans="http://www.springframework.org/schema/beans"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
- <osgi:service ref="mailqueuefactory">
- <osgi:interfaces>
- <beans:value> org.apache.james.queue.api.MailQueueFactory</beans:value>
- </osgi:interfaces>
- </osgi:service>
-
-</beans:beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xsi:schemaLocation="http://www.springframework.org/schema/osgi
+ http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+ <osgi:service ref="mailqueuefactory">
+ <osgi:interfaces>
+ <beans:value>org.apache.james.queue.api.MailQueueFactory</beans:value>
+ </osgi:interfaces>
+ </osgi:service>
+
+</beans:beans>
\ No newline at end of file
Modified: james/server/trunk/spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java (original)
+++ james/server/trunk/spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java Sat Feb 9 19:05:14 2013
@@ -37,23 +37,17 @@ public class FileSystemImpl implements F
private JamesResourceLoader resourceLoader = null;
- /**
- * @see org.apache.james.filesystem.api.FileSystem#getBasedir()
- */
+ @Override
public File getBasedir() throws FileNotFoundException {
return new File(resourceLoader.getRootDirectory());
}
- /**
- * @see org.apache.james.filesystem.api.FileSystem#getResource(String)
- */
+ @Override
public InputStream getResource(String url) throws IOException {
return resourceLoader.getResource(url).getInputStream();
}
- /**
- * @see org.apache.james.filesystem.api.FileSystem#getFile(String)
- */
+ @Override
public File getFile(String fileURL) throws FileNotFoundException {
try {
return resourceLoader.getResource(fileURL).getFile();
@@ -62,11 +56,7 @@ public class FileSystemImpl implements F
}
}
- /**
- * @see
- * org.springframework.context.ApplicationContextAware#setApplicationContext
- * (org.springframework.context.ApplicationContext)
- */
+ @Override
public void setApplicationContext(ApplicationContext context) throws BeansException {
this.resourceLoader = (JamesResourceLoader) context;
}
Modified: james/server/trunk/spring/src/main/java/org/apache/james/container/spring/filesystem/ResourceLoaderFileSystem.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spring/src/main/java/org/apache/james/container/spring/filesystem/ResourceLoaderFileSystem.java?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/spring/src/main/java/org/apache/james/container/spring/filesystem/ResourceLoaderFileSystem.java (original)
+++ james/server/trunk/spring/src/main/java/org/apache/james/container/spring/filesystem/ResourceLoaderFileSystem.java Sat Feb 9 19:05:14 2013
@@ -50,7 +50,7 @@ public class ResourceLoaderFileSystem im
try {
return loader.getResource(".").getFile();
} catch (IOException e) {
- throw new FileNotFoundException("Could not access basedirectory");
+ throw new FileNotFoundException("Could not access base directory");
}
}
Modified: james/server/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml (original)
+++ james/server/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml Sat Feb 9 19:05:14 2013
@@ -21,11 +21,9 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
- xmlns:amq="http://activemq.apache.org/schema/core"
xsi:schemaLocation="
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">
+ http://camel.apache.org/schema/spring classpath:camel-spring.xsd">
<!--
===========================================================================
@@ -33,92 +31,15 @@
===========================================================================
-->
- <!--
- Enable Java Annotations processing.
- -->
+ <!-- Enable Java Annotations processing. -->
<bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor">
- <property name="order" value="3" />
+ <property name="order" value="3"/>
</bean>
- <!--
- Enable support for Persistence Annotations processing.
- -->
+ <!-- Enable support for Persistence Annotations processing. -->
<bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor"/>
- <!--
- Spring "Bean-Post-Processor" for LogEnabled interface.
- -->
- <bean class="org.apache.james.container.spring.lifecycle.LogEnabledBeanPostProcessor">
- <property name="logProvider" ref="logprovider" />
- <property name="order" value="0" />
- </bean>
- <bean id="logprovider" class="org.apache.james.container.spring.lifecycle.LogProviderImpl">
- </bean>
-
- <!--
- Configuration "Bean-Factory-Post-Processor"
- responsible to register beans from James specific configuration files
- -->
- <bean class="org.apache.james.container.spring.bean.factorypostprocessor.ConfigurationBeanFactoryPostProcessor">
- <property name="beans">
- <map>
- <!-- User Repository-->
- <entry>
- <key>
- <value>usersrepository</value>
- </key>
- <!-- no alias needed -->
- <value></value>
- </entry>
- <!-- Recipient Rewrite Table-->
- <entry>
- <key>
- <value>recipientrewritetable</value>
- </key>
- <!-- no alias needed -->
- <value></value>
- </entry>
- <!-- Domain List -->
- <entry>
- <key>
- <value>domainlist</value>
- </key>
- <!-- no alias needed -->
- <value></value>
- </entry>
-<!--
- <entry>
- <key>
- <value>usersrepository23</value>
- </key>
- <value></value>
- </entry>
--->
- </map>
- </property>
- </bean>
-
- <!--
- Spring "Bean-Post-Processor" for Configurable interface.
- -->
- <bean class="org.apache.james.container.spring.lifecycle.ConfigurableBeanPostProcessor">
- <property name="configurationProvider" ref="configurationprovider" />
- <property name="order" value="1" />
- </bean>
- <bean id="configurationprovider" class="org.apache.james.container.spring.lifecycle.ConfigurationProviderImpl">
- <property name="configurationMappings">
- <map>
- <entry key="mailprocessor" value="mailetcontainer.processors"/>
- <entry key="mailspooler" value="mailetcontainer.spooler"/>
- <entry key="mailetcontext" value="mailetcontainer.context"/>
- </map>
- </property>
- </bean>
-
- <!--
- Mail Repository Store "Bean-Factory"
- -->
- <bean id="mailrepositorystore" class="org.apache.james.container.spring.bean.factory.mailrepositorystore.MailRepositoryStoreBeanFactory" />
+ <import resource="classpath:META-INF/spring/loaders-context.xml"/>
<!--
===========================================================================
@@ -128,167 +49,48 @@
<!--
Alternative queue is FileMailQueueFactory - Can be used instead of the default one.
- <bean id="mailqueuefactory" class="org.apache.james.queue.file.FileMailQueueFactory" />
+ <import resource="classpath:META-INF/spring/file-queue-context.xml"/>
-->
- <!--
- Default Mail Queue Factory is the ActiveMQMailQueueFactory
- -->
- <bean id="mailqueuefactory" class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory" depends-on="broker" />
+ <!-- Default Mail Queue Factory is the ActiveMQMailQueueFactory -->
+ <import resource="classpath:META-INF/spring/activemq-queue-context.xml"/>
- <!--
- ActiveMQ: Broker, Connections, BlobTransferPolicy...
- -->
- <amq:broker useJmx="true" persistent="true" brokerName="james" dataDirectory="filesystem=file://var/store/activemq/brokers" useShutdownHook="false" schedulerSupport="false" id="broker">
- <amq:destinationPolicy>
- <amq:policyMap>
- <amq:policyEntries>
- <!-- Support priority handling of messages -->
- <!-- http://activemq.apache.org/how-can-i-support-priority-queues.html -->
- <amq:policyEntry queue=">" prioritizedMessages="true"/>
- </amq:policyEntries>
- </amq:policyMap>
- </amq:destinationPolicy>
- <amq:managementContext>
- <amq:managementContext createConnector="false"/>
- </amq:managementContext>
- <amq:persistenceAdapter>
- <amq:amqPersistenceAdapter/>
- </amq:persistenceAdapter>
- <amq:plugins>
- <amq:statisticsBrokerPlugin/>
- </amq:plugins>
- <amq:transportConnectors>
- <amq:transportConnector uri="tcp://localhost:0" />
- </amq:transportConnectors>
- </amq:broker>
- <amq:connectionFactory id="amqConnectionFactory" brokerURL="vm://james?create=false">
- <amq:prefetchPolicy>
- <!-- Disable prefetch so slow consuming can not block other threads -->
- <!-- See JAMES-1253 -->
- <amq:prefetchPolicy queuePrefetch="0" topicPrefetch="0"/>
- </amq:prefetchPolicy>
- <property name="blobTransferPolicy" ref="blobTransferPolicy"/>
- </amq:connectionFactory>
- <bean id="blobTransferPolicy" class="org.apache.james.queue.activemq.FileSystemBlobTransferPolicy" autowire="byName">
- <property name="defaultUploadUrl" value="file://var/store/activemq/blob-transfer"/>
- </bean>
- <bean id="jmsConnectionFactory" class="org.springframework.jms.connection.CachingConnectionFactory">
- <property name="targetConnectionFactory" ref="amqConnectionFactory"/>
- <property name="sessionCacheSize" value="10"/>
- <property name="cacheConsumers" value="false"/>
- <property name="cacheProducers" value="true"/>
- </bean>
- <bean id="jmsTransactionManager" class="org.springframework.jms.connection.JmsTransactionManager">
- <property name="connectionFactory" ref="jmsConnectionFactory"/>
- </bean>
-
- <!--
- ===========================================================================
- Mailet Container
- ===========================================================================
- -->
-
- <!--
- Mailet Container Beans.
- -->
- <bean id="mailprocessor" name="processorRoute" class="org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor" autowire="byType" />
-
- <!--
- !!! mailetcontext bean must be defined after mailProcessor
- otherwise LogEnabled injection via LogEnabledBeanPostProcessor will not occur before
- it is used - Seems like a Spring bug...
- -->
- <bean id="mailetcontext" class="org.apache.james.mailetcontainer.impl.JamesMailetContext" autowire="byType" />
- <bean id="mailspooler" class="org.apache.james.mailetcontainer.impl.JamesMailSpooler" autowire="byType" />
+ <!-- Mailet Container -->
+ <import resource="classpath:META-INF/spring/mailetcontainer-context.xml"/>
- <!--
- Mailet and Matcher "Bean-Factory".
- -->
- <bean id="mailetloader" class="org.apache.james.container.spring.bean.factory.mailetcontainer.MailetLoaderBeanFactory" autowire="byType" />
- <bean id="matcherloader" class="org.apache.james.container.spring.bean.factory.mailetcontainer.MatcherLoaderBeanFactory" autowire="byType" />
-
- <!--
- Camel Context
- -->
- <camel:camelContext id="jamesCamelContext" trace="false" >
+ <!-- Camel Context -->
+ <camel:camelContext id="jamesCamelContext" trace="false">
<camel:jmxAgent id="agent" disabled="false" createConnector="false" serviceUrlPath="/jmxrmi/jamescamel"/>
</camel:camelContext>
- <!--
- ===========================================================================
- File System
- ===========================================================================
- -->
+ <!-- DNS Service -->
+ <import resource="classpath:META-INF/spring/dns-context.xml"/>
- <bean class="org.apache.james.container.spring.bean.factorypostprocessor.FileSystemBeanFactoryPostProcessor">
- <property name="fileSystem" ref="filesystem" />
- </bean>
- <bean id="filesystem" class="org.apache.james.container.spring.filesystem.FileSystemImpl" autowire="byName" />
+ <!-- FetchMail -->
+ <import resource="classpath:META-INF/spring/fetchmail-context.xml"/>
- <!--
- ===========================================================================
- DNS Service
- ===========================================================================
- -->
-
- <bean id="dnsservice" class="org.apache.james.dnsservice.dnsjava.DNSJavaService" autowire="byName" />
-
- <!--
- ===========================================================================
- FetchMail
- ===========================================================================
- -->
-
- <bean id="fetchmail" class="org.apache.james.fetchmail.FetchScheduler" autowire="byName" />
-
-
- <!--
+ <!--
===========================================================================
Mail Protocol Servers
===========================================================================
-->
- <bean id="protocolhandlerloader" class="org.apache.james.container.spring.bean.factory.protocols.ProtocolHandlerLoaderBeanFactory" />
-
- <!--
- SMTP Server
- -->
- <bean id="smtpserver" class="org.apache.james.smtpserver.netty.SMTPServerFactory">
- <property name="protocolHandlerLoader" ref="protocolhandlerloader"/>
- <property name="fileSystem" ref="filesystem"/>
- <property name="dnsService" ref="dnsservice"/>
- </bean>
- <!--
- LMTP Server
- -->
- <bean id="lmtpserver" class="org.apache.james.lmtpserver.netty.LMTPServerFactory">
- <property name="protocolHandlerLoader" ref="protocolhandlerloader"/>
- <property name="fileSystem" ref="filesystem"/>
- </bean>
+ <!-- SMTP Server -->
+ <import resource="classpath:META-INF/spring/smtpserver-context.xml"/>
- <!--
- POP3 Server
- -->
- <bean id="pop3server" class="org.apache.james.pop3server.netty.POP3ServerFactory">
- <property name="protocolHandlerLoader" ref="protocolhandlerloader"/>
- <property name="fileSystem" ref="filesystem"/>
- </bean>
+ <!-- LMTP Server -->
+ <import resource="classpath:META-INF/spring/lmtpserver-context.xml"/>
- <!--
- IMAP4 Server
- -->
+ <!-- POP3 Server -->
+ <import resource="classpath:META-INF/spring/pop3server-context.xml"/>
- <bean id="imapserver" class="org.apache.james.imapserver.netty.IMAPServerFactory">
- <property name="imapProcessor" ref="imapProcessor"/>
- <property name="imapEncoder" ref="imapEncoder"/>
- <property name="imapDecoder" ref="imapDecoder"/>
- <property name="fileSystem" ref="filesystem"/>
- </bean>
+ <!-- IMAP4 Server -->
+ <import resource="classpath:META-INF/spring/imapserver-context.xml"/>
<!-- The imapProcessor configuration will be reviewed when IMAP will be integrated into Protocols project -->
<!-- Temporary configuration - see IMAP-357 -->
- <bean id="imapProcessor" class="org.apache.james.imap.processor.main.DefaultImapProcessorFactory" factory-method="createXListSupportingProcessor">
+ <bean id="imapProcessor" class="org.apache.james.imap.processor.main.DefaultImapProcessorFactory"
+ factory-method="createXListSupportingProcessor">
<constructor-arg index="0" ref="mailboxmanager"/>
<constructor-arg index="1" ref="subscriptionManager"/>
<!-- The mailboxTyper -->
@@ -297,44 +99,39 @@
<constructor-arg index="3" value="120"/>
<!-- The list of disabled capabilities -->
<constructor-arg index="4">
- <set>
- <value>ACL</value>
- <value>MOVE</value>
- </set>
- </constructor-arg>
+ <set>
+ <value>ACL</value>
+ <value>MOVE</value>
+ </set>
+ </constructor-arg>
</bean>
-
+
<bean id="imapDecoderFactory" class="org.apache.james.imap.main.DefaultImapDecoderFactory"/>
<bean id="imapDecoder" factory-bean="imapDecoderFactory" factory-method="buildImapDecoder"/>
<bean id="imapEncoderFactory" class="org.apache.james.imap.encode.main.DefaultImapEncoderFactory"/>
- <bean id="imapEncoder" factory-bean="imapEncoderFactory" factory-method="buildImapEncoder"/>
+ <bean id="imapEncoder" factory-bean="imapEncoderFactory" factory-method="buildImapEncoder"/>
- <!--
+ <!--
===========================================================================
Mailbox
===========================================================================
-->
- <!--
- Mailbox Managers
- -->
+ <!-- Mailbox Managers -->
<bean class="org.apache.james.container.spring.bean.factorypostprocessor.MailboxConfigurationBeanFactoryPostProcessor"/>
<bean id="locker" class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
- <import resource="classpath:META-INF/org/apache/james/spring-mailbox.xml" />
- <!--
- Mailbox Copier
- -->
+ <import resource="classpath:META-INF/org/apache/james/spring-mailbox.xml"/>
+
+ <!-- Mailbox Copier -->
<bean id="mailboxcopier" class="org.apache.james.mailbox.copier.MailboxCopierImpl"/>
- <!--
- Mailbox Importer
- -->
-<!--
- <bean id="james23importer" class="org.apache.james.container.spring.tool.James23Importer"/>
- -->
+ <!-- Mailbox Importer -->
+ <!--
+ <bean id="james23importer" class="org.apache.james.container.spring.tool.James23Importer"/>
+ -->
<!--
===========================================================================
Database DataSource
@@ -343,13 +140,14 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders" value="true"/>
- <property name ="location" value="classpath:james-database.properties"/>
+ <property name="location" value="classpath:james-database.properties"/>
</bean>
+
<bean id="datasource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName" value="${database.driverClassName}" />
- <property name="url" value="${database.url}" />
- <property name="username" value="${database.username}" />
- <property name="password" value="${database.password}" />
+ <property name="driverClassName" value="${database.driverClassName}"/>
+ <property name="url" value="${database.url}"/>
+ <property name="username" value="${database.username}"/>
+ <property name="password" value="${database.password}"/>
<!--The value for maxActive should always be larger than the number of spooler threads. The-->
<!--reason is that a spooler thread normally requires 1 connection to process a mail, however-->
<!--sometimes OpenJPA requires 1 connection to finish the processing on top of that. If-->
@@ -384,68 +182,75 @@
===========================================================================
-->
- <!--
- JMX Server
- -->
+ <!-- JMX Server -->
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders" value="true"/>
<property name="location" value="classpath:jmx.properties"/>
</bean>
- <bean id="mbeanserver" class="org.springframework.jmx.support.MBeanServerFactoryBean" >
+
+ <bean id="mbeanserver" class="org.springframework.jmx.support.MBeanServerFactoryBean">
<property name="locateExistingServerIfPossible" value="true"/>
<property name="registerWithFactory" value="true"/>
</bean>
+
<bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry">
- <property name="objectName" value="connector:name=rmi" />
- <property name="serviceUrl" value="service:jmx:rmi://${jmx.address}/jndi/rmi://${jmx.address}:${jmx.port}/jmxrmi" />
+ <property name="objectName" value="connector:name=rmi"/>
+ <property name="serviceUrl"
+ value="service:jmx:rmi://${jmx.address}/jndi/rmi://${jmx.address}:${jmx.port}/jmxrmi"/>
</bean>
+
<bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean">
- <property name="port" value="${jmx.port}" />
+ <property name="port" value="${jmx.port}"/>
<property name="serverSocketFactory" ref="restrictedRmiSocketFactory"/>
<property name="clientSocketFactory" ref="restrictedRmiSocketFactory"/>
</bean>
+
<bean id="restrictedRmiSocketFactory" class="org.apache.james.util.RestrictingRMISocketFactory">
<constructor-arg value="${jmx.address}"/>
</bean>
- <!--
- JMX Export
- -->
+ <!-- JMX Export -->
<bean id="exporter" class="org.springframework.jmx.export.MBeanExporter" lazy-init="false">
- <property name="beans">
- <map>
- <entry key="org.apache.james:type=component,name=domainlist" value-ref="domainlistmanagement"/>
- <entry key="org.apache.james:type=component,name=dnsservice" value-ref="dnsservice"/>
- <entry key="org.apache.james:type=component,name=recipientrewritetable" value-ref="recipientrewritetablemanagement"/>
- <entry key="org.apache.james:type=component,name=usersrepository" value-ref="usersrepositorymanagement"/>
- <entry key="org.apache.james:type=component,name=fetchmail" value-ref="fetchmail"/>
- <entry key="org.apache.james:type=component,name=mailboxmanagement" value-ref="mailboxmanagermanagement"/>
- <entry key="org.apache.james:type=component,component=mailetcontainer,name=mailspooler" value-ref="mailspooler"/>
- <entry key="org.apache.james:type=component,name=mailboxcopier" value-ref="mailboxcopiermanagement"/>
-<!--
- <entry key="org.apache.james:type=component,name=james23importer" value-ref="james23importermanagement"/>
--->
- <entry key="org.apache.james:type=container,name=logprovider" value-ref="logprovider"/>
- </map>
- </property>
- <property name="assembler">
- <bean class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
- <property name="managedInterfaces" value="org.apache.james.fetchmail.FetchSchedulerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.rrt.api.RecipientRewriteTableManagementMBean,org.apache.james.user.api.UsersRepositoryManagementMBean,org.apache.james.adapter.mailbox.MailboxManagerManagementMBean,org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean,org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean,org.apache.james.container.spring.lifecycle.LogProviderManagementMBean"/>
- </bean>
- </property>
- </bean>
- <bean id="usersrepositorymanagement" class="org.apache.james.user.lib.UsersRepositoryManagement" />
- <bean id="recipientrewritetablemanagement" class="org.apache.james.rrt.lib.RecipientRewriteTableManagement" />
- <bean id="domainlistmanagement" class="org.apache.james.domainlist.lib.DomainListManagement" />
- <bean id="mailboxmanagermanagement" class="org.apache.james.adapter.mailbox.MailboxManagerManagement" />
- <bean id="mailboxcopiermanagement" class="org.apache.james.container.spring.mailbox.MailboxCopierManagement" />
-<!--
- <bean id="james23importermanagement" class="org.apache.james.container.spring.tool.James23ImporterManagement" />
--->
-
-<!-- uncomment the folowing line to enable JETM monitoring -->
-<!--
- <import resource="classpath:jetm-monitoring.conf" />
--->
+ <property name="beans">
+ <map>
+ <entry key="org.apache.james:type=component,name=domainlist" value-ref="domainlistmanagement"/>
+ <entry key="org.apache.james:type=component,name=dnsservice" value-ref="dnsservice"/>
+ <entry key="org.apache.james:type=component,name=recipientrewritetable"
+ value-ref="recipientrewritetablemanagement"/>
+ <entry key="org.apache.james:type=component,name=usersrepository"
+ value-ref="usersrepositorymanagement"/>
+ <entry key="org.apache.james:type=component,name=fetchmail" value-ref="fetchmail"/>
+ <entry key="org.apache.james:type=component,name=mailboxmanagement"
+ value-ref="mailboxmanagermanagement"/>
+ <entry key="org.apache.james:type=component,component=mailetcontainer,name=mailspooler"
+ value-ref="mailspooler"/>
+ <entry key="org.apache.james:type=component,name=mailboxcopier" value-ref="mailboxcopiermanagement"/>
+ <!--
+ <entry key="org.apache.james:type=component,name=james23importer" value-ref="james23importermanagement"/>
+ -->
+ <entry key="org.apache.james:type=container,name=logprovider" value-ref="logprovider"/>
+ </map>
+ </property>
+ <property name="assembler">
+ <bean class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
+ <property name="managedInterfaces"
+ value="org.apache.james.fetchmail.FetchSchedulerMBean,org.apache.james.domainlist.api.DomainListManagementMBean,org.apache.james.dnsservice.api.DNSServiceMBean,org.apache.james.rrt.api.RecipientRewriteTableManagementMBean,org.apache.james.user.api.UsersRepositoryManagementMBean,org.apache.james.adapter.mailbox.MailboxManagerManagementMBean,org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean,org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean,org.apache.james.container.spring.lifecycle.LogProviderManagementMBean"/>
+ </bean>
+ </property>
+ </bean>
+
+ <bean id="usersrepositorymanagement" class="org.apache.james.user.lib.UsersRepositoryManagement"/>
+ <bean id="recipientrewritetablemanagement" class="org.apache.james.rrt.lib.RecipientRewriteTableManagement"/>
+ <bean id="domainlistmanagement" class="org.apache.james.domainlist.lib.DomainListManagement"/>
+ <bean id="mailboxmanagermanagement" class="org.apache.james.adapter.mailbox.MailboxManagerManagement"/>
+ <bean id="mailboxcopiermanagement" class="org.apache.james.container.spring.mailbox.MailboxCopierManagement"/>
+ <!--
+ <bean id="james23importermanagement" class="org.apache.james.container.spring.tool.James23ImporterManagement" />
+ -->
+
+ <!-- uncomment the folowing line to enable JETM monitoring -->
+ <!--
+ <import resource="classpath:jetm-monitoring.conf" />
+ -->
</beans>
Modified: james/server/trunk/spring/src/main/resources/META-INF/spring/loaders-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring/src/main/resources/META-INF/spring/loaders-context.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/spring/src/main/resources/META-INF/spring/loaders-context.xml (original)
+++ james/server/trunk/spring/src/main/resources/META-INF/spring/loaders-context.xml Sat Feb 9 19:05:14 2013
@@ -18,36 +18,109 @@
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
- <bean id="configurationprovider" class="org.apache.james.container.spring.lifecycle.osgi.OSGIConfigurationProvider"/>
+ <!--
+ Spring "Bean-Post-Processor" for LogEnabled interface.
+ -->
+ <bean class="org.apache.james.container.spring.lifecycle.LogEnabledBeanPostProcessor">
+ <property name="logProvider" ref="logprovider"/>
+ <property name="order" value="0"/>
+ </bean>
+ <bean id="logprovider" class="org.apache.james.container.spring.lifecycle.LogProviderImpl">
+ </bean>
- <!-- Register the service trackers -->
- <bean id="usersrepositoryTracker" class="org.apache.james.container.spring.osgi.UsersRepositoryTracker"/>
- <bean id="domainlistTracker" class="org.apache.james.container.spring.osgi.DomainListTracker"/>
- <bean id="recipientrewritetableTracker" class="org.apache.james.container.spring.osgi.RecipientRewriteTableTracker"/>
-
+ <!--
+ Configuration "Bean-Factory-Post-Processor"
+ responsible to register beans from James specific configuration files
+ -->
+ <bean class="org.apache.james.container.spring.bean.factorypostprocessor.ConfigurationBeanFactoryPostProcessor">
+ <property name="beans">
+ <map>
+ <!-- User Repository-->
+ <entry>
+ <key>
+ <value>usersrepository</value>
+ </key>
+ <!-- no alias needed -->
+ <value></value>
+ </entry>
+ <!-- Recipient Rewrite Table-->
+ <entry>
+ <key>
+ <value>recipientrewritetable</value>
+ </key>
+ <!-- no alias needed -->
+ <value></value>
+ </entry>
+ <!-- Domain List -->
+ <entry>
+ <key>
+ <value>domainlist</value>
+ </key>
+ <!-- no alias needed -->
+ <value></value>
+ </entry>
+ <!--
+ <entry>
+ <key>
+ <value>usersrepository23</value>
+ </key>
+ <value></value>
+ </entry>
+ -->
+ </map>
+ </property>
+ </bean>
+
+ <!-- Spring "Bean-Post-Processor" for Configurable interface. -->
+ <bean class="org.apache.james.container.spring.lifecycle.ConfigurableBeanPostProcessor">
+ <property name="configurationProvider" ref="configurationprovider"/>
+ <property name="order" value="1"/>
+ </bean>
+ <bean id="configurationprovider" class="org.apache.james.container.spring.lifecycle.ConfigurationProviderImpl">
+ <property name="configurationMappings">
+ <map>
+ <entry key="mailprocessor" value="mailetcontainer.processors"/>
+ <entry key="mailspooler" value="mailetcontainer.spooler"/>
+ <entry key="mailetcontext" value="mailetcontainer.context"/>
+ </map>
+ </property>
+ </bean>
+
+ <!-- Mail Repository Store "Bean-Factory" -->
+ <bean id="mailrepositorystore"
+ class="org.apache.james.container.spring.bean.factory.mailrepositorystore.MailRepositoryStoreBeanFactory"/>
+
+ <!-- Mailet and Matcher "Bean-Factory". -->
+
+ <bean id="mailetloader"
+ class="org.apache.james.container.spring.bean.factory.mailetcontainer.MailetLoaderBeanFactory"/>
+ <bean id="matcherloader"
+ class="org.apache.james.container.spring.bean.factory.mailetcontainer.MatcherLoaderBeanFactory"/>
- <!--
- Mailet and Matcher "Bean-Factory".
- -->
- <bean id="mailetloader" class="org.apache.james.container.spring.bean.factory.mailetcontainer.MailetLoaderBeanFactory" />
- <bean id="matcherloader" class="org.apache.james.container.spring.bean.factory.mailetcontainer.MatcherLoaderBeanFactory" />
-
<!--
===========================================================================
Mail Protocol Servers
===========================================================================
-->
- <bean id="protocolhandlerloader" class="org.apache.james.container.spring.bean.factory.protocols.ProtocolHandlerLoaderBeanFactory" />
-
-
- <!--
-
- -->
- <bean id="filesystem" class="org.apache.james.container.spring.filesystem.ResourceLoaderFileSystem" />
+ <bean id="protocolhandlerloader"
+ class="org.apache.james.container.spring.bean.factory.protocols.ProtocolHandlerLoaderBeanFactory"/>
+
+
+ <!--
+ ===========================================================================
+ File System
+ ===========================================================================
+ -->
+
+ <bean class="org.apache.james.container.spring.bean.factorypostprocessor.FileSystemBeanFactoryPostProcessor">
+ <property name="fileSystem" ref="filesystem"/>
+ </bean>
+
+ <!--<bean id="filesystem" class="org.apache.james.container.spring.filesystem.FileSystemImpl" autowire="byName"/>-->
+ <bean id="filesystem" class="org.apache.james.container.spring.filesystem.ResourceLoaderFileSystem"/>
</beans>
Modified: james/server/trunk/spring/src/main/resources/META-INF/spring/loaders-osgi.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring/src/main/resources/META-INF/spring/loaders-osgi.xml?rev=1444410&r1=1444409&r2=1444410&view=diff
==============================================================================
--- james/server/trunk/spring/src/main/resources/META-INF/spring/loaders-osgi.xml (original)
+++ james/server/trunk/spring/src/main/resources/META-INF/spring/loaders-osgi.xml Sat Feb 9 19:05:14 2013
@@ -17,35 +17,45 @@
specific language governing permissions and limitations
under the License.
-->
-<beans:beans
- xmlns="http://www.springframework.org/schema/osgi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:beans="http://www.springframework.org/schema/beans"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/osgi
+<beans:beans
+ xmlns="http://www.springframework.org/schema/osgi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xsi:schemaLocation="http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+
+ <beans:bean id="configurationprovider"
+ class="org.apache.james.container.spring.lifecycle.osgi.OSGIConfigurationProvider"/>
+
+ <!-- Register the service trackers -->
+ <beans:bean id="usersrepositoryTracker" class="org.apache.james.container.spring.osgi.UsersRepositoryTracker"/>
+ <beans:bean id="domainlistTracker" class="org.apache.james.container.spring.osgi.DomainListTracker"/>
+ <beans:bean id="recipientrewritetableTracker"
+ class="org.apache.james.container.spring.osgi.RecipientRewriteTableTracker"/>
<osgi:service ref="matcherloader">
- <osgi:interfaces>
- <beans:value>org.apache.james.mailetcontainer.api.MatcherLoader</beans:value>
- </osgi:interfaces>
- </osgi:service>
+ <osgi:interfaces>
+ <beans:value>org.apache.james.mailetcontainer.api.MatcherLoader</beans:value>
+ </osgi:interfaces>
+ </osgi:service>
<osgi:service ref="mailetloader">
- <osgi:interfaces>
- <beans:value>org.apache.james.mailetcontainer.api.MailetLoader</beans:value>
- </osgi:interfaces>
+ <osgi:interfaces>
+ <beans:value>org.apache.james.mailetcontainer.api.MailetLoader</beans:value>
+ </osgi:interfaces>
</osgi:service>
-
+
<osgi:service ref="protocolhandlerloader">
- <osgi:interfaces>
- <beans:value>org.apache.james.protocols.api.ProtocolHandlerLoader</beans:value>
- </osgi:interfaces>
- </osgi:service>
+ <osgi:interfaces>
+ <beans:value>org.apache.james.protocols.api.ProtocolHandlerLoader</beans:value>
+ </osgi:interfaces>
+ </osgi:service>
<osgi:service ref="filesystem">
- <osgi:interfaces>
- <beans:value>org.apache.james.filesystem.api.FileSystem</beans:value>
- </osgi:interfaces>
- </osgi:service>
+ <osgi:interfaces>
+ <beans:value>org.apache.james.filesystem.api.FileSystem</beans:value>
+ </osgi:interfaces>
+ </osgi:service>
</beans:beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org