james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r1049986 - in /james/server/trunk: core/src/test/java/org/apache/james/services/ dnsservice-api/src/test/java/org/apache/james/dnsservice/api/ dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/ domainlist-api/src/test/java/o...
Date Thu, 16 Dec 2010 14:28:44 GMT
Author: norman
Date: Thu Dec 16 14:28:43 2010
New Revision: 1049986

URL: http://svn.apache.org/viewvc?rev=1049986&view=rev
Log:
move mock implementations in extra packages

Added:
    james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/
    james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/DNSFixture.java
      - copied, changed from r1049797, james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/DNSFixture.java
    james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/MockDNSService.java
      - copied, changed from r1049797, james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/MockDNSService.java
    james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/mock/
    james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java
      - copied, changed from r1049797, james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java
    james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/mock/
    james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/mock/MockMailStore.java
      - copied, changed from r1049797, james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java
    james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/
    james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
      - copied, changed from r1049797, james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueue.java
    james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java
      - copied, changed from r1049797, james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueueFactory.java
    james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java
      - copied, changed from r1049943, james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java
    james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/mock/
    james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
      - copied, changed from r1049797, james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepository.java
    james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/mock/
    james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/mock/MockVirtualUserTableManagementImpl.java
      - copied, changed from r1049797, james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/MockVirtualUserTableManagementImpl.java
Removed:
    james/server/trunk/core/src/test/java/org/apache/james/services/
    james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/DNSFixture.java
    james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/MockDNSService.java
    james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java
    james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java
    james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueue.java
    james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueueFactory.java
    james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepository.java
    james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/MockVirtualUserTableManagementImpl.java
Modified:
    james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
    james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/jdbc/JDBCDomainListTest.java
    james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
    james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
    james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
    james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
    james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
    james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
    james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
    james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
    james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
    james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java
    james/server/trunk/util/src/test/java/org/apache/james/util/inetnetwork/InetNetworkBuilderTest.java
    james/server/trunk/util/src/test/java/org/apache/james/util/netmatcher/NetMatcherTest.java

Modified: james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
(original)
+++ james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
Thu Dec 16 14:28:43 2010
@@ -21,6 +21,8 @@ package org.apache.james.dnsservice.api;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import org.apache.james.dnsservice.api.mock.MockDNSService;
+
 
 import junit.framework.TestCase;
 

