Index: spring-deployment/src/main/config/james/spring-beans.xml
===================================================================
--- spring-deployment/src/main/config/james/spring-beans.xml	(Revision 948016)
+++ spring-deployment/src/main/config/james/spring-beans.xml	(Arbeitskopie)
@@ -326,23 +326,23 @@
     -->
 
     <!-- JPA implementation of IMAP Storage-->
-    <bean id ="sessionEntityManagerFactory" class="org.apache.james.imap.jpa.MailboxSessionEntityManagerFactory">
+    <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">
-        <constructor-arg index="0" ref="sessionEntityManagerFactory"/>
+    <bean id ="subscriber" 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="authenticator"/>
-        <constructor-arg index="1" ref="subscriper"/>
-        <constructor-arg index="2" ref="sessionEntityManagerFactory"/>
+        <constructor-arg index="0" ref="sessionMapperFactory"/>
+        <constructor-arg index="1" ref="authenticator"/>
+        <constructor-arg index="2" ref="subscriber"/>
         <constructor-arg index="3" value="${openjpa.streaming}"/>
     </bean>
 
 
     <!-- JCR implementation of IMAP Storage-->
-    <!--  
+    <!--
     <bean id="imapCndLoader" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
         <property name="targetObject"><ref local="jcrUtils"/></property>
         <property name="targetMethod"><value>registerCnd</value></property>
@@ -365,15 +365,19 @@
         <constructor-arg index="3" value="james"/>
     </bean>
     
-    <bean id ="subscriper" 	class="org.apache.james.imap.jcr.JCRSubscriptionManager">
+    <bean id ="sessionMapperFactory" class="org.apache.james.imap.jcr.JRMailboxSessionMapperFactory">
         <constructor-arg index="0" ref="sessionJcrRepository"/>
     </bean>
+    
+    <bean id ="subscriber" 	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="authenticator"/>
-        <constructor-arg index="1" ref="subscriper"/>
-        <constructor-arg index="2" ref="sessionJcrRepository"/>
+        <constructor-arg index="0" ref="sessionMapperFactory"/>
+        <constructor-arg index="1" ref="authenticator"/>
+        <constructor-arg index="2" ref="subscriber"/>
     </bean>
     -->
 
@@ -422,4 +426,4 @@
     </bean>
 
     <!-- #################################################################### -->
-</beans>
\ No newline at end of file
+</beans>
Index: pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
===================================================================
--- pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java	(Revision 948016)
+++ pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java	(Arbeitskopie)
@@ -41,6 +41,7 @@
 import org.apache.james.api.kernel.mock.FakeLoader;
 import org.apache.james.api.user.UsersRepository;
 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.MailboxSession;
@@ -101,13 +102,13 @@
         serviceManager.put(UsersRepository.ROLE,
                 m_usersRepository);
         
-        
-        manager = new InMemoryMailboxManager(new Authenticator() {
+        InMemoryMailboxSessionMapperFactory mf = new InMemoryMailboxSessionMapperFactory();
+        manager = new InMemoryMailboxManager(mf, new Authenticator() {
             
             public boolean isAuthentic(String userid, CharSequence passwd) {
                 return m_usersRepository.test(userid, passwd.toString());
             }
-        }, new InMemorySubscriptionManager());
+        }, new InMemorySubscriptionManager(mf));
         
         serviceManager.put("mailboxmanager", manager);