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 2010/02/05 14:39:47 UTC
svn commit: r906933 - in /james/server/trunk:
mina-socket/src/main/java/org/apache/james/socket/mina/filter/
smtpserver/src/main/java/org/apache/james/smtpserver/
smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/
smtpserver/src/main/java/o...
Author: norman
Date: Fri Feb 5 13:39:45 2010
New Revision: 906933
URL: http://svn.apache.org/viewvc?rev=906933&view=rev
Log:
There is no need to keep the integration name in the package. This was only needed while factor out smtpprotocol into a own product
Added:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AddDefaultAttributesMessageHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMessageHook.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMessageHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesWelcomeMessageHandler.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesWelcomeMessageHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/POP3BeforeSMTPHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SMTPServerDNSServiceAdapter.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SendMailHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SetMimeHeaderHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/TLDLookup.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/TLDLookup.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
- copied, changed from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/
- copied from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/
Removed:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AddDefaultAttributesMessageHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMessageHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesWelcomeMessageHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/POP3BeforeSMTPHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SMTPServerDNSServiceAdapter.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SendMailHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SetMimeHeaderHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/TLDLookup.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/
Modified:
james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/FilterLineHandlerAdapter.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/TarpitHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
james/server/trunk/spring-deployment/src/main/config/james/smtpserver.xml
Modified: james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/FilterLineHandlerAdapter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/FilterLineHandlerAdapter.java?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/FilterLineHandlerAdapter.java (original)
+++ james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/FilterLineHandlerAdapter.java Fri Feb 5 13:39:45 2010
@@ -42,6 +42,7 @@
/**
* @see org.apache.mina.core.filterchain.IoFilterAdapter#messageReceived(org.apache.mina.core.filterchain.IoFilter.NextFilter, org.apache.mina.core.session.IoSession, java.lang.Object)
*/
+ @SuppressWarnings("unchecked")
public void messageReceived(NextFilter arg0, IoSession session, Object arg2)
throws Exception {
IoBuffer buf = (IoBuffer) arg2;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AddDefaultAttributesMessageHook.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AddDefaultAttributesMessageHook.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AddDefaultAttributesMessageHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java Fri Feb 5 13:39:45 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import org.apache.james.core.MailImpl;
import org.apache.james.protocols.smtp.SMTPSession;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java Fri Feb 5 13:39:45 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import javax.annotation.Resource;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java Fri Feb 5 13:39:45 2010
@@ -19,7 +19,7 @@
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import java.util.LinkedList;
import java.util.List;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java Fri Feb 5 13:39:45 2010
@@ -19,7 +19,7 @@
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import java.io.IOException;
import java.io.InputStream;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java Fri Feb 5 13:39:45 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import java.io.IOException;
import java.io.OutputStream;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java Fri Feb 5 13:39:45 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import javax.annotation.Resource;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMessageHook.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMessageHook.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMessageHook.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMessageHook.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMessageHook.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMessageHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMessageHook.java Fri Feb 5 13:39:45 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java Fri Feb 5 13:39:45 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import javax.annotation.Resource;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesWelcomeMessageHandler.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesWelcomeMessageHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesWelcomeMessageHandler.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesWelcomeMessageHandler.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesWelcomeMessageHandler.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesWelcomeMessageHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesWelcomeMessageHandler.java Fri Feb 5 13:39:45 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import org.apache.james.Constants;
import org.apache.james.protocols.smtp.core.WelcomeMessageHandler;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/POP3BeforeSMTPHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/POP3BeforeSMTPHandler.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/POP3BeforeSMTPHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java Fri Feb 5 13:39:45 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SMTPServerDNSServiceAdapter.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SMTPServerDNSServiceAdapter.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SMTPServerDNSServiceAdapter.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java Fri Feb 5 13:39:45 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import java.net.InetAddress;
import java.net.UnknownHostException;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SendMailHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SendMailHandler.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SendMailHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.java Fri Feb 5 13:39:45 2010
@@ -19,7 +19,7 @@
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import java.util.Collection;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java Fri Feb 5 13:39:45 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import javax.annotation.Resource;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SetMimeHeaderHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SetMimeHeaderHandler.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SetMimeHeaderHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SetMimeHeaderHandler.java Fri Feb 5 13:39:45 2010
@@ -19,7 +19,7 @@
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import javax.mail.internet.MimeMessage;
@@ -73,7 +73,7 @@
/**
* Adds header to the message
*
- * @see org.apache.james.smtpserver.integration.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.Mail)
+ * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.Mail)
*/
public HookResult onMessage(SMTPSession session, Mail mail) {
try {
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/TLDLookup.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/TLDLookup.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/TLDLookup.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/TLDLookup.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/TLDLookup.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/TLDLookup.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/TLDLookup.java Fri Feb 5 13:39:45 2010
@@ -20,7 +20,7 @@
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import java.util.HashSet;
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java (from r906372, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java&r1=906372&r2=906933&rev=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java Fri Feb 5 13:39:45 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration;
+package org.apache.james.smtpserver;
import javax.annotation.Resource;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java Fri Feb 5 13:39:45 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +29,7 @@
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.lifecycle.Configurable;
-import org.apache.james.smtpserver.integration.SMTPServerDNSServiceAdapter;
+import org.apache.james.smtpserver.SMTPServerDNSServiceAdapter;
public class DNSRBLHandler extends org.apache.james.protocols.smtp.core.fastfail.DNSRBLHandler implements Configurable{
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java Fri Feb 5 13:39:45 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import java.io.File;
import java.sql.Connection;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/MaxRcptHandler.java Fri Feb 5 13:39:45 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java Fri Feb 5 13:39:45 2010
@@ -17,12 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import javax.annotation.Resource;
import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.smtpserver.integration.SMTPServerDNSServiceAdapter;
+import org.apache.james.smtpserver.SMTPServerDNSServiceAdapter;
public class ResolvableEhloHeloHandler extends org.apache.james.protocols.smtp.core.fastfail.ResolvableEhloHeloHandler {
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java Fri Feb 5 13:39:45 2010
@@ -17,12 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import javax.annotation.Resource;
import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.smtpserver.integration.SMTPServerDNSServiceAdapter;
+import org.apache.james.smtpserver.SMTPServerDNSServiceAdapter;
public class ReverseEqualsEhloHeloHandler extends org.apache.james.protocols.smtp.core.fastfail.ReverseEqualsEhloHeloHandler{
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java Fri Feb 5 13:39:45 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -38,7 +38,7 @@
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.hook.MailHook;
import org.apache.james.protocols.smtp.hook.RcptHook;
-import org.apache.james.smtpserver.integration.JamesMessageHook;
+import org.apache.james.smtpserver.JamesMessageHook;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -312,7 +312,7 @@
}
/**
- * @see org.apache.james.smtpserver.integration.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession,
+ * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession,
* org.apache.mailet.Mail)
*/
public HookResult onMessage(SMTPSession session, Mail mail) {
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java Fri Feb 5 13:39:45 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import java.util.Iterator;
@@ -32,7 +32,7 @@
import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
-import org.apache.james.smtpserver.integration.JamesMessageHook;
+import org.apache.james.smtpserver.JamesMessageHook;
import org.apache.james.util.scanner.SpamAssassinInvoker;
import org.apache.mailet.Mail;
@@ -112,7 +112,7 @@
}
/**
- * @see org.apache.james.smtpserver.integration.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.Mail)
+ * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.Mail)
*/
public HookResult onMessage(SMTPSession session, Mail mail) {
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java Fri Feb 5 13:39:45 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import java.util.List;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/TarpitHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/TarpitHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/TarpitHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/TarpitHandler.java Fri Feb 5 13:39:45 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java Fri Feb 5 13:39:45 2010
@@ -20,7 +20,7 @@
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import java.io.IOException;
import java.net.UnknownHostException;
@@ -47,7 +47,7 @@
import org.apache.james.protocols.smtp.dsn.DSNStatus;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
-import org.apache.james.smtpserver.integration.JamesMessageHook;
+import org.apache.james.smtpserver.JamesMessageHook;
import org.apache.mailet.Mail;
/**
@@ -143,7 +143,7 @@
}
/**
- * @see org.apache.james.smtpserver.integration.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.Mail)
+ * @see org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.Mail)
*/
public HookResult onMessage(SMTPSession session, Mail mail) {
if (check(session, mail)) {
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java Fri Feb 5 13:39:45 2010
@@ -20,7 +20,7 @@
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import java.net.URI;
import java.net.URISyntaxException;
@@ -28,7 +28,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.james.smtpserver.integration.TLDLookup;
+import org.apache.james.smtpserver.TLDLookup;
public class URIScanner {
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Fri Feb 5 13:39:45 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import java.util.Collection;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java Fri Feb 5 13:39:45 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import java.net.UnknownHostException;
import java.util.ArrayList;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java?rev=906933&r1=906372&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java Fri Feb 5 13:39:45 2010
@@ -18,12 +18,12 @@
****************************************************************/
-package org.apache.james.smtpserver.integration.fastfail;
+package org.apache.james.smtpserver.fastfail;
import javax.annotation.Resource;
import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.smtpserver.integration.SMTPServerDNSServiceAdapter;
+import org.apache.james.smtpserver.SMTPServerDNSServiceAdapter;
public class ValidSenderDomainHandler extends org.apache.james.protocols.smtp.core.fastfail.ValidSenderDomainHandler{
@Resource(name="dnsserver")
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java Fri Feb 5 13:39:45 2010
@@ -31,7 +31,7 @@
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPServerMBean;
-import org.apache.james.smtpserver.integration.CoreCmdHandlerLoader;
+import org.apache.james.smtpserver.CoreCmdHandlerLoader;
import org.apache.james.smtpserver.mina.filter.SMTPResponseFilter;
import org.apache.james.socket.ProtocolHandlerChainImpl;
import org.apache.james.socket.mina.AbstractAsyncServer;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java Fri Feb 5 13:39:45 2010
@@ -48,7 +48,7 @@
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
-import org.apache.james.smtpserver.integration.SMTPServerDNSServiceAdapter;
+import org.apache.james.smtpserver.SMTPServerDNSServiceAdapter;
import org.apache.james.smtpserver.mina.AsyncSMTPServer;
import org.apache.james.test.mock.DummyVirtualUserTableStore;
import org.apache.james.test.mock.avalon.MockStore;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java Fri Feb 5 13:39:45 2010
@@ -22,7 +22,7 @@
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.apache.james.smtpserver.integration.POP3BeforeSMTPHandler;
+import org.apache.james.smtpserver.POP3BeforeSMTPHandler;
import org.apache.james.util.POP3BeforeSMTPHelper;
import junit.framework.TestCase;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java Fri Feb 5 13:39:45 2010
@@ -23,12 +23,12 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
-import org.apache.james.smtpserver.integration.CoreCmdHandlerLoader;
-import org.apache.james.smtpserver.integration.fastfail.DNSRBLHandler;
-import org.apache.james.smtpserver.integration.fastfail.MaxRcptHandler;
-import org.apache.james.smtpserver.integration.fastfail.ResolvableEhloHeloHandler;
-import org.apache.james.smtpserver.integration.fastfail.ReverseEqualsEhloHeloHandler;
-import org.apache.james.smtpserver.integration.fastfail.ValidSenderDomainHandler;
+import org.apache.james.smtpserver.CoreCmdHandlerLoader;
+import org.apache.james.smtpserver.fastfail.DNSRBLHandler;
+import org.apache.james.smtpserver.fastfail.MaxRcptHandler;
+import org.apache.james.smtpserver.fastfail.ResolvableEhloHeloHandler;
+import org.apache.james.smtpserver.fastfail.ReverseEqualsEhloHeloHandler;
+import org.apache.james.smtpserver.fastfail.ValidSenderDomainHandler;
public class SMTPTestConfiguration extends DefaultConfigurationBuilder {
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java Fri Feb 5 13:39:45 2010
@@ -31,7 +31,7 @@
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
-import org.apache.james.smtpserver.integration.fastfail.SPFHandler;
+import org.apache.james.smtpserver.fastfail.SPFHandler;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java Fri Feb 5 13:39:45 2010
@@ -24,7 +24,7 @@
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.apache.james.smtpserver.integration.SetMimeHeaderHandler;
+import org.apache.james.smtpserver.SetMimeHeaderHandler;
import org.apache.mailet.Mail;
import javax.mail.MessagingException;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java Fri Feb 5 13:39:45 2010
@@ -33,7 +33,7 @@
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
-import org.apache.james.smtpserver.integration.fastfail.SpamAssassinHandler;
+import org.apache.james.smtpserver.fastfail.SpamAssassinHandler;
import org.apache.james.test.mock.MockMimeMessage;
import org.apache.james.test.mock.mailet.MockMail;
import org.apache.james.test.mock.util.MockSpamd;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java Fri Feb 5 13:39:45 2010
@@ -44,7 +44,7 @@
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
-import org.apache.james.smtpserver.integration.fastfail.URIRBLHandler;
+import org.apache.james.smtpserver.fastfail.URIRBLHandler;
import org.apache.james.test.mock.MockMimeMessage;
import org.apache.james.test.mock.mailet.MockMail;
import org.apache.mailet.Mail;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Fri Feb 5 13:39:45 2010
@@ -43,7 +43,7 @@
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
-import org.apache.james.smtpserver.integration.fastfail.ValidRcptHandler;
+import org.apache.james.smtpserver.fastfail.ValidRcptHandler;
import org.apache.james.test.mock.james.MockVirtualUserTableStore;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.mailet.Mail;
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java Fri Feb 5 13:39:45 2010
@@ -33,7 +33,7 @@
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
-import org.apache.james.smtpserver.integration.fastfail.ValidRcptMX;
+import org.apache.james.smtpserver.fastfail.ValidRcptMX;
import org.apache.mailet.MailAddress;
import junit.framework.TestCase;
Modified: james/server/trunk/spring-deployment/src/main/config/james/smtpserver.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/smtpserver.xml?rev=906933&r1=906932&r2=906933&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/smtpserver.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/smtpserver.xml Fri Feb 5 13:39:45 2010
@@ -139,7 +139,7 @@
<!-- Plz note that only the ip get stored to indentify an authenticated client -->
<!-- The expireTime is the time after which an ipAddress is handled as expired -->
<!--
- <handler class="org.apache.james.smtpserver.core.POP3BeforeSMTPHandler">
+ <handler class="org.apache.james.smtpserver.POP3BeforeSMTPHandler">
<expireTime> 1 hour </expireTime>
</handler>
-->
@@ -170,7 +170,7 @@
please speak with your local system/network admins.
-->
<!--
- <handler class="org.apache.james.smtpserver.integration.fastfail.DNSRBLHandler">
+ <handler class="org.apache.james.smtpserver.fastfail.DNSRBLHandler">
<getDetail> false </getDetail>
<rblservers>
<whitelist> query.bondedsender.org. </whitelist>
@@ -185,7 +185,7 @@
<!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
<!-- are allowed to relay. Default is false. -->
<!--
- <handler class="org.apache.james.smtpserver.integration.fastfail.SPFHandler">
+ <handler class="org.apache.james.smtpserver.fastfail.SPFHandler">
<blockSoftFail> false </blockSoftFail>
<blockPermError> true </blockPermError>
</handler>
@@ -195,14 +195,14 @@
<!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
<!-- are allowed to relay. Default is false. -->
<!--
- <handler class="org.apache.james.smtpserver.integration.fastfail.ResolvableEhloHeloHandler"/>
+ <handler class="org.apache.james.smtpserver.fastfail.ResolvableEhloHeloHandler"/>
-->
<!-- Checks HELO/EHLO is equal the reverse of the connecting client before accept it -->
<!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
<!-- are allowed to relay. Default is false. -->
<!--
- <handler class="org.apache.james.smtpserver.integration.fastfail.ReverseEqualsEhloHeloHandler"/>
+ <handler class="org.apache.james.smtpserver.fastfail.ReverseEqualsEhloHeloHandler"/>
-->
<!-- If activated mail is only accepted if the sender contains -->
@@ -218,12 +218,12 @@
<!-- You need to add the recipient to the validRecipient list if you want -->
<!-- to accept email for a recipient which not exist on the server -->
<!--
- <handler class="org.apache.james.smtpserver.integration.fastfail.ValidRcptHandler"/>
+ <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-->
<!-- If activated you can limit the maximal recipients -->
<!--
- <handler class="org.apache.james.smtpserver.integration.fastfail.MaxRcptHandler">
+ <handler class="org.apache.james.smtpserver.fastfail.MaxRcptHandler">
<maxRcpt> 10 </maxRcpt>
</handler>
-->
@@ -231,7 +231,7 @@
<!-- If uncomment this block you can enable greylisting. For more infos-->
<!-- how greylisting work see: http://projects.puremagic.com/greylisting/whitepaper.html -->
<!--
- <handler class="org.apache.james.smtpserver.integration.fastfail.JDBCGreylistHandler">
+ <handler class="org.apache.james.smtpserver.fastfail.JDBCGreylistHandler">
<repositoryPath> db://maildb </repositoryPath>
<sqlFile>file://conf/sqlResources.xml</sqlFile>
<tempBlockTime> 1 hour </tempBlockTime>
@@ -246,7 +246,7 @@
<!-- Default is set to 0 (disabled). -->
<!-- You can also configure the time to sleep in milliseconds -->
<!--
- <handler class="org.apache.james.smtpserver.integration.fastfail.TarpitHandler">
+ <handler class="org.apache.james.smtpserver.fastfail.TarpitHandler">
<tarpitRcptCount> 5 </tarpitRcptCount>
<tarpitSleepTime> 5000 </tarpitSleepTime>
</handler>
@@ -259,13 +259,13 @@
-->
<!-- Load the core command handlers -->
- <handler class="org.apache.james.smtpserver.integration.CoreCmdHandlerLoader"/>
+ <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
<!-- This MessageHandler could be used to check message against spamd before -->
<!-- accept the email. So its possible to reject a message on smtplevel if a -->
<!-- configured hits amount is reached. -->
<!--
- <handler class="org.apache.james.smtpserver.integration.fastfail.SpamAssassinHandler">
+ <handler class="org.apache.james.smtpserver.fastfail.SpamAssassinHandler">
<spamdHost> 127.0.0.1 </spamdHost>
<spamdPort> 783 </spamdPort>
<spamdRejectionHits> 10 </spamdRejectionHits>
@@ -276,7 +276,7 @@
<!-- this domains against uriRbllists. See http://www.surbl.org for more informations. -->
<!-- The message get rejected if a domain matched . -->
<!--
- <handler class="org.apache.james.smtpserver.integration.fastfail.URIRBLHandler">
+ <handler class="org.apache.james.smtpserver.fastfail.URIRBLHandler">
<action> reject </action>
<getDetail> true </getDetail>
<uriRblServers>
@@ -285,7 +285,7 @@
</handler>
-->
<!--
- <handler class="org.apache.james.smtpserver.integration.SetMimeHeaderHandler">
+ <handler class="org.apache.james.smtpserver.SetMimeHeaderHandler">
<headername>SPF-test</headername>
<headervalue>passed</headervalue>
</handler>
@@ -294,7 +294,7 @@
<!-- The default message receiving handler -->
<!-- The default behaviour is to put the message in the root processor of -->
<!-- the spooler -->
- <handler class="org.apache.james.smtpserver.integration.SendMailHandler"></handler>
+ <handler class="org.apache.james.smtpserver.SendMailHandler"></handler>
</handlerchain>
</handler>
</smtpserver>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org