Author: norman
Date: Fri Dec 3 11:42:15 2010
New Revision: 1041776
URL: http://svn.apache.org/viewvc?rev=1041776&view=rev
Log:
adjust config and code to match new imap snapshot
Added:
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirStoreUtil.java
- copied, changed from r1036079,
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirMailboxSessionMapperFactoryUtil.java
Removed:
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirMailboxSessionMapperFactoryUtil.java
Modified:
james/server/trunk/container-spring/src/main/config/examples/spring-beans.xml
james/server/trunk/container-spring/src/main/config/james/spring-beans.xml
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
Modified:
james/server/trunk/container-spring/src/main/config/examples/spring-beans.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/examples/spring-beans.xml?rev=1041776&r1=1041775&r2=1041776&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/config/examples/spring-beans.xml
(original)
+++
james/server/trunk/container-spring/src/main/config/examples/spring-beans.xml
Fri Dec 3 11:42:15 2010
@@ -325,6 +325,7 @@
<!-- JPA implementation of IMAP Storage-->
<bean id="sessionMapperFactory"
class="org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory">
<constructor-arg index="0" ref="entityManagerFactory"/>
+ <constructor-arg index="1" ref="uidProvider"/>
</bean>
<bean id ="subscriptionManager"
class="org.apache.james.mailbox.jpa.JPASubscriptionManager">
@@ -334,17 +335,31 @@
<bean id="mailboxmanager"
class="org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager">
<constructor-arg index="0" ref="sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
- <constructor-arg index="2" value="${openjpa.streaming}"/>
+ <constructor-arg index="2" ref="uidProvider"/>
+ <constructor-arg index="3" ref="locker"/>
+ <constructor-arg index="4" value="${openjpa.streaming}"/>
</bean>
+
+ <bean id="locker"
class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
+
+ <bean id="uidProvider"
class="org.apache.james.mailbox.jpa.JPACachingUidProvider">
+ <constructor-arg index="0" ref="entityManagerFactory"/>
+ </bean>
+
+
<!-- Maildir implementation of IMAP Storage -->
<!-- WARNING: Maildir does only work on UNIX like operation systems -->
<!--
- <bean id="sessionMapperFactory"
class="org.apache.james.adapter.mailbox.maildir.MaildirMailboxSessionMapperFactoryUtil"
factory-method="create">
+ <bean id="maildirStore" name="uidProvider"
class="org.apache.james.adapter.mailbox.maildir.MaildirStoreUtil"
factory-method="create">
<constructor-arg index="0" ref="filesystem"/>
<constructor-arg index="1" ref="mailserver"/>
<constructor-arg index="2" value="file://var/store/maildir/"/>
</bean>
+ <bean id="sessionMapperFactory"
class="org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory">
+ <constructor-arg index="0" ref="maildirStore"/>
+ </bean>
+
<bean id ="subscriptionManager"
class="org.apache.james.mailbox.maildir.MaildirSubscriptionManager">
<constructor-arg index="0" ref="sessionMapperFactory"/>
</bean>
@@ -352,6 +367,7 @@
<bean id="mailboxmanager"
class="org.apache.james.mailbox.maildir.MaildirMailboxManager">
<constructor-arg index="0" ref="sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
+ <constructor-arg index="2" ref="uidProvider"/>
</bean>
-->
@@ -386,6 +402,7 @@
<bean id="sessionMapperFactory"
class="org.apache.james.mailbox.jcr.JCRMailboxSessionMapperFactory">
<constructor-arg index="0" ref="sessionJcrRepository"/>
<constructor-arg index="1" ref="nodeLocker"/>
+ <constructor-arg index="2" ref="uidProvider"/>
</bean>
<bean id ="subscriptionManager"
class="org.apache.james.mailbox.jcr.JCRSubscriptionManager">
@@ -395,7 +412,14 @@
<bean id="mailboxmanager"
class="org.apache.james.mailbox.jcr.JCRMailboxManager">
<constructor-arg index="0" ref="sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
- <constructor-arg index="2" ref="nodeLocker"/>
+ <constructor-arg index="2" ref="uidProvider"/>
+ <constructor-arg index="3" ref="locker"/>
+ </bean>
+
+ <bean id="locker"
class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
+
+ <bean id="uidProvider"
class="org.apache.james.mailbox.jcr.JCRCachingUidProvider">
+ <constructor-arg index="0" ref="sessionJcrRepository"/>
</bean>
-->
Modified:
james/server/trunk/container-spring/src/main/config/james/spring-beans.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/spring-beans.xml?rev=1041776&r1=1041775&r2=1041776&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/spring-beans.xml
(original)
+++ james/server/trunk/container-spring/src/main/config/james/spring-beans.xml
Fri Dec 3 11:42:15 2010
@@ -281,6 +281,7 @@
<bean id="sessionMapperFactory"
class="org.apache.james.mailbox.jpa.JPAMailboxSessionMapperFactory">
<constructor-arg index="0" ref="entityManagerFactory"/>
+ <constructor-arg index="1" ref="uidProvider"/>
</bean>
<bean id ="subscriptionManager"
class="org.apache.james.mailbox.jpa.JPASubscriptionManager">
@@ -290,12 +291,16 @@
<bean id="mailboxmanager"
class="org.apache.james.mailbox.jpa.openjpa.OpenJPAMailboxManager">
<constructor-arg index="0" ref="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="uidProvider"/>
+ <constructor-arg index="3" ref="locker"/>
+ <constructor-arg index="4" value="${openjpa.streaming}"/>
</bean>
<bean id="locker"
class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
-
+
+ <bean id="uidProvider"
class="org.apache.james.mailbox.jpa.JPACachingUidProvider">
+ <constructor-arg index="0" ref="entityManagerFactory"/>
+ </bean>
<bean id="scheduler" class="java.util.concurrent.Executors"
factory-method="newScheduledThreadPool">
<constructor-arg value="20"/>
Copied:
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirStoreUtil.java
(from r1036079,
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirMailboxSessionMapperFactoryUtil.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirStoreUtil.java?p2=james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirStoreUtil.java&p1=james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirMailboxSessionMapperFactoryUtil.java&r1=1036079&r2=1041776&rev=1041776&view=diff
==============================================================================
---
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirMailboxSessionMapperFactoryUtil.java
(original)
+++
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirStoreUtil.java
Fri Dec 3 11:42:15 2010
@@ -20,36 +20,35 @@ package org.apache.james.adapter.mailbox
import java.io.FileNotFoundException;
-import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
+import org.apache.james.mailbox.maildir.MaildirStore;
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
/**
- * Utility to instance a {...@link MaildirMailboxSessionMapperFactory} object
+ * Utility to instance a {...@link MaildirStore} object
*
*
*/
-public class MaildirMailboxSessionMapperFactoryUtil{
+public class MaildirStoreUtil{
-
- /**
- * Return a {...@link MaildirMailboxSessionMapperFactory} instance
- *
- * @param fs
- * @param mailServer
- * @param rootURL
- * @return factory
- * @throws FileNotFoundException
- */
- public static MaildirMailboxSessionMapperFactory create(FileSystem fs,
MailServer mailServer, String rootURL) throws FileNotFoundException {
- StringBuffer root = new StringBuffer();
- root.append(fs.getFile(rootURL).getAbsolutePath());
- if (mailServer.supportVirtualHosting()) {
- root.append("/%domain/%user/");
- } else {
- root.append("/%user/");
- }
-
- return new MaildirMailboxSessionMapperFactory(root.toString());
- }
+ /**
+ * Return a {...@link MaildirStore} instance
+ *
+ * @param fs
+ * @param mailServer
+ * @param rootURL
+ * @return store
+ * @throws FileNotFoundException
+ */
+ public static MaildirStore create(FileSystem fs, MailServer mailServer,
String rootURL) throws FileNotFoundException {
+ StringBuffer root = new StringBuffer();
+ root.append(fs.getFile(rootURL).getAbsolutePath());
+ if (mailServer.supportVirtualHosting()) {
+ root.append("/%domain/%user/");
+ } else {
+ root.append("/%user/");
+ }
+
+ return new MaildirStore(root.toString());
+ }
}
Modified:
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java?rev=1041776&r1=1041775&r2=1041776&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
(original)
+++
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
Fri Dec 3 11:42:15 2010
@@ -42,6 +42,7 @@ import org.apache.james.services.MockFil
import org.apache.james.services.MockMailServer;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.MockDNSService;
+import org.apache.james.mailbox.inmemory.InMemoryCachingUidProvider;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.MailboxPath;
@@ -113,7 +114,7 @@ public abstract class AbstractAsyncPOP3S
public boolean isAuthentic(String userid, CharSequence passwd) {
return m_usersRepository.test(userid, passwd.toString());
}
- });
+ }, new InMemoryCachingUidProvider());
serviceManager.put("mailboxmanager", manager);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
