Author: eric
Date: Tue Jul 26 13:49:49 2011
New Revision: 1151097
URL: http://svn.apache.org/viewvc?rev=1151097&view=rev
Log:
Update mailbox-spring to 0.4-SNAPSHOT (MAILBOX-76)
Added:
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-util.xml
Modified:
james/mailbox/trunk/spring/pom.xml
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-jcr.xml
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-jpa.xml
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-maildir.xml
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-memory.xml
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox.xml
Modified: james/mailbox/trunk/spring/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/pom.xml?rev=1151097&r1=1151096&r2=1151097&view=diff
==============================================================================
--- james/mailbox/trunk/spring/pom.xml (original)
+++ james/mailbox/trunk/spring/pom.xml Tue Jul 26 13:49:49 2011
@@ -21,7 +21,7 @@
<parent>
<artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
- <version>0.3-SNAPSHOT</version>
+ <version>0.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-jcr.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-jcr.xml?rev=1151097&r1=1151096&r2=1151097&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-jcr.xml
(original)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-jcr.xml
Tue Jul 26 13:49:49 2011
@@ -30,13 +30,15 @@
<bean id="jcr-mailboxmanager"
class="org.apache.james.mailbox.jcr.JCRMailboxManager" init-method="init">
<constructor-arg index="0" ref="jcr-sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
- <constructor-arg index="2" ref="locker"/>
+ <constructor-arg index="2" ref="jcr-locker"/>
</bean>
<bean id ="jcr-subscriptionManager"
class="org.apache.james.mailbox.jcr.JCRSubscriptionManager">
<constructor-arg index="0" ref="jcr-sessionMapperFactory"/>
</bean>
<bean id="jcr-sessionMapperFactory"
class="org.apache.james.mailbox.jcr.JCRMailboxSessionMapperFactory">
<constructor-arg index="0" ref="jcr-sessionJcrRepository"/>
+ <constructor-arg index="1" ref="jpa-uidProvider"/>
+ <constructor-arg index="2" ref="jpa-modSeqProvider"/>
</bean>
<bean id ="jcr-sessionJcrRepository"
class="org.apache.james.mailbox.jcr.GlobalMailboxSessionJCRRepository"
depends-on="imapCndLoader">
<constructor-arg index="0" ref="jcrRepository"/>
@@ -44,6 +46,14 @@
<constructor-arg index="2" value="james"/>
<constructor-arg index="3" value="james"/>
</bean>
+ <bean id="jcr-uidProvider"
class="org.apache.james.mailbox.jcr.mail.JCRUidProvider">
+ <constructor-arg index="0" ref="jcr-locker"/>
+ <constructor-arg index="1" ref="jcr-sessionJcrRepository"/>
+ </bean>
+ <bean id="jcr-modSeqProvider"
class="org.apache.james.mailbox.jcr.mail.JCRModSeqProvider">
+ <constructor-arg index="0" ref="jcr-locker"/>
+ <constructor-arg index="1" ref="jcr-sessionJcrRepository"/>
+ </bean>
<bean id="jcrRepository" class="org.apache.jackrabbit.core.RepositoryImpl"
destroy-method="shutdown">
<constructor-arg index="0" ref="config" />
</bean>
@@ -64,5 +74,6 @@
<constructor-arg index="0"
value="classpath:META-INF/james/jcr-repository.xml" type="java.io.InputStream"/>
<constructor-arg index="1" value="var/store/jackrabbit" />
</bean>
+ <alias name="jvm-locker" alias="jcr-locker"/>
</beans>
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-jpa.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-jpa.xml?rev=1151097&r1=1151096&r2=1151097&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-jpa.xml
(original)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-jpa.xml
Tue Jul 26 13:49:49 2011
@@ -28,18 +28,30 @@
-->
<bean
class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor"/>
+
<bean id="jpa-mailboxmanager"
class="org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager"
init-method="init">
<constructor-arg index="0" ref="jpa-sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
- <constructor-arg index="2" ref="locker"/>
- <constructor-arg index="3" value="${openjpa.streaming}"/>
+ <constructor-arg index="2" ref="jpa-locker"/>
+ <constructor-arg index="3" value="false"/>
</bean>
<bean id ="jpa-subscriptionManager"
class="org.apache.james.mailbox.jpa.JPASubscriptionManager">
<constructor-arg index="0" ref="jpa-sessionMapperFactory"/>
</bean>
<bean id="jpa-sessionMapperFactory"
class="org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory">
<constructor-arg index="0" ref="entityManagerFactory"/>
+ <constructor-arg index="1" ref="jpa-uidProvider"/>
+ <constructor-arg index="2" ref="jpa-modSeqProvider"/>
+ </bean>
+ <bean id="jpa-uidProvider"
class="org.apache.james.mailbox.jpa.mail.JPAUidProvider">
+ <constructor-arg index="0" ref="jpa-locker"/>
+ <constructor-arg index="1" ref="entityManagerFactory"/>
+ </bean>
+ <bean id="jpa-modSeqProvider"
class="org.apache.james.mailbox.jpa.mail.JPAModSeqProvider">
+ <constructor-arg index="0" ref="jpa-locker"/>
+ <constructor-arg index="1" ref="entityManagerFactory"/>
</bean>
+ <alias name="jvm-locker" alias="jpa-locker"/>
<!--
Database DataSource
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-maildir.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-maildir.xml?rev=1151097&r1=1151096&r2=1151097&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-maildir.xml
(original)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-maildir.xml
Tue Jul 26 13:49:49 2011
@@ -28,12 +28,13 @@
WARNING: Maildir does only work on UNIX like operation systems
-->
- <bean id="maildir-mailboxmanager"
class="org.apache.james.mailbox.maildir.MaildirMailboxManager"
init-method="init">
+ <bean id="maildir-mailboxmanager"
class="org.apache.james.mailbox.store.StoreMailboxManager" init-method="init">
<constructor-arg index="0" ref="maildir-sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
+ <constructor-arg index="2" ref="maildir-locker"/>
<!-- <property name="messageSearchIndex" ref="lazyIndex"/> -->
</bean>
- <bean id ="maildir-subscriptionManager"
class="org.apache.james.mailbox.maildir.MaildirSubscriptionManager">
+ <bean id ="maildir-subscriptionManager"
class="org.apache.james.mailbox.store.StoreSubscriptionManager">
<constructor-arg index="0" ref="maildir-sessionMapperFactory"/>
</bean>
<bean id="maildir-sessionMapperFactory"
class="org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory">
@@ -42,5 +43,6 @@
<bean id="maildirStore"
class="org.apache.james.mailbox.maildir.MaildirStore">
<constructor-arg index="0" value="file://var/store/maildir/"/>
</bean>
+ <alias name="jvm-locker" alias="maildir-locker"/>
</beans>
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-memory.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-memory.xml?rev=1151097&r1=1151096&r2=1151097&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-memory.xml
(original)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-memory.xml
Tue Jul 26 13:49:49 2011
@@ -29,13 +29,16 @@
<!-- WARNING: Memory does not persist the mailbox. -->
<!-- Information will be lost after jvm restart. -->
- <bean id="memory-mailboxmanager"
class="org.apache.james.mailbox.inmemory.InMemoryMailboxManager"
init-method="init">
- <constructor-arg index="0" ref="memory-sessionMapperFactory"/>
+ <bean id="memory-mailboxmanager"
class="org.apache.james.mailbox.store.StoreMailboxManager" init-method="init">
+ <constructor-arg index="0" ref="maildir-sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
+ <constructor-arg index="2" ref="memory-locker"/>
+<!-- <property name="messageSearchIndex" ref="lazyIndex"/> -->
</bean>
- <bean id ="memory-subscriptionManager"
class="org.apache.james.mailbox.inmemory.InMemorySubscriptionManager">
+ <bean id ="memory-subscriptionManager"
class="org.apache.james.mailbox.store.StoreSubscriptionManager">
<constructor-arg index="0" ref="memory-sessionMapperFactory"/>
</bean>
<bean id="memory-sessionMapperFactory"
class="org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory" />
+ <alias name="jvm-locker" alias="memory-locker"/>
</beans>
Added:
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-util.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-util.xml?rev=1151097&view=auto
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-util.xml
(added)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox-util.xml
Tue Jul 26 13:49:49 2011
@@ -0,0 +1,33 @@
+<?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
classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+
+ <!--
+ Mailbox Util
+ -->
+
+ <bean id="jvm-locker"
class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
+ <bean id="authenticator"
class="org.apache.james.mailbox.spring.AnonymousAuthenticator"/>
+
+</beans>
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox.xml?rev=1151097&r1=1151096&r2=1151097&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox.xml
(original)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/james/spring-mailbox.xml
Tue Jul 26 13:49:49 2011
@@ -31,8 +31,7 @@
Mailbox Managers
-->
- <bean id="locker"
class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
- <bean id="authenticator"
class="org.apache.james.mailbox.spring.AnonymousAuthenticator"/>
+ <import resource="classpath:META-INF/james/spring-mailbox-util.xml" />
<import resource="classpath:META-INF/james/spring-mailbox-lucene.xml" />
<import resource="classpath:META-INF/james/spring-mailbox-jpa.xml" />
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
