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/10 17:53:30 UTC
svn commit: r684527 - in /james/server/trunk:
avalon-user-function/src/main/java/org/apache/james/userrepository/
avalon-user-function/src/main/java/org/apache/james/vut/
avalon-user-function/src/test/resources/
core-library/src/main/java/org/apache/ja...
Author: bago
Date: Sun Aug 10 08:53:29 2008
New Revision: 684527
URL: http://svn.apache.org/viewvc?rev=684527&view=rev
Log:
Repackaging utils.
created bayesia, codec and sql subpackages to util and classified utilities.
Added:
james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/
james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java (contents, props changed)
- copied, changed from r684501, james/server/trunk/core-library/src/main/java/org/apache/james/util/BayesianAnalyzer.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java (contents, props changed)
- copied, changed from r684501, james/server/trunk/core-library/src/main/java/org/apache/james/util/JDBCBayesianAnalyzer.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/codec/
james/server/trunk/core-library/src/main/java/org/apache/james/util/codec/Base64.java (contents, props changed)
- copied, changed from r684501, james/server/trunk/core-library/src/main/java/org/apache/james/util/Base64.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/
james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/JDBCUtil.java (contents, props changed)
- copied, changed from r684501, james/server/trunk/core-library/src/main/java/org/apache/james/util/JDBCUtil.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/SqlResources.java (contents, props changed)
- copied, changed from r684501, james/server/trunk/core-library/src/main/java/org/apache/james/util/SqlResources.java
Removed:
james/server/trunk/core-library/src/main/java/org/apache/james/util/Base64.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/BayesianAnalyzer.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/JDBCBayesianAnalyzer.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/JDBCUtil.java
james/server/trunk/core-library/src/main/java/org/apache/james/util/SqlResources.java
Modified:
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/avalon-user-function/src/test/resources/sqlResources.xml
james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java
james/server/trunk/core-library/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
james/server/trunk/core-library/src/test/resources/sqlResources.xml
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java
james/server/trunk/phoenix-deployment/src/conf/sqlResources.xml
james/server/trunk/phoenix-deployment/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AuthCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/server/trunk/spring-deployment/src/main/config/james/sqlResources.xml
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java Sun Aug 10 08:53:29 2008
@@ -31,8 +31,8 @@
import org.apache.james.api.user.User;
import org.apache.james.impl.jamesuser.AbstractUsersRepository;
import org.apache.james.services.FileSystem;
-import org.apache.james.util.JDBCUtil;
-import org.apache.james.util.SqlResources;
+import org.apache.james.util.sql.JDBCUtil;
+import org.apache.james.util.sql.SqlResources;
import java.io.InputStream;
import java.sql.Connection;
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java Sun Aug 10 08:53:29 2008
@@ -47,8 +47,8 @@
import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.impl.vut.VirtualUserTableUtil;
import org.apache.james.services.FileSystem;
-import org.apache.james.util.JDBCUtil;
-import org.apache.james.util.SqlResources;
+import org.apache.james.util.sql.JDBCUtil;
+import org.apache.james.util.sql.SqlResources;
/**
*
Modified: james/server/trunk/avalon-user-function/src/test/resources/sqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/resources/sqlResources.xml?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/resources/sqlResources.xml (original)
+++ james/server/trunk/avalon-user-function/src/test/resources/sqlResources.xml Sun Aug 10 08:53:29 2008
@@ -656,7 +656,7 @@
<!-- SQL statements to support the BayesianAnalysis and the BayesianAnalysisFeeder mailets -->
<!-- -->
-<sqlDefs name="org.apache.james.util.JDBCBayesianAnalyzer">
+<sqlDefs name="org.apache.james.util.bayesian.JDBCBayesianAnalyzer">
<sql name="hamTableName">bayesiananalysis_ham</sql>
<sql name="spamTableName">bayesiananalysis_spam</sql>
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/domain/JDBCDomainList.java Sun Aug 10 08:53:29 2008
@@ -42,8 +42,8 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.services.FileSystem;
-import org.apache.james.util.JDBCUtil;
-import org.apache.james.util.SqlResources;
+import org.apache.james.util.sql.JDBCUtil;
+import org.apache.james.util.sql.SqlResources;
/**
* Allow to query a costum table for domains
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java Sun Aug 10 08:53:29 2008
@@ -33,8 +33,8 @@
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageWrapper;
import org.apache.james.services.FileSystem;
-import org.apache.james.util.JDBCUtil;
-import org.apache.james.util.SqlResources;
+import org.apache.james.util.sql.JDBCUtil;
+import org.apache.james.util.sql.SqlResources;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java Sun Aug 10 08:53:29 2008
@@ -23,7 +23,7 @@
import org.apache.avalon.cornerstone.services.store.StreamRepository;
import org.apache.james.core.MimeMessageSource;
-import org.apache.james.util.JDBCUtil;
+import org.apache.james.util.sql.JDBCUtil;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java Sun Aug 10 08:53:29 2008
@@ -48,7 +48,7 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.services.BayesianAnalyzerManagementService;
import org.apache.james.services.FileSystem;
-import org.apache.james.util.JDBCBayesianAnalyzer;
+import org.apache.james.util.bayesian.JDBCBayesianAnalyzer;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
Copied: james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java (from r684501, james/server/trunk/core-library/src/main/java/org/apache/james/util/BayesianAnalyzer.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/BayesianAnalyzer.java&r1=684501&r2=684527&rev=684527&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/util/BayesianAnalyzer.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java Sun Aug 10 08:53:29 2008
@@ -19,7 +19,7 @@
-package org.apache.james.util;
+package org.apache.james.util.bayesian;
import java.util.Map;
import java.util.Set;
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java (from r684501, james/server/trunk/core-library/src/main/java/org/apache/james/util/JDBCBayesianAnalyzer.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/JDBCBayesianAnalyzer.java&r1=684501&r2=684527&rev=684527&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/util/JDBCBayesianAnalyzer.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java Sun Aug 10 08:53:29 2008
@@ -19,7 +19,10 @@
-package org.apache.james.util;
+package org.apache.james.util.bayesian;
+
+import org.apache.james.util.sql.JDBCUtil;
+import org.apache.james.util.sql.SqlResources;
import java.util.HashMap;
import java.util.Iterator;
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: james/server/trunk/core-library/src/main/java/org/apache/james/util/codec/Base64.java (from r684501, james/server/trunk/core-library/src/main/java/org/apache/james/util/Base64.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/util/codec/Base64.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/util/codec/Base64.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/Base64.java&r1=684501&r2=684527&rev=684527&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/util/Base64.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/util/codec/Base64.java Sun Aug 10 08:53:29 2008
@@ -19,7 +19,7 @@
-package org.apache.james.util;
+package org.apache.james.util.codec;
import javax.mail.MessagingException;
import javax.mail.internet.MimeUtility;
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/codec/Base64.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.5.4.3
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/codec/Base64.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/codec/Base64.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/JDBCUtil.java (from r684501, james/server/trunk/core-library/src/main/java/org/apache/james/util/JDBCUtil.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/JDBCUtil.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/JDBCUtil.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/JDBCUtil.java&r1=684501&r2=684527&rev=684527&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/util/JDBCUtil.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/JDBCUtil.java Sun Aug 10 08:53:29 2008
@@ -19,7 +19,7 @@
-package org.apache.james.util;
+package org.apache.james.util.sql;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/JDBCUtil.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2.4.4
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/JDBCUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/JDBCUtil.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/SqlResources.java (from r684501, james/server/trunk/core-library/src/main/java/org/apache/james/util/SqlResources.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/SqlResources.java?p2=james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/SqlResources.java&p1=james/server/trunk/core-library/src/main/java/org/apache/james/util/SqlResources.java&r1=684501&r2=684527&rev=684527&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/util/SqlResources.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/SqlResources.java Sun Aug 10 08:53:29 2008
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.util;
+package org.apache.james.util.sql;
import org.apache.oro.text.perl.MalformedPerl5PatternException;
import org.apache.oro.text.perl.Perl5Util;
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/SqlResources.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.5.4.6
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/SqlResources.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/core-library/src/main/java/org/apache/james/util/sql/SqlResources.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/domain/JDBCDomainListTest.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/domain/JDBCDomainListTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/domain/JDBCDomainListTest.java Sun Aug 10 08:53:29 2008
@@ -43,7 +43,7 @@
import org.apache.james.test.mock.avalon.MockServiceManager;
import org.apache.james.test.mock.james.MockFileSystem;
import org.apache.james.test.util.Util;
-import org.apache.james.util.JDBCUtil;
+import org.apache.james.util.sql.JDBCUtil;
public class JDBCDomainListTest extends TestCase {
private String repos = "db://maildb/";
Modified: james/server/trunk/core-library/src/test/resources/sqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/resources/sqlResources.xml?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/resources/sqlResources.xml (original)
+++ james/server/trunk/core-library/src/test/resources/sqlResources.xml Sun Aug 10 08:53:29 2008
@@ -656,7 +656,7 @@
<!-- SQL statements to support the BayesianAnalysis and the BayesianAnalysisFeeder mailets -->
<!-- -->
-<sqlDefs name="org.apache.james.util.JDBCBayesianAnalyzer">
+<sqlDefs name="org.apache.james.util.bayesian.JDBCBayesianAnalyzer">
<sql name="hamTableName">bayesiananalysis_ham</sql>
<sql name="spamTableName">bayesiananalysis_spam</sql>
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java Sun Aug 10 08:53:29 2008
@@ -25,8 +25,8 @@
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.util.JDBCBayesianAnalyzer;
-import org.apache.james.util.JDBCUtil;
+import org.apache.james.util.bayesian.JDBCBayesianAnalyzer;
+import org.apache.james.util.sql.JDBCUtil;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.RFC2822Headers;
@@ -101,8 +101,8 @@
* <P>The required tables are automatically created if not already there (see sqlResources.xml).
* The token field in both the ham and spam tables is <B>case sensitive</B>.</P>
* @see BayesianAnalysisFeeder
- * @see org.apache.james.util.BayesianAnalyzer
- * @see org.apache.james.util.JDBCBayesianAnalyzer
+ * @see org.apache.james.util.bayesian.BayesianAnalyzer
+ * @see org.apache.james.util.bayesian.JDBCBayesianAnalyzer
* @version CVS $Revision$ $Date$
* @since 2.3.0
*/
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java Sun Aug 10 08:53:29 2008
@@ -38,9 +38,9 @@
import org.apache.james.Constants;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
-import org.apache.james.util.JDBCUtil;
-import org.apache.james.util.JDBCBayesianAnalyzer;
+import org.apache.james.util.bayesian.JDBCBayesianAnalyzer;
+import org.apache.james.util.sql.JDBCUtil;
/**
* <P>Feeds ham OR spam messages to train the {@link BayesianAnalysis} mailet.</P>
@@ -101,8 +101,8 @@
* in order to avoid too much database locking,
* as thousands of rows may be updated just for one message fed.</p>
* @see BayesianAnalysis
- * @see org.apache.james.util.BayesianAnalyzer
- * @see org.apache.james.util.JDBCBayesianAnalyzer
+ * @see org.apache.james.util.bayesian.BayesianAnalyzer
+ * @see org.apache.james.util.bayesian.JDBCBayesianAnalyzer
* @version CVS $Revision$ $Date$
* @since 2.3.0
*/
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java Sun Aug 10 08:53:29 2008
@@ -25,7 +25,7 @@
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.util.JDBCUtil;
+import org.apache.james.util.sql.JDBCUtil;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java Sun Aug 10 08:53:29 2008
@@ -25,7 +25,7 @@
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
-import org.apache.james.util.JDBCUtil;
+import org.apache.james.util.sql.JDBCUtil;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetException;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java Sun Aug 10 08:53:29 2008
@@ -26,7 +26,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
import org.apache.james.impl.vut.VirtualUserTableUtil;
-import org.apache.james.util.JDBCUtil;
+import org.apache.james.util.sql.JDBCUtil;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetException;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java Sun Aug 10 08:53:29 2008
@@ -27,8 +27,8 @@
import org.apache.james.Constants;
import org.apache.james.api.user.JamesUser;
import org.apache.james.api.user.UsersRepository;
-import org.apache.james.util.JDBCUtil;
-import org.apache.james.util.SqlResources;
+import org.apache.james.util.sql.JDBCUtil;
+import org.apache.james.util.sql.SqlResources;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java Sun Aug 10 08:53:29 2008
@@ -28,8 +28,8 @@
import org.apache.james.api.user.JamesUser;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.WhiteListManager;
-import org.apache.james.util.JDBCUtil;
-import org.apache.james.util.SqlResources;
+import org.apache.james.util.sql.JDBCUtil;
+import org.apache.james.util.sql.SqlResources;
import org.apache.mailet.GenericMatcher;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java (original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java Sun Aug 10 08:53:29 2008
@@ -21,7 +21,7 @@
package org.apache.james.nntpserver.repository;
-import org.apache.james.util.Base64;
+import org.apache.james.util.codec.Base64;
import java.io.File;
import java.io.FileInputStream;
Modified: james/server/trunk/phoenix-deployment/src/conf/sqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/sqlResources.xml?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/sqlResources.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/sqlResources.xml Sun Aug 10 08:53:29 2008
@@ -656,7 +656,7 @@
<!-- SQL statements to support the BayesianAnalysis and the BayesianAnalysisFeeder mailets -->
<!-- -->
-<sqlDefs name="org.apache.james.util.JDBCBayesianAnalyzer">
+<sqlDefs name="org.apache.james.util.bayesian.JDBCBayesianAnalyzer">
<sql name="hamTableName">bayesiananalysis_ham</sql>
<sql name="spamTableName">bayesiananalysis_spam</sql>
Modified: james/server/trunk/phoenix-deployment/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java (original)
+++ james/server/trunk/phoenix-deployment/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java Sun Aug 10 08:53:29 2008
@@ -46,7 +46,7 @@
import org.apache.james.mailboxmanager.torque.om.MessageHeaderPeer;
import org.apache.james.mailboxmanager.torque.om.MessageRowPeer;
import org.apache.james.services.FileSystem;
-import org.apache.james.util.SqlResources;
+import org.apache.james.util.sql.SqlResources;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
import org.apache.torque.util.BasePeer;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AuthCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AuthCmdHandler.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AuthCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/AuthCmdHandler.java Sun Aug 10 08:53:29 2008
@@ -23,6 +23,7 @@
import org.apache.james.smtpserver.CommandHandler;
import org.apache.james.smtpserver.SMTPSession;
+import org.apache.james.util.codec.Base64;
import org.apache.james.util.mail.dsn.DSNStatus;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
@@ -30,7 +31,6 @@
import java.util.Collection;
import java.util.Locale;
import java.util.StringTokenizer;
-import org.apache.james.util.Base64;
import java.io.IOException;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java Sun Aug 10 08:53:29 2008
@@ -48,11 +48,11 @@
import org.apache.james.services.FileSystem;
import org.apache.james.smtpserver.CommandHandler;
import org.apache.james.smtpserver.SMTPSession;
-import org.apache.james.util.JDBCUtil;
-import org.apache.james.util.SqlResources;
import org.apache.james.util.TimeConverter;
import org.apache.james.util.dnsservice.NetMatcher;
import org.apache.james.util.mail.dsn.DSNStatus;
+import org.apache.james.util.sql.JDBCUtil;
+import org.apache.james.util.sql.SqlResources;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java Sun Aug 10 08:53:29 2008
@@ -38,7 +38,7 @@
import org.apache.james.test.mock.mailet.MockMailContext;
import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
-import org.apache.james.util.Base64;
+import org.apache.james.util.codec.Base64;
import org.apache.james.util.connection.SimpleConnectionManager;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/spring-deployment/src/main/config/james/sqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/sqlResources.xml?rev=684527&r1=684526&r2=684527&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/sqlResources.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/sqlResources.xml Sun Aug 10 08:53:29 2008
@@ -656,7 +656,7 @@
<!-- SQL statements to support the BayesianAnalysis and the BayesianAnalysisFeeder mailets -->
<!-- -->
-<sqlDefs name="org.apache.james.util.JDBCBayesianAnalyzer">
+<sqlDefs name="org.apache.james.util.bayesian.JDBCBayesianAnalyzer">
<sql name="hamTableName">bayesiananalysis_ham</sql>
<sql name="spamTableName">bayesiananalysis_spam</sql>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org