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 no...@apache.org on 2009/10/23 17:15:09 UTC
svn commit: r829088 - in /james/server/trunk: smtp-protocol-library/ smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ smtpserver-function/...

Author: norman
Date: Fri Oct 23 15:15:05 2009
New Revision: 829088

URL: http://svn.apache.org/viewvc?rev=829088&view=rev
Log:
MailetAddress needs javamail
Move ValidRcptMX to integration

Added:
    james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptMX.java
      - copied, changed from r828663, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptMX.java
Removed:
    james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptMX.java
Modified:
    james/server/trunk/smtp-protocol-library/pom.xml
    james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java

Modified: james/server/trunk/smtp-protocol-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/pom.xml?rev=829088&r1=829087&r2=829088&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/pom.xml (original)
+++ james/server/trunk/smtp-protocol-library/pom.xml Fri Oct 23 15:15:05 2009
@@ -51,22 +51,14 @@
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-mailet-base</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-javamail-util</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </exclusion>
-      </exclusions>
+    </dependency>
+      <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
     </dependency>
     
   </dependencies>

Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptMX.java (from r828663, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptMX.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptMX.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptMX.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptMX.java&r1=828663&r2=829088&rev=829088&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptMX.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptMX.java Fri Oct 23 15:15:05 2009
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.smtpserver.integration;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;

Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java?rev=829088&r1=829087&r2=829088&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java Fri Oct 23 15:15:05 2009
@@ -31,8 +31,8 @@
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.james.api.dnsservice.AbstractDNSServer;
 import org.apache.james.api.dnsservice.DNSService;
+import org.apache.james.smtpserver.integration.ValidRcptMX;
 import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.core.fastfail.ValidRcptMX;
 import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
 import org.apache.james.test.mock.avalon.MockLogger;
 import org.apache.mailet.MailAddress;



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