Author: norman
Date: Mon Aug 23 06:42:37 2010
New Revision: 988001
URL: http://svn.apache.org/viewvc?rev=988001&view=rev
Log:
Adjust code and xml to match current imap trunk
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java?rev=988001&r1=988000&r2=988001&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/UserMetaDataRepositorySubscripter.java
Mon Aug 23 06:42:37 2010
@@ -33,12 +33,12 @@ import org.apache.james.api.user.UsersRe
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.mailbox.MailboxSession;
import org.apache.james.imap.mailbox.SubscriptionException;
-import org.apache.james.imap.store.Subscriber;
+import org.apache.james.imap.mailbox.SubscriptionManager;
/**
*
*/
-public class UserMetaDataRepositorySubscripter implements Subscriber {
+public class UserMetaDataRepositorySubscripter implements SubscriptionManager {
public static final String META_DATA_KEY =
"org.apache.james.IMAP_SUBSCRIPTIONS";
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=988001&r1=988000&r2=988001&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
Mon Aug 23 06:42:37 2010
@@ -43,7 +43,6 @@ import org.apache.james.api.user.UsersRe
import org.apache.james.imap.api.MailboxPath;
import org.apache.james.imap.inmemory.InMemoryMailboxManager;
import org.apache.james.imap.inmemory.InMemoryMailboxSessionMapperFactory;
-import org.apache.james.imap.inmemory.InMemorySubscriptionManager;
import org.apache.james.imap.mailbox.Mailbox;
import org.apache.james.imap.mailbox.MailboxConstants;
import org.apache.james.imap.mailbox.MailboxSession;
@@ -111,7 +110,7 @@ public abstract class AbstractAsyncPOP3S
public boolean isAuthentic(String userid, CharSequence passwd) {
return m_usersRepository.test(userid, passwd.toString());
}
- }, new InMemorySubscriptionManager(factory));
+ });
serviceManager.put("mailboxmanager", manager);
Modified:
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=988001&r1=988000&r2=988001&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Mon Aug 23 06:42:37 2010
@@ -282,7 +282,9 @@
</bean>
<bean id="imapProcessor"
class="org.apache.james.imap.processor.main.DefaultImapProcessorFactory"
factory-method="createDefaultProcessor">
- <constructor-arg ref="mailboxmanager"/>
+ <constructor-arg index="0" ref="mailboxmanager"/>
+ <constructor-arg index="1" ref="subscriptionManager"/>
+
</bean>
<bean id="imapDecoderFactory"
class="org.apache.james.imap.main.DefaultImapDecoderFactory"/>
@@ -300,15 +302,14 @@
<bean id="sessionMapperFactory"
class="org.apache.james.imap.jpa.JPAMailboxSessionMapperFactory">
<constructor-arg index="0" ref="entityManagerFactory"/>
</bean>
- <bean id ="subscriper"
class="org.apache.james.imap.jpa.JPASubscriptionManager">
+ <bean id ="subscriptionManager"
class="org.apache.james.imap.jpa.JPASubscriptionManager">
<constructor-arg index="0" ref="sessionMapperFactory"/>
</bean>
<bean id="mailboxmanager"
class="org.apache.james.imap.jpa.openjpa.OpenJPAMailboxManager">
<constructor-arg index="0" ref="sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
- <constructor-arg index="2" ref="subscriper"/>
- <constructor-arg index="3" value="${openjpa.streaming}"/>
+ <constructor-arg index="2" value="${openjpa.streaming}"/>
</bean>
@@ -348,16 +349,15 @@
<constructor-arg index="1" ref="nodeLocker"/>
</bean>
- <bean id ="subscriper"
class="org.apache.james.imap.jcr.JCRSubscriptionManager">
+ <bean id ="subscriptionManager"
class="org.apache.james.imap.jcr.JCRSubscriptionManager">
<constructor-arg index="0" ref="sessionMapperFactory"/>
</bean>
<bean id="mailboxmanager"
class="org.apache.james.imap.jcr.JCRMailboxManager">
<constructor-arg index="0" ref="sessionMapperFactory"/>
<constructor-arg index="1" ref="authenticator"/>
- <constructor-arg index="2" ref="subscriper"/>
- <constructor-arg index="3" ref="nodeLocker"/>
- <constructor-arg index="4" ref="uidConsumer"/>
+ <constructor-arg index="2" ref="nodeLocker"/>
+ <constructor-arg index="3" ref="uidConsumer"/>
</bean>
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
