Author: norman Date: Sun Oct 18 15:03:58 2009 New Revision: 826459 URL: http://svn.apache.org/viewvc?rev=826459&view=rev Log: some package moving
Added: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/DNSRBLHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/MaxRcptHandler.java - copied, changed from r826452, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/MaxRcptHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandler.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ResolvableEhloHeloHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ReverseEqualsEhloHeloHandler.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SPFHandler.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SPFHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamAssassinHandler.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamAssassinHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandler.java - copied, changed from r826452, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamTrapHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SupressDuplicateRcptHandler.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SupressDuplicateRcptHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TLDLookup.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TLDLookup.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandler.java - copied, changed from r826452, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/URIRBLHandler.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/URIScanner.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIScanner.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptHandler.java - copied, changed from r826452, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptMX.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidSenderDomainHandler.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/GreylistHandler.java - copied, changed from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/GreylistHandler.java Removed: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/DNSRBLHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/GreylistHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/MaxRcptHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ResolvableEhloHeloHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SPFHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamAssassinHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamTrapHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SupressDuplicateRcptHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TLDLookup.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIScanner.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java Modified: james/server/trunk/phoenix-deployment/src/conf/james-smtphandlerchain.xml james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java Modified: james/server/trunk/phoenix-deployment/src/conf/james-smtphandlerchain.xml URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-smtphandlerchain.xml?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/phoenix-deployment/src/conf/james-smtphandlerchain.xml (original) +++ james/server/trunk/phoenix-deployment/src/conf/james-smtphandlerchain.xml Sun Oct 18 15:03:58 2009 @@ -56,7 +56,7 @@ please speak with your local system/network admins. --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler"> + <handler class="org.apache.james.smtpserver.core.fastfail.DNSRBLHandler"> <getDetail> false </getDetail> <rblservers> <whitelist> query.bondedsender.org. </whitelist> @@ -72,7 +72,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.core.filter.fastfail.SPFHandler"> + <handler class="org.apache.james.smtpserver.core.fastfail.SPFHandler"> <checkAuthNetworks> false </checkAuthNetworks> <blockSoftFail> false </blockSoftFail> <blockPermError> true </blockPermError> @@ -86,7 +86,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.core.filter.fastfail.ResolvableEhloHeloHandler"> + <handler class="org.apache.james.smtpserver.core.fastfail.ResolvableEhloHeloHandler"> <checkAuthNetworks> false </checkAuthNetworks> <checkAuthUsers> false </checkAuthUsers> </handler> @@ -96,7 +96,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.core.filter.fastfail.ReverseEqualsEhloHeloHandler"> + <handler class="org.apache.james.smtpserver.core.fastfail.ReverseEqualsEhloHeloHandler"> <checkAuthClients> false </checkAuthClients> <checkAuthUsers> false </checkAuthUsers> </handler> @@ -107,7 +107,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.core.filter.fastfail.ValidSenderDomainHandler"> + <handler class="org.apache.james.smtpserver.core.fastfail.ValidSenderDomainHandler"> <checkAuthClients> false </checkAuthClients> <checkAuthUsers> false </checkAuthUsers> </handler> @@ -118,7 +118,7 @@ <!-- 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.core.filter.fastfail.ValidRcptHandler"> + <handler class="org.apache.james.smtpserver.core.fastfail.ValidRcptHandler"> <validRecipients> </validRecipients> <validDomains> </validDomains> <validRegexPattern> </validRegexPattern> @@ -127,7 +127,7 @@ <!-- If activated you can limit the maximal recipients --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.MaxRcptHandler"> + <handler class="org.apache.james.smtpserver.core.fastfail.MaxRcptHandler"> <maxRcpt> 10 </maxRcpt> </handler> --> @@ -135,7 +135,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.core.filter.fastfail.GreylistHandler"> + <handler class="org.apache.james.smtpserver.integration.GreylistHandler"> <repositoryPath> db://maildb </repositoryPath> <sqlFile>file://conf/sqlResources.xml</sqlFile> <tempBlockTime> 1 hour </tempBlockTime> @@ -150,7 +150,7 @@ <!-- Default is set to 0 (disabled). --> <!-- You can also configure the time to sleep in milliseconds --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.TarpitHandler"> + <handler class="org.apache.james.smtpserver.core.fastfail.TarpitHandler"> <tarpitRcptCount> 5 </tarpitRcptCount> <tarpitSleepTime> 5000 </tarpitSleepTime> </handler> @@ -159,7 +159,7 @@ <!-- This handler ignore duplicated recipients per session. So the email will get only send on time even --> <!-- if the recipient is specified more then once --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.SuppressDuplicateRcptHandler"/> + <handler class="org.apache.james.smtpserver.core.fastfail.SuppressDuplicateRcptHandler"/> --> <!-- Load the core command handlers --> @@ -171,7 +171,7 @@ <!-- 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.core.filter.fastfail.SpamAssassinHandler"> + <handler class="org.apache.james.smtpserver.core.fastfail.SpamAssassinHandler"> <spamdHost> 127.0.0.1 </spamdHost> <spamdPort> 783 </spamdPort> <spamdRejectionHits> 10 </spamdRejectionHits> @@ -183,7 +183,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.core.filter.fastfail.URIRBLHandler"> + <handler class="org.apache.james.smtpserver.core.fastfail.URIRBLHandler"> <action> reject </action> <getDetail> true </getDetail> <checkAuthNetworks> false </checkAuthNetworks> Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/DNSRBLHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/DNSRBLHandler.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/DNSRBLHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java Sun Oct 18 15:03:58 2009 @@ -19,7 +19,7 @@ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import java.util.ArrayList; import java.util.Collection; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/MaxRcptHandler.java (from r826452, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/MaxRcptHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/MaxRcptHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/MaxRcptHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/MaxRcptHandler.java&r1=826452&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/MaxRcptHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/MaxRcptHandler.java Sun Oct 18 15:03:58 2009 @@ -19,7 +19,7 @@ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import org.apache.commons.configuration.Configuration; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandler.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ResolvableEhloHeloHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ResolvableEhloHeloHandler.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ResolvableEhloHeloHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ResolvableEhloHeloHandler.java Sun Oct 18 15:03:58 2009 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import java.net.UnknownHostException; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ReverseEqualsEhloHeloHandler.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ReverseEqualsEhloHeloHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ReverseEqualsEhloHeloHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ReverseEqualsEhloHeloHandler.java Sun Oct 18 15:03:58 2009 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import org.apache.james.smtpserver.protocol.SMTPSession; @@ -28,7 +28,7 @@ public class ReverseEqualsEhloHeloHandler extends ResolvableEhloHeloHandler { /** - * @see org.apache.james.smtpserver.protocol.core.filter.fastfail.ResolvableEhloHeloHandler#isBadHelo(org.apache.james.smtpserver.protocol.SMTPSession, java.lang.String) + * @see org.apache.james.smtpserver.protocol.core.fastfail.ResolvableEhloHeloHandler#isBadHelo(org.apache.james.smtpserver.protocol.SMTPSession, java.lang.String) */ protected boolean isBadHelo(SMTPSession session, String argument) { try { Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SPFHandler.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SPFHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SPFHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SPFHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SPFHandler.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SPFHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SPFHandler.java Sun Oct 18 15:03:58 2009 @@ -19,7 +19,7 @@ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamAssassinHandler.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamAssassinHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamAssassinHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamAssassinHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamAssassinHandler.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamAssassinHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamAssassinHandler.java Sun Oct 18 15:03:58 2009 @@ -18,7 +18,7 @@ ****************************************************************/ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import java.util.Iterator; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandler.java (from r826452, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamTrapHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamTrapHandler.java&r1=826452&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SpamTrapHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SpamTrapHandler.java Sun Oct 18 15:03:58 2009 @@ -18,7 +18,7 @@ ****************************************************************/ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import java.util.ArrayList; import java.util.Collection; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SupressDuplicateRcptHandler.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SupressDuplicateRcptHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SupressDuplicateRcptHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SupressDuplicateRcptHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SupressDuplicateRcptHandler.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SupressDuplicateRcptHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/SupressDuplicateRcptHandler.java Sun Oct 18 15:03:58 2009 @@ -20,7 +20,7 @@ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import java.util.Collection; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TLDLookup.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TLDLookup.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TLDLookup.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TLDLookup.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TLDLookup.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TLDLookup.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TLDLookup.java Sun Oct 18 15:03:58 2009 @@ -20,7 +20,7 @@ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import java.util.HashSet; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandler.java (from r826452, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java&r1=826452&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/TarpitHandler.java Sun Oct 18 15:03:58 2009 @@ -19,7 +19,7 @@ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import org.apache.commons.configuration.Configuration; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/URIRBLHandler.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/URIRBLHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/URIRBLHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/URIRBLHandler.java Sun Oct 18 15:03:58 2009 @@ -20,7 +20,7 @@ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import java.io.IOException; import java.net.UnknownHostException; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/URIScanner.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIScanner.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/URIScanner.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/URIScanner.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIScanner.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIScanner.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/URIScanner.java Sun Oct 18 15:03:58 2009 @@ -20,7 +20,7 @@ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import java.net.URI; import java.net.URISyntaxException; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptHandler.java (from r826452, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java&r1=826452&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptHandler.java Sun Oct 18 15:03:58 2009 @@ -20,7 +20,7 @@ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import java.util.ArrayList; import java.util.Collection; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptMX.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptMX.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptMX.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidRcptMX.java Sun Oct 18 15:03:58 2009 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import java.net.UnknownHostException; import java.util.ArrayList; Copied: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidSenderDomainHandler.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidSenderDomainHandler.java?p2=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidSenderDomainHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java (original) +++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/ValidSenderDomainHandler.java Sun Oct 18 15:03:58 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.fastfail; import java.util.Collection; Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/GreylistHandler.java (from r826451, james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/GreylistHandler.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/GreylistHandler.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/GreylistHandler.java&p1=james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/GreylistHandler.java&r1=826451&r2=826459&rev=826459&view=diff ============================================================================== --- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/GreylistHandler.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/GreylistHandler.java Sun Oct 18 15:03:58 2009 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.protocol.core.filter.fastfail; +package org.apache.james.smtpserver.integration; import java.io.File; import java.sql.Connection; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java Sun Oct 18 15:03:58 2009 @@ -42,7 +42,7 @@ import org.apache.james.api.dnsservice.AbstractDNSServer; import org.apache.james.api.dnsservice.DNSService; import org.apache.james.smtpserver.protocol.SMTPSession; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.DNSRBLHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.DNSRBLHandler; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.MailAddress; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java Sun Oct 18 15:03:58 2009 @@ -31,7 +31,7 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.james.smtpserver.protocol.SMTPSession; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.MaxRcptHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.MaxRcptHandler; import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.smtpserver.protocol.hook.RcptHook; import org.apache.james.test.mock.avalon.MockLogger; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java Sun Oct 18 15:03:58 2009 @@ -34,7 +34,7 @@ import org.apache.james.api.dnsservice.AbstractDNSServer; import org.apache.james.api.dnsservice.DNSService; import org.apache.james.smtpserver.protocol.SMTPSession; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.ResolvableEhloHeloHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.ResolvableEhloHeloHandler; import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.MailAddress; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java Sun Oct 18 15:03:58 2009 @@ -24,11 +24,11 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.james.smtpserver.integration.CoreCmdHandlerLoader; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.DNSRBLHandler; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.MaxRcptHandler; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.ResolvableEhloHeloHandler; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.ReverseEqualsEhloHeloHandler; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.ValidSenderDomainHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.DNSRBLHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.MaxRcptHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.ResolvableEhloHeloHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.ReverseEqualsEhloHeloHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.ValidSenderDomainHandler; import org.apache.james.test.mock.util.AttrValConfiguration; import org.apache.james.test.util.Util; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java Sun Oct 18 15:03:58 2009 @@ -30,7 +30,7 @@ import org.apache.james.jspf.core.DNSService; import org.apache.james.jspf.core.exceptions.TimeoutException; import org.apache.james.smtpserver.protocol.SMTPSession; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.SPFHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.SPFHandler; import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.base.test.FakeMail; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java Sun Oct 18 15:03:58 2009 @@ -31,7 +31,7 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.james.smtpserver.protocol.SMTPSession; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.SpamAssassinHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.SpamAssassinHandler; import org.apache.james.smtpserver.protocol.hook.HookResult; import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.MockMimeMessage; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java Sun Oct 18 15:03:58 2009 @@ -26,7 +26,7 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.james.smtpserver.protocol.SMTPSession; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.SpamTrapHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.SpamTrapHandler; import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.MailAddress; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java Sun Oct 18 15:03:58 2009 @@ -22,7 +22,7 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.james.smtpserver.protocol.SMTPSession; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.TarpitHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.TarpitHandler; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.MailAddress; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java Sun Oct 18 15:03:58 2009 @@ -42,7 +42,7 @@ import org.apache.james.api.dnsservice.AbstractDNSServer; import org.apache.james.api.dnsservice.DNSService; import org.apache.james.smtpserver.protocol.SMTPSession; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.URIRBLHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.URIRBLHandler; import org.apache.james.smtpserver.protocol.hook.HookResult; import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.MockMimeMessage; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Sun Oct 18 15:03:58 2009 @@ -36,7 +36,7 @@ import org.apache.james.api.vut.VirtualUserTableStore; import org.apache.james.smtpserver.protocol.SMTPConfiguration; import org.apache.james.smtpserver.protocol.SMTPSession; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.ValidRcptHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.ValidRcptHandler; import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.james.test.mock.james.MockVirtualUserTableStore; 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=826459&r1=826458&r2=826459&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 Sun Oct 18 15:03:58 2009 @@ -32,7 +32,7 @@ import org.apache.james.api.dnsservice.AbstractDNSServer; import org.apache.james.api.dnsservice.DNSService; import org.apache.james.smtpserver.protocol.SMTPSession; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.ValidRcptMX; +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; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java?rev=826459&r1=826458&r2=826459&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java Sun Oct 18 15:03:58 2009 @@ -32,7 +32,7 @@ import org.apache.james.api.dnsservice.AbstractDNSServer; import org.apache.james.api.dnsservice.DNSService; import org.apache.james.smtpserver.protocol.SMTPSession; -import org.apache.james.smtpserver.protocol.core.filter.fastfail.ValidSenderDomainHandler; +import org.apache.james.smtpserver.protocol.core.fastfail.ValidSenderDomainHandler; 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-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org