Author: norman
Date: Tue Jul 18 10:09:30 2006
New Revision: 423137
URL: http://svn.apache.org/viewvc?rev=423137&view=rev
Log:
Move fastfail filters to the right package
Added:
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java
- copied, changed from r423084,
james/server/trunk/src/java/org/apache/james/smtpserver/core/DNSRBLHandler.java
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java
- copied, changed from r422198,
james/server/trunk/src/java/org/apache/james/smtpserver/core/SpamAssassinHandler.java
Removed:
james/server/trunk/src/java/org/apache/james/smtpserver/core/DNSRBLHandler.java
james/server/trunk/src/java/org/apache/james/smtpserver/core/SpamAssassinHandler.java
Modified:
james/server/trunk/src/conf/james-config.xml
james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
Modified: james/server/trunk/src/conf/james-config.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/conf/james-config.xml?rev=423137&r1=423136&r2=423137&view=diff
==============================================================================
--- james/server/trunk/src/conf/james-config.xml (original)
+++ james/server/trunk/src/conf/james-config.xml Tue Jul 18 10:09:30 2006
@@ -921,7 +921,7 @@
<!-- why the ip was blocked. Default to false -->
<!--
- <handler class="org.apache.james.smtpserver.core.DNSRBLHandler"
command="RCPT">
+ <handler
class="org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler"
command="RCPT">
<getDetail> false </getDetail>
<rblservers>
<whitelist> query.bondedsender.org </whitelist>
Copied:
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java
(from r423084,
james/server/trunk/src/java/org/apache/james/smtpserver/core/DNSRBLHandler.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java?p2=james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java&p1=james/server/trunk/src/java/org/apache/james/smtpserver/core/DNSRBLHandler.java&r1=423084&r2=423137&rev=423137&view=diff
==============================================================================
---
james/server/trunk/src/java/org/apache/james/smtpserver/core/DNSRBLHandler.java
(original)
+++
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java
Tue Jul 18 10:09:30 2006
@@ -15,7 +15,7 @@
* permissions and limitations under the License. *
***********************************************************************/
-package org.apache.james.smtpserver.core;
+package org.apache.james.smtpserver.core.filter.fastfail;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
Copied:
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java
(from r422198,
james/server/trunk/src/java/org/apache/james/smtpserver/core/SpamAssassinHandler.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java?p2=james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java&p1=james/server/trunk/src/java/org/apache/james/smtpserver/core/SpamAssassinHandler.java&r1=422198&r2=423137&rev=423137&view=diff
==============================================================================
---
james/server/trunk/src/java/org/apache/james/smtpserver/core/SpamAssassinHandler.java
(original)
+++
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/SpamAssassinHandler.java
Tue Jul 18 10:09:30 2006
@@ -14,7 +14,7 @@
* implied. See the License for the specific language governing *
* permissions and limitations under the License. *
***********************************************************************/
-package org.apache.james.smtpserver.core;
+package org.apache.james.smtpserver.core.filter.fastfail;
import java.util.Iterator;
Modified:
james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java?rev=423137&r1=423136&r2=423137&view=diff
==============================================================================
---
james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
(original)
+++
james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
Tue Jul 18 10:09:30 2006
@@ -29,7 +29,7 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.services.DNSServer;
-import org.apache.james.smtpserver.core.DNSRBLHandler;
+import org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.mailet.Mail;
Modified:
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=423137&r1=423136&r2=423137&view=diff
==============================================================================
---
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
(original)
+++
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
Tue Jul 18 10:09:30 2006
@@ -22,8 +22,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.james.smtpserver.core.CoreCmdHandlerLoader;
-import org.apache.james.smtpserver.core.DNSRBLHandler;
import org.apache.james.smtpserver.core.filter.CoreFilterCmdHandlerLoader;
+import org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler;
import org.apache.james.smtpserver.core.filter.fastfail.MaxRcptHandler;
import
org.apache.james.smtpserver.core.filter.fastfail.ResolvableEhloHeloHandler;
import
org.apache.james.smtpserver.core.filter.fastfail.ReverseEqualsEhloHeloHandler;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
