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 er...@apache.org on 2013/04/28 17:57:41 UTC
svn commit: r1476790 - in /james: mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/ mailbox/trunk/spring/src/main/resources/META-INF/spring/ mailbox/trunk/spring/src/test/java/org/apache/james/mailbox/spring/ server/trunk/ server/trun...

Author: eric
Date: Sun Apr 28 15:57:41 2013
New Revision: 1476790

URL: http://svn.apache.org/r1476790
Log:
Fix POP3/IMAP4 authentication (JAMES-1504)

Added:
    james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-authenticator-anonymous.xml
      - copied unchanged from r1468751, james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-authenticator.xml
Removed:
    james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-authenticator.xml
Modified:
    james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
    james/mailbox/trunk/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
    james/mailbox/trunk/spring/src/test/java/org/apache/james/mailbox/spring/SpringMailboxTest.java
    james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
    james/server/trunk/pom.xml

Modified: james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java?rev=1476790&r1=1476789&r2=1476790&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java (original)
+++ james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java Sun Apr 28 15:57:41 2013
@@ -26,7 +26,8 @@ public class SpringMailbox {
     private ApplicationContext applicationContext;
     
     public SpringMailbox() {
-        applicationContext = new ClassPathXmlApplicationContext("META-INF/spring/spring-mailbox.xml");
+        applicationContext = new ClassPathXmlApplicationContext("META-INF/spring/spring-mailbox.xml",
+                "META-INF/spring/mailbox-authenticator-anonymous.xml");
     }
     
     public Object getBean(String beanName) {

Modified: james/mailbox/trunk/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/spring/spring-mailbox.xml?rev=1476790&r1=1476789&r2=1476790&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/spring/spring-mailbox.xml (original)
+++ james/mailbox/trunk/spring/src/main/resources/META-INF/spring/spring-mailbox.xml Sun Apr 28 15:57:41 2013
@@ -27,7 +27,6 @@
      -->
 
     <import resource="classpath:META-INF/spring/mailbox-locker.xml"/>
-    <import resource="classpath:META-INF/spring/mailbox-authenticator.xml"/>
     <!-- TODO: fix dependency issues with lucene and JCR and re-enable -->
     <!--<import resource="classpath:META-INF/spring/mailbox-index-lucene.xml" />-->
     <import resource="classpath:META-INF/spring/mailbox-jpa.xml"/>

Modified: james/mailbox/trunk/spring/src/test/java/org/apache/james/mailbox/spring/SpringMailboxTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/test/java/org/apache/james/mailbox/spring/SpringMailboxTest.java?rev=1476790&r1=1476789&r2=1476790&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/test/java/org/apache/james/mailbox/spring/SpringMailboxTest.java (original)
+++ james/mailbox/trunk/spring/src/test/java/org/apache/james/mailbox/spring/SpringMailboxTest.java Sun Apr 28 15:57:41 2013
@@ -18,9 +18,9 @@
  ****************************************************************/
 package org.apache.james.mailbox.spring;
 
-import java.io.IOException;
+import static org.junit.Assert.*;
 
-import junit.framework.Assert;
+import java.io.IOException;
 
 import org.apache.james.mailbox.copier.MailboxCopierImpl;
 import org.junit.BeforeClass;
@@ -37,8 +37,8 @@ public class SpringMailboxTest {
     
     @Test
     public void testGetBean() throws IOException {
-        Assert.assertEquals(AnonymousAuthenticator.class.getName(), springMailbox.getBean("authenticator").getClass().getName());
-        Assert.assertEquals(MailboxCopierImpl.class.getName(), springMailbox.getBean("mailboxcopier").getClass().getName());
+        assertEquals(AnonymousAuthenticator.class.getName(), springMailbox.getBean("authenticator").getClass().getName());
+        assertEquals(MailboxCopierImpl.class.getName(), springMailbox.getBean("mailboxcopier").getClass().getName());
     }
 
 }

Modified: james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml?rev=1476790&r1=1476789&r2=1476790&view=diff
==============================================================================
--- james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml (original)
+++ james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml Sun Apr 28 15:57:41 2013
@@ -43,6 +43,14 @@
 
     <!-- 
     ===========================================================================
+       Authenticator
+    ===========================================================================
+    -->
+
+    <import resource="classpath:META-INF/org/apache/james/spring-mailbox-authenticator.xml"/>
+
+    <!-- 
+    ===========================================================================
        Queues
     ===========================================================================
     -->

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1476790&r1=1476789&r2=1476790&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun Apr 28 15:57:41 2013
@@ -124,7 +124,7 @@
         <javax.activation.artifactId>geronimo-activation_1.1_spec</javax.activation.artifactId>
         <jackrabbit.version>2.5.2</jackrabbit.version>
         <jsieve.version>0.6-SNAPSHOT</jsieve.version>
-        <mailbox.version>0.5</mailbox.version>
+        <mailbox.version>0.6-SNAPSHOT</mailbox.version>
         <mailet.version>2.5.1-SNAPSHOT</mailet.version>
         <protocols.version>1.6.3</protocols.version>
         <spring.version>3.1.2.RELEASE</spring.version>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org