Copied: james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/DNSFixture.java
(from r1049797, james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/DNSFixture.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/DNSFixture.java?p2=james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/DNSFixture.java&p1=james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/DNSFixture.java&r1=1049797&r2=1049986&rev=1049986&view=diff
==============================================================================
--- james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/DNSFixture.java
(original)
+++ james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/DNSFixture.java
Thu Dec 16 14:28:43 2010
@@ -16,11 +16,13 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.dnsservice.api;
+package org.apache.james.dnsservice.api.mock;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import org.apache.james.dnsservice.api.DNSService;
+
 
 /**
  * Some DNS Fixtures used by various Test related to DNS and InetNetwork.

Copied: james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/MockDNSService.java
(from r1049797, james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/MockDNSService.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/MockDNSService.java?p2=james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/MockDNSService.java&p1=james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/MockDNSService.java&r1=1049797&r2=1049986&rev=1049986&view=diff
==============================================================================
--- james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/MockDNSService.java
(original)
+++ james/server/trunk/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/MockDNSService.java
Thu Dec 16 14:28:43 2010
@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.dnsservice.api;
+package org.apache.james.dnsservice.api.mock;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.apache.james.dnsservice.api.DNSService;
 import org.apache.mailet.HostAddress;
 
 /**

Copied: james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java
(from r1049797, james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java?p2=james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java&p1=james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java&r1=1049797&r2=1049986&rev=1049986&view=diff
==============================================================================
--- james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/SimpleDomainList.java
(original)
+++ james/server/trunk/domainlist-api/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java
Thu Dec 16 14:28:43 2010
@@ -18,12 +18,14 @@
  ****************************************************************/
 
 
-package org.apache.james.domainlist.api;
+package org.apache.james.domainlist.api.mock;
 
 
 import java.util.LinkedList;
 import java.util.List;
 
+import org.apache.james.domainlist.api.DomainList;
+
 /**
  * Simplest implementation for ManageableDomainList
  */

Modified: james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/jdbc/JDBCDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/jdbc/JDBCDomainListTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/jdbc/JDBCDomainListTest.java
(original)
+++ james/server/trunk/domainlist-jdbc/src/test/java/org/apache/james/domainlist/jdbc/JDBCDomainListTest.java
Thu Dec 16 14:28:43 2010
@@ -39,7 +39,7 @@ import org.apache.commons.dbcp.BasicData
 import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.derby.jdbc.EmbeddedDriver;
 import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.MockDNSService;
+import org.apache.james.dnsservice.api.mock.MockDNSService;
 import org.apache.james.domainlist.jdbc.JDBCDomainList;
 import org.apache.james.resolver.api.mock.MockFileSystem;
 import org.apache.james.util.sql.JDBCUtil;

Modified: james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
(original)
+++ james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
Thu Dec 16 14:28:43 2010
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
 
 import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.MockDNSService;
+import org.apache.james.dnsservice.api.mock.MockDNSService;
 import org.apache.james.domainlist.jpa.JPADomainList;
 import org.apache.james.domainlist.jpa.model.JPADomain;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;

Modified: james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
(original)
+++ james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
Thu Dec 16 14:28:43 2010
@@ -31,7 +31,7 @@ import org.apache.commons.configuration.
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.MockDNSService;
+import org.apache.james.dnsservice.api.mock.MockDNSService;
 import org.apache.james.domainlist.xml.XMLDomainList;
 
 import junit.framework.TestCase;

Modified: james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
(original)
+++ james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
Thu Dec 16 14:28:43 2010
@@ -24,7 +24,7 @@ import org.apache.commons.configuration.
 import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.mailrepository.api.MailRepository;
 import org.apache.james.mailrepository.file.FileMailRepository;
-import org.apache.james.mailstore.MockMailStore;
+import org.apache.james.mailstore.mock.MockMailStore;
 import org.apache.james.repository.file.FilePersistentObjectRepository;
 import org.apache.james.repository.file.FilePersistentStreamRepository;
 import org.apache.james.resolver.api.mock.MockFileSystem;

Modified: james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
(original)
+++ james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
Thu Dec 16 14:28:43 2010
@@ -29,7 +29,7 @@ import org.apache.derby.jdbc.EmbeddedDri
 import org.apache.james.mailrepository.AbstractMailRepositoryTest;
 import org.apache.james.mailrepository.api.MailRepository;
 import org.apache.james.mailrepository.jdbc.JDBCMailRepository;
-import org.apache.james.mailstore.MockMailStore;
+import org.apache.james.mailstore.mock.MockMailStore;
 import org.apache.james.repository.file.FilePersistentStreamRepository;
 import org.apache.james.resolver.api.mock.MockFileSystem;
 

Copied: james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/mock/MockMailStore.java
(from r1049797, james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/mock/MockMailStore.java?p2=james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/mock/MockMailStore.java&p1=james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java&r1=1049797&r2=1049986&rev=1049986&view=diff
==============================================================================
--- james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/MockMailStore.java
(original)
+++ james/server/trunk/mail-library/src/test/java/org/apache/james/mailstore/mock/MockMailStore.java
Thu Dec 16 14:28:43 2010
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.mailstore;
+package org.apache.james.mailstore.mock;
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationUtils;

Modified: james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
(original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
Thu Dec 16 14:28:43 2010
@@ -37,7 +37,7 @@ import javax.mail.internet.ParseExceptio
 import junit.framework.TestCase;
 
 import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.MockDNSService;
+import org.apache.james.dnsservice.api.mock.MockDNSService;
 import org.apache.mailet.base.test.FakeMailContext;
 import org.apache.mailet.base.test.FakeMatcherConfig;
 import org.apache.mailet.Mail;

Modified: james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
(original)
+++ james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
Thu Dec 16 14:28:43 2010
@@ -21,7 +21,7 @@
 package org.apache.james.transport.matchers;
 
 import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.MockDNSService;
+import org.apache.james.dnsservice.api.mock.MockDNSService;
 import org.apache.mailet.base.test.FakeMail;
 import org.apache.mailet.base.test.FakeMailContext;
 import org.apache.mailet.base.test.FakeMatcherConfig;

Modified: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
(original)
+++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
Thu Dec 16 14:28:43 2010
@@ -41,7 +41,7 @@ import org.apache.james.resolver.api.moc
 import org.apache.james.resolver.api.mock.MockJSR250Loader;
 import org.apache.james.server.JamesProtocolHandlerChain;
 import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.MockDNSService;
+import org.apache.james.dnsservice.api.mock.MockDNSService;
 import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
 import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
 import org.apache.james.mailbox.inmemory.mail.InMemoryCachingUidProvider;
@@ -50,7 +50,7 @@ import org.apache.james.mailbox.MessageM
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.store.Authenticator;
-import org.apache.james.user.lib.MockUsersRepository;
+import org.apache.james.user.lib.mock.MockUsersRepository;
 import org.apache.james.util.POP3BeforeSMTPHelper;
 import org.apache.james.util.TestUtil;
 

Copied: james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
(from r1049797, james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueue.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java?p2=james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java&p1=james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueue.java&r1=1049797&r2=1049986&rev=1049986&view=diff
==============================================================================
--- james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueue.java
(original)
+++ james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
Thu Dec 16 14:28:43 2010
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.james.queue.api;
+package org.apache.james.queue.api.mock;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -26,6 +26,8 @@ import java.util.concurrent.ScheduledExe
 import java.util.concurrent.TimeUnit;
 
 import org.apache.james.queue.api.MailQueue;
+import org.apache.james.queue.api.MailQueue.MailQueueException;
+import org.apache.james.queue.api.MailQueue.MailQueueItem;
 import org.apache.mailet.Mail;
 
 public class MockMailQueue implements MailQueue{

Copied: james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java
(from r1049797, james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueueFactory.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java?p2=james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java&p1=james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueueFactory.java&r1=1049797&r2=1049986&rev=1049986&view=diff
==============================================================================
--- james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/MockMailQueueFactory.java
(original)
+++ james/server/trunk/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java
Thu Dec 16 14:28:43 2010
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.james.queue.api;
+package org.apache.james.queue.api.mock;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
(original)
+++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
Thu Dec 16 14:28:43 2010
@@ -40,15 +40,15 @@ import org.apache.james.resolver.api.moc
 import org.apache.james.resolver.api.mock.MockJSR250Loader;
 import org.apache.james.server.JamesProtocolHandlerChain;
 import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.MockDNSService;
+import org.apache.james.dnsservice.api.mock.MockDNSService;
 import org.apache.james.domainlist.api.DomainList;
-import org.apache.james.domainlist.api.SimpleDomainList;
+import org.apache.james.domainlist.api.mock.SimpleDomainList;
 import org.apache.james.lifecycle.api.LifecycleUtil;
-import org.apache.james.mailstore.MockMailStore;
-import org.apache.james.user.lib.MockUsersRepository;
+import org.apache.james.mailstore.mock.MockMailStore;
+import org.apache.james.user.lib.mock.MockUsersRepository;
 import org.apache.james.util.InternetPrintWriter;
 import org.apache.james.util.TestUtil;
-import org.apache.james.vut.lib.MockVirtualUserTableManagementImpl;
+import org.apache.james.vut.lib.mock.MockVirtualUserTableManagementImpl;
 
 public abstract class AbstractRemoteManagerTest extends TestCase {
     private int m_remoteManagerListenerPort = TestUtil.getNonPrivilegedPort();

Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
(original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
Thu Dec 16 14:28:43 2010
@@ -42,16 +42,16 @@ import junit.framework.TestCase;
 import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.commons.net.smtp.SMTPClient;
 import org.apache.commons.net.smtp.SMTPReply;
-import org.apache.james.queue.api.MockMailQueue;
-import org.apache.james.queue.api.MockMailQueueFactory;
+import org.apache.james.queue.api.mock.MockMailQueue;
+import org.apache.james.queue.api.mock.MockMailQueueFactory;
 import org.apache.james.resolver.api.mock.MockFileSystem;
 import org.apache.james.resolver.api.mock.MockJSR250Loader;
 import org.apache.james.server.JamesProtocolHandlerChain;
 import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.domainlist.api.SimpleDomainList;
+import org.apache.james.domainlist.api.mock.SimpleDomainList;
 import org.apache.james.lifecycle.api.LifecycleUtil;
-import org.apache.james.mailstore.MockMailStore;
-import org.apache.james.user.lib.MockUsersRepository;
+import org.apache.james.mailstore.mock.MockMailStore;
+import org.apache.james.user.lib.mock.MockUsersRepository;
 import org.apache.james.util.codec.Base64;
 import org.apache.james.vut.api.VirtualUserTable;
 import org.apache.mailet.HostAddress;

Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
(original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
Thu Dec 16 14:28:43 2010
@@ -39,7 +39,7 @@ import javax.mail.internet.MimeMultipart
 import junit.framework.TestCase;
 
 import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.MockDNSService;
+import org.apache.james.dnsservice.api.mock.MockDNSService;
 import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
 import org.apache.james.protocols.smtp.SMTPSession;
 import org.apache.james.protocols.smtp.hook.HookResult;

Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
(original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
Thu Dec 16 14:28:43 2010
@@ -30,14 +30,14 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.apache.james.domainlist.api.SimpleDomainList;
+import org.apache.james.domainlist.api.mock.SimpleDomainList;
 import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
 import org.apache.james.protocols.smtp.SMTPConfiguration;
 import org.apache.james.protocols.smtp.SMTPSession;
 import org.apache.james.protocols.smtp.hook.HookReturnCode;
 import org.apache.james.smtpserver.fastfail.ValidRcptHandler;
 import org.apache.james.user.api.UsersRepository;
-import org.apache.james.user.lib.MockUsersRepository;
+import org.apache.james.user.lib.mock.MockUsersRepository;
 import org.apache.james.vut.api.VirtualUserTable;
 import org.apache.mailet.MailAddress;
 

Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
(original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
Thu Dec 16 14:28:43 2010
@@ -29,7 +29,7 @@ import java.util.Map;
 import javax.mail.internet.ParseException;
 
 import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.MockDNSService;
+import org.apache.james.dnsservice.api.mock.MockDNSService;
 import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
 import org.apache.james.protocols.smtp.SMTPSession;
 import org.apache.james.protocols.smtp.hook.HookReturnCode;

Modified: james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
(original)
+++ james/server/trunk/user-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
Thu Dec 16 14:28:43 2010
@@ -30,7 +30,7 @@ import java.util.Iterator;
 import org.apache.commons.configuration.DefaultConfigurationBuilder;
 import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.lifecycle.api.LifecycleUtil;
-import org.apache.james.mailstore.MockMailStore;
+import org.apache.james.mailstore.mock.MockMailStore;
 import org.apache.james.repository.file.FilePersistentObjectRepository;
 import org.apache.james.resolver.api.FileSystem;
 import org.apache.james.user.api.JamesUser;

Modified: james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java
(original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepositoryTest.java
Thu Dec 16 14:28:43 2010
@@ -25,6 +25,7 @@ import org.apache.james.lifecycle.api.Li
 import org.apache.james.user.api.User;
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.lib.DefaultJamesUser;
+import org.apache.james.user.lib.mock.MockUsersRepository;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Copied: james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java
(from r1049943, james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java?p2=james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java&p1=james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java&r1=1049943&r2=1049986&rev=1049986&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java
(original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/UserManagementTest.java
Thu Dec 16 14:28:43 2010
@@ -27,6 +27,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.apache.james.user.lib.UserManagement;
+import org.apache.james.user.lib.mock.MockUsersRepository;
 
 /**
  * Tests the UserManagement

Copied: james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
(from r1049797, james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepository.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java?p2=james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java&p1=james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepository.java&r1=1049797&r2=1049986&rev=1049986&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/MockUsersRepository.java
(original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/user/lib/mock/MockUsersRepository.java
Thu Dec 16 14:28:43 2010
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.user.lib;
+package org.apache.james.user.lib.mock;
 
 import org.apache.james.user.api.User;
 import org.apache.james.user.lib.AbstractJamesUsersRepository;

Copied: james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/mock/MockVirtualUserTableManagementImpl.java
(from r1049797, james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/MockVirtualUserTableManagementImpl.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/mock/MockVirtualUserTableManagementImpl.java?p2=james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/mock/MockVirtualUserTableManagementImpl.java&p1=james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/MockVirtualUserTableManagementImpl.java&r1=1049797&r2=1049986&rev=1049986&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/MockVirtualUserTableManagementImpl.java
(original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/vut/lib/mock/MockVirtualUserTableManagementImpl.java
Thu Dec 16 14:28:43 2010
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.james.vut.lib;
+package org.apache.james.vut.lib.mock;
 
 import java.util.Collection;
 import java.util.HashMap;

Modified: james/server/trunk/util/src/test/java/org/apache/james/util/inetnetwork/InetNetworkBuilderTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/util/src/test/java/org/apache/james/util/inetnetwork/InetNetworkBuilderTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/util/src/test/java/org/apache/james/util/inetnetwork/InetNetworkBuilderTest.java
(original)
+++ james/server/trunk/util/src/test/java/org/apache/james/util/inetnetwork/InetNetworkBuilderTest.java
Thu Dec 16 14:28:43 2010
@@ -22,7 +22,7 @@ import java.net.UnknownHostException;
 
 import junit.framework.TestCase;
 
-import org.apache.james.dnsservice.api.DNSFixture;
+import org.apache.james.dnsservice.api.mock.DNSFixture;
 import org.apache.james.util.inetnetwork.InetNetworkBuilder;
 import org.apache.james.util.inetnetwork.model.InetNetwork;
 

Modified: james/server/trunk/util/src/test/java/org/apache/james/util/netmatcher/NetMatcherTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/util/src/test/java/org/apache/james/util/netmatcher/NetMatcherTest.java?rev=1049986&r1=1049985&r2=1049986&view=diff
==============================================================================
--- james/server/trunk/util/src/test/java/org/apache/james/util/netmatcher/NetMatcherTest.java
(original)
+++ james/server/trunk/util/src/test/java/org/apache/james/util/netmatcher/NetMatcherTest.java
Thu Dec 16 14:28:43 2010
@@ -22,7 +22,7 @@ import java.net.UnknownHostException;
 
 import junit.framework.TestCase;
 
-import org.apache.james.dnsservice.api.DNSFixture;
+import org.apache.james.dnsservice.api.mock.DNSFixture;
 import org.apache.james.util.netmatcher.NetMatcher;
 
 /**



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message