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 ba...@apache.org on 2008/08/11 16:07:25 UTC
svn commit: r684753 - in /james/server/trunk/smtpserver-function/src:
main/java/org/apache/james/smtpserver/core/filter/fastfail/
main/java/org/apache/james/smtpserver/junkscore/
main/java/org/apache/james/smtpserver/urirbl/ main/java/org/apache/james/...
Author: bago
Date: Mon Aug 11 07:07:22 2008
New Revision: 684753
URL: http://svn.apache.org/viewvc?rev=684753&view=rev
Log:
Moved smtpserver-function/o.a.j.util.junkscore and util.urirbl to private smtpserver subpackages.
Added:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/ComposedJunkScore.java (contents, props changed)
- copied, changed from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/ComposedJunkScore.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScore.java (contents, props changed)
- copied, changed from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScore.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtil.java (contents, props changed)
- copied, changed from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScoreConfigUtil.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreImpl.java (contents, props changed)
- copied, changed from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScoreImpl.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/urirbl/
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/urirbl/TLDLookup.java
- copied, changed from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/urirbl/TLDLookup.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/urirbl/URIScanner.java
- copied, changed from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/urirbl/URIScanner.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/ComposedJunkScoreTest.java (contents, props changed)
- copied, changed from r684545, james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/ComposedJunkScoreTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtilTest.java (contents, props changed)
- copied, changed from r684545, james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/JunkScoreConfigUtilTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreImplTest.java (contents, props changed)
- copied, changed from r684545, james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/JunkScoreImplTest.java
Removed:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/urirbl/
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java
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/JunkScoreHandlerTest.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/SPFHandlerTest.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/ValidRcptMXTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java?rev=684753&r1=684752&r2=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractJunkHandler.java Mon Aug 11 07:07:22 2008
@@ -26,8 +26,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.smtpserver.SMTPSession;
-import org.apache.james.util.junkscore.JunkScore;
-import org.apache.james.util.junkscore.JunkScoreConfigUtil;
+import org.apache.james.smtpserver.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScoreConfigUtil;
/**
*
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java?rev=684753&r1=684752&r2=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/DNSRBLHandler.java Mon Aug 11 07:07:22 2008
@@ -31,7 +31,7 @@
import org.apache.james.smtpserver.CommandHandler;
import org.apache.james.smtpserver.ConnectHandler;
import org.apache.james.smtpserver.SMTPSession;
-import org.apache.james.util.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScore;
import org.apache.james.util.mail.dsn.DSNStatus;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java?rev=684753&r1=684752&r2=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/JunkScoreHandler.java Mon Aug 11 07:07:22 2008
@@ -35,9 +35,9 @@
import org.apache.james.smtpserver.ConnectHandler;
import org.apache.james.smtpserver.MessageHandler;
import org.apache.james.smtpserver.SMTPSession;
-import org.apache.james.util.junkscore.ComposedJunkScore;
-import org.apache.james.util.junkscore.JunkScore;
-import org.apache.james.util.junkscore.JunkScoreImpl;
+import org.apache.james.smtpserver.junkscore.ComposedJunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
import org.apache.james.util.mail.dsn.DSNStatus;
/**
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java?rev=684753&r1=684752&r2=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java Mon Aug 11 07:07:22 2008
@@ -28,7 +28,7 @@
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.smtpserver.CommandHandler;
import org.apache.james.smtpserver.SMTPSession;
-import org.apache.james.util.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScore;
import org.apache.james.util.mail.dsn.DSNStatus;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java?rev=684753&r1=684752&r2=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/URIRBLHandler.java Mon Aug 11 07:07:22 2008
@@ -44,8 +44,8 @@
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.smtpserver.MessageHandler;
import org.apache.james.smtpserver.SMTPSession;
+import org.apache.james.smtpserver.urirbl.URIScanner;
import org.apache.james.util.mail.dsn.DSNStatus;
-import org.apache.james.util.urirbl.URIScanner;
/**
* Extract domains from message and check against URIRBLServer. For more informations see http://www.surbl.org
Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/ComposedJunkScore.java (from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/ComposedJunkScore.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/ComposedJunkScore.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/ComposedJunkScore.java&p1=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/ComposedJunkScore.java&r1=684545&r2=684753&rev=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/ComposedJunkScore.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/ComposedJunkScore.java Mon Aug 11 07:07:22 2008
@@ -19,7 +19,7 @@
-package org.apache.james.util.junkscore;
+package org.apache.james.smtpserver.junkscore;
import java.util.HashMap;
import java.util.Map;
@@ -47,7 +47,7 @@
}
/**
- * @see org.apache.james.util.junkscore.JunkScore#getCompleteStoredScores()
+ * @see org.apache.james.smtpserver.junkscore.JunkScore#getCompleteStoredScores()
*/
public double getCompleteStoredScores() {
return (score1.getCompleteStoredScores() + score2.getCompleteStoredScores());
@@ -55,14 +55,14 @@
/**
- * @see org.apache.james.util.junkscore.JunkScore#getStoredScore(java.lang.String)
+ * @see org.apache.james.smtpserver.junkscore.JunkScore#getStoredScore(java.lang.String)
*/
public double getStoredScore(String key) {
return (score1.getStoredScore(key) + score2.getStoredScore(key));
}
/**
- * @see org.apache.james.util.junkscore.JunkScore#getStoredScores()
+ * @see org.apache.james.smtpserver.junkscore.JunkScore#getStoredScores()
*/
public Map getStoredScores() {
// copy the Map
@@ -72,7 +72,7 @@
}
/**
- * @see org.apache.james.util.junkscore.JunkScore#resetStoredScores()
+ * @see org.apache.james.smtpserver.junkscore.JunkScore#resetStoredScores()
*/
public double resetStoredScores() {
return (score1.resetStoredScores() + score2.resetStoredScores());
Propchange: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/ComposedJunkScore.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScore.java (from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScore.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScore.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScore.java&p1=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScore.java&r1=684545&r2=684753&rev=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScore.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScore.java Mon Aug 11 07:07:22 2008
@@ -20,7 +20,7 @@
-package org.apache.james.util.junkscore;
+package org.apache.james.smtpserver.junkscore;
import java.util.Map;
Propchange: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScore.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtil.java (from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScoreConfigUtil.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtil.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtil.java&p1=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScoreConfigUtil.java&r1=684545&r2=684753&rev=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScoreConfigUtil.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtil.java Mon Aug 11 07:07:22 2008
@@ -20,7 +20,7 @@
-package org.apache.james.util.junkscore;
+package org.apache.james.smtpserver.junkscore;
/**
* Utility class for providing static method for JunkScore configuration
Propchange: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreImpl.java (from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScoreImpl.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreImpl.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreImpl.java&p1=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScoreImpl.java&r1=684545&r2=684753&rev=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/junkscore/JunkScoreImpl.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreImpl.java Mon Aug 11 07:07:22 2008
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.util.junkscore;
+package org.apache.james.smtpserver.junkscore;
import java.util.HashMap;
import java.util.Iterator;
@@ -36,7 +36,7 @@
private Map scoreMap = new HashMap();
/**
- * @see org.apache.james.util.junkscore.JunkScore#getCompleteStoredScores()
+ * @see org.apache.james.smtpserver.junkscore.JunkScore#getCompleteStoredScores()
*/
public double getCompleteStoredScores() {
double count = 0;
@@ -50,7 +50,7 @@
/**
- * @see org.apache.james.util.junkscore.JunkScore#getStoredScores()
+ * @see org.apache.james.smtpserver.junkscore.JunkScore#getStoredScores()
*/
public Map getStoredScores() {
// Get sure we return a copy of the Map so it can not get wrong objects added
@@ -59,7 +59,7 @@
/**
- * @see org.apache.james.util.junkscore.JunkScore#getStoredScore(java.lang.String)
+ * @see org.apache.james.smtpserver.junkscore.JunkScore#getStoredScore(java.lang.String)
*/
public double getStoredScore(String key) {
Double s = (Double) scoreMap.get(key);
@@ -71,7 +71,7 @@
}
/**
- * @see org.apache.james.util.junkscore.JunkScore#setStoredScore(java.lang.String, double)
+ * @see org.apache.james.smtpserver.junkscore.JunkScore#setStoredScore(java.lang.String, double)
*/
public double setStoredScore(String key, double score) {
Double s = (Double) scoreMap.put(key, new Double(score));
@@ -83,7 +83,7 @@
}
/**
- * @see org.apache.james.util.junkscore.JunkScore#resetStoredScores()
+ * @see org.apache.james.smtpserver.junkscore.JunkScore#resetStoredScores()
*/
public double resetStoredScores() {
double oldSum = getCompleteStoredScores();
Propchange: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/junkscore/JunkScoreImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/urirbl/TLDLookup.java (from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/urirbl/TLDLookup.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/urirbl/TLDLookup.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/urirbl/TLDLookup.java&p1=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/urirbl/TLDLookup.java&r1=684545&r2=684753&rev=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/urirbl/TLDLookup.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/urirbl/TLDLookup.java Mon Aug 11 07:07:22 2008
@@ -20,7 +20,7 @@
-package org.apache.james.util.urirbl;
+package org.apache.james.smtpserver.urirbl;
import java.util.HashSet;
Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/urirbl/URIScanner.java (from r684545, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/urirbl/URIScanner.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/urirbl/URIScanner.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/urirbl/URIScanner.java&p1=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/urirbl/URIScanner.java&r1=684545&r2=684753&rev=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/util/urirbl/URIScanner.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/urirbl/URIScanner.java Mon Aug 11 07:07:22 2008
@@ -20,7 +20,7 @@
-package org.apache.james.util.urirbl;
+package org.apache.james.smtpserver.urirbl;
import java.util.HashSet;
import java.util.Iterator;
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=684753&r1=684752&r2=684753&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 Mon Aug 11 07:07:22 2008
@@ -37,9 +37,9 @@
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.services.AbstractDNSServer;
import org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler;
+import org.apache.james.smtpserver.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.util.junkscore.JunkScore;
-import org.apache.james.util.junkscore.JunkScoreImpl;
import org.apache.mailet.MailAddress;
import junit.framework.TestCase;
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/JunkScoreHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/JunkScoreHandlerTest.java?rev=684753&r1=684752&r2=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/JunkScoreHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/JunkScoreHandlerTest.java Mon Aug 11 07:07:22 2008
@@ -29,10 +29,10 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.smtpserver.core.filter.fastfail.JunkScoreHandler;
+import org.apache.james.smtpserver.junkscore.JunkScore;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.util.junkscore.JunkScore;
import org.apache.mailet.Mail;
import junit.framework.TestCase;
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=684753&r1=684752&r2=684753&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 Mon Aug 11 07:07:22 2008
@@ -29,9 +29,9 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.smtpserver.core.filter.fastfail.MaxRcptHandler;
+import org.apache.james.smtpserver.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.util.junkscore.JunkScore;
-import org.apache.james.util.junkscore.JunkScoreImpl;
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=684753&r1=684752&r2=684753&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 Mon Aug 11 07:07:22 2008
@@ -34,9 +34,9 @@
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.services.AbstractDNSServer;
import org.apache.james.smtpserver.core.filter.fastfail.ResolvableEhloHeloHandler;
+import org.apache.james.smtpserver.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.util.junkscore.JunkScore;
-import org.apache.james.util.junkscore.JunkScoreImpl;
import org.apache.mailet.MailAddress;
public class ResolvableEhloHeloHandlerTest extends TestCase {
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=684753&r1=684752&r2=684753&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 Mon Aug 11 07:07:22 2008
@@ -30,10 +30,10 @@
import org.apache.james.jspf.core.DNSService;
import org.apache.james.jspf.core.exceptions.TimeoutException;
import org.apache.james.smtpserver.core.filter.fastfail.SPFHandler;
+import org.apache.james.smtpserver.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.util.junkscore.JunkScore;
-import org.apache.james.util.junkscore.JunkScoreImpl;
import org.apache.mailet.Mail;
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=684753&r1=684752&r2=684753&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 Mon Aug 11 07:07:22 2008
@@ -42,11 +42,11 @@
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.services.AbstractDNSServer;
import org.apache.james.smtpserver.core.filter.fastfail.URIRBLHandler;
+import org.apache.james.smtpserver.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
import org.apache.james.test.mock.mailet.MockMail;
-import org.apache.james.util.junkscore.JunkScore;
-import org.apache.james.util.junkscore.JunkScoreImpl;
import org.apache.mailet.Mail;
public class URIRBLHandlerTest extends TestCase {
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=684753&r1=684752&r2=684753&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 Mon Aug 11 07:07:22 2008
@@ -32,9 +32,9 @@
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.services.AbstractDNSServer;
import org.apache.james.smtpserver.core.filter.fastfail.ValidRcptMX;
+import org.apache.james.smtpserver.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.util.junkscore.JunkScore;
-import org.apache.james.util.junkscore.JunkScoreImpl;
import org.apache.mailet.MailAddress;
import junit.framework.TestCase;
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=684753&r1=684752&r2=684753&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 Mon Aug 11 07:07:22 2008
@@ -30,9 +30,9 @@
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.services.AbstractDNSServer;
import org.apache.james.smtpserver.core.filter.fastfail.ValidSenderDomainHandler;
+import org.apache.james.smtpserver.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.util.junkscore.JunkScore;
-import org.apache.james.util.junkscore.JunkScoreImpl;
import org.apache.mailet.MailAddress;
import junit.framework.TestCase;
Copied: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/ComposedJunkScoreTest.java (from r684545, james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/ComposedJunkScoreTest.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/ComposedJunkScoreTest.java?p2=james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/ComposedJunkScoreTest.java&p1=james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/ComposedJunkScoreTest.java&r1=684545&r2=684753&rev=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/ComposedJunkScoreTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/ComposedJunkScoreTest.java Mon Aug 11 07:07:22 2008
@@ -19,7 +19,11 @@
-package org.apache.james.util.junkscore;
+package org.apache.james.smtpserver.junkscore;
+
+import org.apache.james.smtpserver.junkscore.ComposedJunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
import junit.framework.TestCase;
Propchange: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/ComposedJunkScoreTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtilTest.java (from r684545, james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/JunkScoreConfigUtilTest.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtilTest.java?p2=james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtilTest.java&p1=james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/JunkScoreConfigUtilTest.java&r1=684545&r2=684753&rev=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/JunkScoreConfigUtilTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtilTest.java Mon Aug 11 07:07:22 2008
@@ -20,7 +20,9 @@
-package org.apache.james.util.junkscore;
+package org.apache.james.smtpserver.junkscore;
+
+import org.apache.james.smtpserver.junkscore.JunkScoreConfigUtil;
import junit.framework.TestCase;
Propchange: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreConfigUtilTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreImplTest.java (from r684545, james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/JunkScoreImplTest.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreImplTest.java?p2=james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreImplTest.java&p1=james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/JunkScoreImplTest.java&r1=684545&r2=684753&rev=684753&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/util/junkscore/JunkScoreImplTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreImplTest.java Mon Aug 11 07:07:22 2008
@@ -19,7 +19,10 @@
-package org.apache.james.util.junkscore;
+package org.apache.james.smtpserver.junkscore;
+
+import org.apache.james.smtpserver.junkscore.JunkScore;
+import org.apache.james.smtpserver.junkscore.JunkScoreImpl;
import junit.framework.TestCase;
Propchange: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/junkscore/JunkScoreImplTest.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org