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 er...@apache.org on 2010/09/22 14:40:22 UTC
svn commit: r999912 - in /james/server/trunk:
core-api/src/main/java/org/apache/james/services/
core-api/src/main/java/org/apache/james/services/store/
core-library/src/main/java/org/apache/james/services/
core-library/src/test/java/org/apache/james/se...
Author: eric
Date: Wed Sep 22 12:40:21 2010
New Revision: 999912
URL: http://svn.apache.org/viewvc?rev=999912&view=rev
Log:
Still class/package moves to better align everything. I'm done...
Added:
james/server/trunk/core-library/src/main/java/org/apache/james/services/
james/server/trunk/core-library/src/main/java/org/apache/james/services/AbstractJSR250InstanceFactory.java
- copied unchanged from r999819, james/server/trunk/core-api/src/main/java/org/apache/james/services/AbstractJSR250InstanceFactory.java
james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeJSR250Loader.java
- copied, changed from r999819, james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeLoader.java
james/server/trunk/core-library/src/test/java/org/apache/james/services/MockFileSystem.java
- copied, changed from r999819, james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockFileSystem.java
james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java
- copied, changed from r999819, james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java
james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/MockStore.java
- copied, changed from r999819, james/server/trunk/mail-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java
Removed:
james/server/trunk/core-api/src/main/java/org/apache/james/services/AbstractJSR250InstanceFactory.java
james/server/trunk/core-api/src/main/java/org/apache/james/services/store/
james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeLoader.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockFileSystem.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java
james/server/trunk/mail-library/src/test/java/org/apache/james/test/mock/avalon/
james/server/trunk/netty-socket/src/main/java/org/jboss/
Modified:
james/server/trunk/domain-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java
james/server/trunk/netty-socket/pom.xml
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ProtocolHandlerChainImpl.java
james/server/trunk/pop3server/pom.xml
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/user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
Copied: james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeJSR250Loader.java (from r999819, james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeLoader.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeJSR250Loader.java?p2=james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeJSR250Loader.java&p1=james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeLoader.java&r1=999819&r2=999912&rev=999912&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeLoader.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/services/FakeJSR250Loader.java Wed Sep 22 12:40:21 2010
@@ -24,11 +24,11 @@ import java.util.Map;
import org.apache.james.services.AbstractJSR250InstanceFactory;
-public class FakeLoader extends AbstractJSR250InstanceFactory {
+public class FakeJSR250Loader extends AbstractJSR250InstanceFactory {
private final Map<String, Object> servicesByName;
private final Map<String, String> mappings = new HashMap<String, String>();
- public FakeLoader() {
+ public FakeJSR250Loader() {
servicesByName = new HashMap<String, Object>();
servicesByName.put("org.apache.james.LoaderService", this);
Copied: james/server/trunk/core-library/src/test/java/org/apache/james/services/MockFileSystem.java (from r999819, james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockFileSystem.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/services/MockFileSystem.java?p2=james/server/trunk/core-library/src/test/java/org/apache/james/services/MockFileSystem.java&p1=james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockFileSystem.java&r1=999819&r2=999912&rev=999912&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockFileSystem.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/services/MockFileSystem.java Wed Sep 22 12:40:21 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.test.mock.james;
+package org.apache.james.services;
import org.apache.james.services.FileSystem;
Copied: james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java (from r999819, james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java?p2=james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java&p1=james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java&r1=999819&r2=999912&rev=999912&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/services/MockMailServer.java Wed Sep 22 12:40:21 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.test.mock.james;
+package org.apache.james.services;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.MailImpl;
@@ -25,6 +25,7 @@ import org.apache.james.lifecycle.Dispos
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.mailrepository.MailRepository;
import org.apache.james.services.MailServer;
+import org.apache.james.test.mock.james.InMemorySpoolRepository;
import org.apache.mailet.base.test.MailUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
Added: james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java?rev=999912&view=auto
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java (added)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java Wed Sep 22 12:40:21 2010
@@ -0,0 +1,465 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.test.mock.james;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.impl.SimpleLog;
+import org.apache.james.core.MailImpl;
+import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.services.SpoolRepository;
+import org.apache.james.util.Lock;
+import org.apache.mailet.Mail;
+
+import javax.mail.MessagingException;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+/**
+ * Implementation of a MailRepository on a FileSystem.
+ *
+ * Requires a configuration element in the .conf.xml file of the form:
+ * <repository destinationURL="file://path-to-root-dir-for-repository"
+ * type="MAIL"
+ * model="SYNCHRONOUS"/>
+ * Requires a logger called MailRepository.
+ *
+ * @version 1.0.0, 24/04/1999
+ */
+public class InMemorySpoolRepository
+ implements SpoolRepository, Disposable {
+
+ /**
+ * Whether 'deep debugging' is turned on.
+ */
+ protected final static boolean DEEP_DEBUG = true;
+ private Lock lock;
+ private Log logger;
+ private Hashtable<String, Mail> spool;
+
+ private Log getLogger() {
+ if (logger == null) {
+ logger = new SimpleLog("Log");
+ }
+ return logger;
+ }
+
+ /**
+ * Releases a lock on a message identified by a key
+ *
+ * @param key the key of the message to be unlocked
+ *
+ * @return true if successfully released the lock, false otherwise
+ */
+ public boolean unlock(String key) {
+ if (lock.unlock(key)) {
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ StringBuffer debugBuffer =
+ new StringBuffer(256)
+ .append("Unlocked ")
+ .append(key)
+ .append(" for ")
+ .append(Thread.currentThread().getName())
+ .append(" @ ")
+ .append(new java.util.Date(System.currentTimeMillis()));
+ getLogger().debug(debugBuffer.toString());
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Obtains a lock on a message identified by a key
+ *
+ * @param key the key of the message to be locked
+ *
+ * @return true if successfully obtained the lock, false otherwise
+ */
+ public boolean lock(String key) {
+ if (lock.lock(key)) {
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ StringBuffer debugBuffer =
+ new StringBuffer(256)
+ .append("Locked ")
+ .append(key)
+ .append(" for ")
+ .append(Thread.currentThread().getName())
+ .append(" @ ")
+ .append(new java.util.Date(System.currentTimeMillis()));
+ getLogger().debug(debugBuffer.toString());
+ }
+// synchronized (this) {
+// notifyAll();
+// }
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Stores a message in this repository. Shouldn't this return the key
+ * under which it is stored?
+ *
+ * @param mc the mail message to store
+ */
+ public void store(Mail mc) throws MessagingException {
+ try {
+ String key = mc.getName();
+ //Remember whether this key was locked
+ boolean wasLocked = true;
+ synchronized (this) {
+ wasLocked = lock.isLocked(key);
+
+ if (!wasLocked) {
+ //If it wasn't locked, we want a lock during the store
+ lock(key);
+ }
+ }
+ try {
+ // Remove any previous copy of this mail
+ if (spool.containsKey(key)) {
+ // do not use this.remove because this would
+ // also remove a current lock.
+ Object o = spool.remove(key);
+ LifecycleUtil.dispose(o);
+ }
+ // Clone the mail (so the caller could modify it).
+ MailImpl m = new MailImpl(mc,mc.getName());
+ m.setState(mc.getState());
+ m.setLastUpdated(mc.getLastUpdated());
+ m.setErrorMessage(mc.getErrorMessage());
+ spool.put(mc.getName(),m);
+ } finally {
+ if (!wasLocked) {
+ // If it wasn't locked, we need to unlock now
+ unlock(key);
+ synchronized (this) {
+ notify();
+ }
+ }
+ }
+
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ StringBuffer logBuffer =
+ new StringBuffer(64)
+ .append("Mail ")
+ .append(key)
+ .append(" stored.");
+ getLogger().debug(logBuffer.toString());
+ }
+
+ } catch (Exception e) {
+ getLogger().error("Exception storing mail: " + e,e);
+ throw new MessagingException("Exception caught while storing Message Container: ",e);
+ }
+ }
+
+ /**
+ * Retrieves a message given a key. At the moment, keys can be obtained
+ * from list() in superinterface Store.Repository
+ *
+ * @param key the key of the message to retrieve
+ * @return the mail corresponding to this key, null if none exists
+ */
+ public Mail retrieve(String key) throws MessagingException {
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ getLogger().debug("Retrieving mail: " + key);
+ }
+ try {
+ Mail mc = null;
+ try {
+ mc = new MailImpl((Mail) spool.get(key),key);
+ mc.setState(((Mail) spool.get(key)).getState());
+ mc.setErrorMessage(((Mail) spool.get(key)).getErrorMessage());
+ mc.setLastUpdated(((Mail) spool.get(key)).getLastUpdated());
+ }
+ catch (RuntimeException re){
+ StringBuffer exceptionBuffer = new StringBuffer(128);
+ if(re.getCause() instanceof Error){
+ exceptionBuffer.append("Error when retrieving mail, not deleting: ")
+ .append(re.toString());
+ }else{
+ exceptionBuffer.append("Exception retrieving mail: ")
+ .append(re.toString())
+ .append(", so we're deleting it.");
+ remove(key);
+ }
+ getLogger().warn(exceptionBuffer.toString());
+ return null;
+ }
+ return mc;
+ } catch (Exception me) {
+ getLogger().error("Exception retrieving mail: " + me);
+ throw new MessagingException("Exception while retrieving mail: " + me.getMessage());
+ }
+ }
+
+ /**
+ * Removes a specified message
+ *
+ * @param mail the message to be removed from the repository
+ */
+ public void remove(Mail mail) throws MessagingException {
+ remove(mail.getName());
+ }
+
+
+ /**
+ * Removes a Collection of mails from the repository
+ * @param mails The Collection of <code>MailImpl</code>'s to delete
+ * @throws MessagingException
+ * @since 2.2.0
+ */
+ public void remove(Collection<Mail> mails) throws MessagingException {
+ Iterator<Mail> delList = mails.iterator();
+ while (delList.hasNext()) {
+ remove(delList.next());
+ }
+ }
+
+ /**
+ * Removes a message identified by key.
+ *
+ * @param key the key of the message to be removed from the repository
+ */
+ public void remove(String key) throws MessagingException {
+ if (lock(key)) {
+ try {
+ if (spool != null) {
+ Object o = spool.remove(key);
+ LifecycleUtil.dispose(o);
+ }
+ } finally {
+ unlock(key);
+ }
+ } else {
+ StringBuffer exceptionBuffer =
+ new StringBuffer(64)
+ .append("Cannot lock ")
+ .append(key)
+ .append(" to remove it");
+ throw new MessagingException(exceptionBuffer.toString());
+ }
+ }
+
+ /**
+ * List string keys of messages in repository.
+ *
+ * @return an <code>Iterator</code> over the list of keys in the repository
+ *
+ */
+ public Iterator<String> list() {
+ // Fix ConcurrentModificationException by cloning
+ // the keyset before getting an iterator
+ final ArrayList<String> clone;
+ synchronized(spool) {
+ clone = new ArrayList<String>(spool.keySet());
+ }
+ return clone.iterator();
+ }
+
+
+ /**
+ * <p>Returns an arbitrarily selected mail deposited in this Repository.
+ * Usage: SpoolManager calls accept() to see if there are any unprocessed
+ * mails in the spool repository.</p>
+ *
+ * <p>Synchronized to ensure thread safe access to the underlying spool.</p>
+ *
+ * @return the mail
+ */
+ public synchronized Mail accept() throws InterruptedException {
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ getLogger().debug("Method accept() called");
+ }
+ return accept(new SpoolRepository.AcceptFilter () {
+ public boolean accept (String _, String __, long ___, String ____) {
+ return true;
+ }
+
+ public long getWaitTime () {
+ return 0;
+ }
+ });
+ }
+
+ /**
+ * <p>Returns an arbitrarily selected mail deposited in this Repository that
+ * is either ready immediately for delivery, or is younger than it's last_updated plus
+ * the number of failed attempts times the delay time.
+ * Usage: RemoteDeliverySpool calls accept() with some delay and should block until an
+ * unprocessed mail is available.</p>
+ *
+ * <p>Synchronized to ensure thread safe access to the underlying spool.</p>
+ *
+ * @return the mail
+ */
+ public synchronized Mail accept(final long delay) throws InterruptedException
+ {
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ getLogger().debug("Method accept(delay) called");
+ }
+ return accept(new SpoolRepository.AcceptFilter () {
+ long youngest = 0;
+
+ public boolean accept (String key, String state, long lastUpdated, String errorMessage) {
+ if (state.equals(Mail.ERROR)) {
+ //Test the time...
+ long timeToProcess = delay + lastUpdated;
+
+ if (System.currentTimeMillis() > timeToProcess) {
+ //We're ready to process this again
+ return true;
+ } else {
+ //We're not ready to process this.
+ if (youngest == 0 || youngest > timeToProcess) {
+ //Mark this as the next most likely possible mail to process
+ youngest = timeToProcess;
+ }
+ return false;
+ }
+ } else {
+ //This mail is good to go... return the key
+ return true;
+ }
+ }
+
+ public long getWaitTime () {
+ if (youngest == 0) {
+ return 0;
+ } else {
+ long duration = youngest - System.currentTimeMillis();
+ youngest = 0; //get ready for next round
+ return duration <= 0 ? 1 : duration;
+ }
+ }
+ });
+ }
+
+
+ /**
+ * Returns an arbitrarily select mail deposited in this Repository for
+ * which the supplied filter's accept method returns true.
+ * Usage: RemoteDeliverySpool calls accept(filter) with some a filter which determines
+ * based on number of retries if the mail is ready for processing.
+ * If no message is ready the method will block until one is, the amount of time to block is
+ * determined by calling the filters getWaitTime method.
+ *
+ * <p>Synchronized to ensure thread safe access to the underlying spool.</p>
+ *
+ * @return the mail
+ */
+ public synchronized Mail accept(SpoolRepository.AcceptFilter filter) throws InterruptedException {
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ getLogger().debug("Method accept(Filter) called");
+ }
+ while (!Thread.currentThread().isInterrupted()) try {
+ for (Iterator<String> it = list(); it.hasNext(); ) {
+ String s = it.next();
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ StringBuffer logBuffer =
+ new StringBuffer(64)
+ .append("Found item ")
+ .append(s)
+ .append(" in spool.");
+ getLogger().debug(logBuffer.toString());
+ }
+ if (lock(s)) {
+ if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
+ getLogger().debug("accept(Filter) has locked: " + s);
+ }
+ try {
+ Mail mail = retrieve(s);
+ // Retrieve can return null if the mail is no longer on the spool
+ // (i.e. another thread has gotten to it first).
+ // In this case we simply continue to the next key
+ if (mail == null || !filter.accept (mail.getName(),
+ mail.getState(),
+ mail.getLastUpdated().getTime(),
+ mail.getErrorMessage())) {
+ unlock(s);
+ continue;
+ }
+ return mail;
+ } catch (javax.mail.MessagingException e) {
+ unlock(s);
+ getLogger().error("Exception during retrieve -- skipping item " + s, e);
+ }
+ }
+ }
+
+ //We did not find any... let's wait for a certain amount of time
+ wait (filter.getWaitTime());
+ } catch (InterruptedException ex) {
+ throw ex;
+ } catch (ConcurrentModificationException cme) {
+ // Should never get here now that list methods clones keyset for iterator
+ getLogger().error("CME in spooler - please report to http://james.apache.org", cme);
+ }
+ throw new InterruptedException();
+ }
+
+ /**
+ *
+ */
+ public InMemorySpoolRepository() {
+ spool = new Hashtable<String,Mail>();
+ lock = new Lock();
+ }
+
+ public int size() {
+ return spool.size();
+ }
+
+ public void clear() {
+ if (spool != null) {
+ Iterator<String> i = list();
+ while (i.hasNext()) {
+ String key = i.next();
+ try {
+ remove(key);
+ } catch (MessagingException e) {
+ }
+ }
+ }
+ }
+
+ public void dispose() {
+ clear();
+ }
+
+ public String toString() {
+ StringBuffer result = new StringBuffer();
+ result.append(super.toString());
+ Iterator<String> i = list();
+ while (i.hasNext()) {
+ result.append("\n\t"+i.next());
+ }
+ return result.toString();
+ }
+
+}
Modified: james/server/trunk/domain-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/domain-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java (original)
+++ james/server/trunk/domain-function/src/test/java/org/apache/james/domain/JDBCDomainListTest.java Wed Sep 22 12:40:21 2010
@@ -39,7 +39,7 @@ import org.apache.commons.logging.impl.S
import org.apache.james.api.dnsservice.AbstractDNSServer;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.services.DataSourceSelector;
-import org.apache.james.test.mock.james.MockFileSystem;
+import org.apache.james.services.MockFileSystem;
import org.apache.james.test.util.Util;
import org.apache.james.util.sql.JDBCUtil;
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=999912&r1=999911&r2=999912&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 Wed Sep 22 12:40:21 2010
@@ -24,8 +24,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.filepair.FilePersistentObjectRepository;
import org.apache.james.filepair.FilePersistentStreamRepository;
-import org.apache.james.test.mock.avalon.MockStore;
-import org.apache.james.test.mock.james.MockFileSystem;
+import org.apache.james.services.MockFileSystem;
public class FileMailRepositoryTest extends AbstractMailRepositoryTest {
Modified: james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java (original)
+++ james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java Wed Sep 22 12:40:21 2010
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.test.mock.james.MockFileSystem;
+import org.apache.james.services.MockFileSystem;
/**
* NOTE this test *WAS* disabled because MBoxMailRepository does not
Modified: james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java (original)
+++ james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java Wed Sep 22 12:40:21 2010
@@ -24,8 +24,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.filepair.FilePersistentStreamRepository;
import org.apache.james.services.DataSourceSelector;
-import org.apache.james.test.mock.avalon.MockStore;
-import org.apache.james.test.mock.james.MockFileSystem;
+import org.apache.james.services.MockFileSystem;
import org.apache.james.test.util.Util;
public class JDBCMailRepositoryTest extends AbstractMailRepositoryTest {
Copied: james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/MockStore.java (from r999819, james/server/trunk/mail-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/MockStore.java?p2=james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/MockStore.java&p1=james/server/trunk/mail-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java&r1=999819&r2=999912&rev=999912&view=diff
==============================================================================
--- james/server/trunk/mail-library/src/test/java/org/apache/james/test/mock/avalon/MockStore.java (original)
+++ james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/MockStore.java Wed Sep 22 12:40:21 2010
@@ -19,7 +19,7 @@
-package org.apache.james.test.mock.avalon;
+package org.apache.james.mailrepository;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationUtils;
Modified: james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java (original)
+++ james/server/trunk/management/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java Wed Sep 22 12:40:21 2010
@@ -28,9 +28,9 @@ import javax.mail.MessagingException;
import junit.framework.TestCase;
import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.mailrepository.MockStore;
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementException;
-import org.apache.james.test.mock.avalon.MockStore;
import org.apache.james.test.mock.james.InMemorySpoolRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
Modified: james/server/trunk/netty-socket/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/pom.xml?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/netty-socket/pom.xml (original)
+++ james/server/trunk/netty-socket/pom.xml Wed Sep 22 12:40:21 2010
@@ -90,7 +90,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-core-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ProtocolHandlerChainImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ProtocolHandlerChainImpl.java?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ProtocolHandlerChainImpl.java (original)
+++ james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ProtocolHandlerChainImpl.java Wed Sep 22 12:40:21 2010
@@ -31,7 +31,6 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.protocols.api.ExtensibleHandler;
Modified: james/server/trunk/pop3server/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Wed Sep 22 12:40:21 2010
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-core-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
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=999912&r1=999911&r2=999912&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 Wed Sep 22 12:40:21 2010
@@ -38,7 +38,9 @@ import org.apache.commons.net.pop3.POP3M
import org.apache.commons.net.pop3.POP3Reply;
import org.apache.james.api.dnsservice.AbstractDNSServer;
import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.services.FakeLoader;
+import org.apache.james.services.FakeJSR250Loader;
+import org.apache.james.services.MockFileSystem;
+import org.apache.james.services.MockMailServer;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
@@ -50,8 +52,6 @@ import org.apache.james.lifecycle.Lifecy
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.services.MailServer;
import org.apache.james.socket.netty.ProtocolHandlerChainImpl;
-import org.apache.james.test.mock.james.MockFileSystem;
-import org.apache.james.test.mock.james.MockMailServer;
import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.POP3BeforeSMTPHelper;
@@ -63,7 +63,7 @@ public abstract class AbstractAsyncPOP3S
private POP3TestConfiguration m_testConfiguration;
private MockUsersRepository m_usersRepository = new MockUsersRepository();
private POP3Client m_pop3Protocol = null;
- private FakeLoader serviceManager;
+ private FakeJSR250Loader serviceManager;
protected DNSService dnsservice;
protected MockFileSystem fSystem;
protected ProtocolHandlerChainImpl chain;
@@ -96,7 +96,7 @@ public abstract class AbstractAsyncPOP3S
protected void setUpServiceManager() throws Exception {
- serviceManager = new FakeLoader();
+ serviceManager = new FakeJSR250Loader();
m_mailServer = new MockMailServer(m_usersRepository);
serviceManager.put(MailServer.ROLE, m_mailServer);
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=999912&r1=999911&r2=999912&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 Wed Sep 22 12:40:21 2010
@@ -40,12 +40,15 @@ import org.apache.james.api.dnsservice.A
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.domainlist.ManageableDomainList;
import org.apache.james.api.domainlist.SimpleDomainList;
-import org.apache.james.services.FakeLoader;
+import org.apache.james.services.FakeJSR250Loader;
+import org.apache.james.services.MockFileSystem;
+import org.apache.james.services.MockMailServer;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.api.vut.management.MockVirtualUserTableManagementService;
import org.apache.james.api.vut.management.VirtualUserTableManagementService;
import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.mailrepository.MockStore;
import org.apache.james.management.BayesianAnalyzerManagementException;
import org.apache.james.management.BayesianAnalyzerManagementService;
import org.apache.james.management.DomainListManagementException;
@@ -56,9 +59,6 @@ import org.apache.james.management.Spool
import org.apache.james.management.SpoolManagementService;
import org.apache.james.services.MailServer;
import org.apache.james.socket.netty.ProtocolHandlerChainImpl;
-import org.apache.james.test.mock.avalon.MockStore;
-import org.apache.james.test.mock.james.MockFileSystem;
-import org.apache.james.test.mock.james.MockMailServer;
import org.apache.james.test.mock.james.MockUsersStore;
import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
@@ -73,7 +73,7 @@ public abstract class AbstractRemoteMana
private TelnetClient m_telnetClient;
private MockUsersRepository m_mockUsersRepository;
protected MockMailServer mailServer;
- private FakeLoader serviceManager;
+ private FakeJSR250Loader serviceManager;
private MockUsersStore usersStore;
protected DNSService dnsservice;
protected MockFileSystem filesystem;
@@ -178,7 +178,7 @@ public abstract class AbstractRemoteMana
}
protected void setUpFakeLoader() throws Exception {
- serviceManager = new FakeLoader();
+ serviceManager = new FakeJSR250Loader();
m_mockUsersRepository = new MockUsersRepository();
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=999912&r1=999911&r2=999912&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 Wed Sep 22 12:40:21 2010
@@ -42,17 +42,17 @@ import org.apache.commons.logging.impl.S
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
import org.apache.james.api.dnsservice.DNSService;
-import org.apache.james.services.FakeLoader;
+import org.apache.james.services.FakeJSR250Loader;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.VirtualUserTableStore;
import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.mailrepository.MockStore;
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
+import org.apache.james.services.MockFileSystem;
+import org.apache.james.services.MockMailServer;
import org.apache.james.socket.netty.ProtocolHandlerChainImpl;
import org.apache.james.test.mock.DummyVirtualUserTableStore;
-import org.apache.james.test.mock.avalon.MockStore;
-import org.apache.james.test.mock.james.MockFileSystem;
-import org.apache.james.test.mock.james.MockMailServer;
import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
import org.apache.james.util.codec.Base64;
@@ -145,7 +145,7 @@ public abstract class AbstractSMTPServer
//private SMTPServer m_smtpServer;
protected SMTPTestConfiguration m_testConfiguration;
protected MockUsersRepository m_usersRepository = new MockUsersRepository();
- protected FakeLoader m_serviceManager;
+ protected FakeJSR250Loader m_serviceManager;
protected AlterableDNSServer m_dnsServer;
protected MockStore store;
protected MockFileSystem fileSystem;
@@ -211,7 +211,7 @@ public abstract class AbstractSMTPServer
}
protected void setUpFakeLoader() throws Exception {
- m_serviceManager = new FakeLoader();
+ m_serviceManager = new FakeJSR250Loader();
m_mailServer = new MockMailServer(new MockUsersRepository());
m_serviceManager.put(MailServer.ROLE, m_mailServer);
m_serviceManager.put(UsersRepository.ROLE, m_usersRepository);
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java Wed Sep 22 12:40:21 2010
@@ -25,7 +25,7 @@ import org.apache.commons.logging.impl.S
import org.apache.james.api.user.UsersRepository;
import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.DataSourceSelector;
-import org.apache.james.test.mock.james.MockFileSystem;
+import org.apache.james.services.MockFileSystem;
import org.apache.james.test.util.Util;
import java.util.Iterator;
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java Wed Sep 22 12:40:21 2010
@@ -27,7 +27,7 @@ import org.apache.james.api.user.JamesUs
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.test.mock.james.MockFileSystem;
+import org.apache.james.services.MockFileSystem;
import org.apache.james.test.util.Util;
import org.apache.mailet.MailAddress;
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java Wed Sep 22 12:40:21 2010
@@ -24,7 +24,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.test.mock.james.MockFileSystem;
+import org.apache.james.services.MockFileSystem;
import org.apache.james.test.util.Util;
import java.util.Iterator;
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java Wed Sep 22 12:40:21 2010
@@ -34,8 +34,8 @@ import org.apache.james.api.user.UsersRe
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.filepair.FilePersistentObjectRepository;
import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.james.mailrepository.MockStore;
import org.apache.james.services.FileSystem;
-import org.apache.james.test.mock.avalon.MockStore;
import org.apache.mailet.MailAddress;
/**
Modified: james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java?rev=999912&r1=999911&r2=999912&view=diff
==============================================================================
--- james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java (original)
+++ james/server/trunk/user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java Wed Sep 22 12:40:21 2010
@@ -22,7 +22,7 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
-import org.apache.james.test.mock.james.MockFileSystem;
+import org.apache.james.services.MockFileSystem;
import org.apache.james.test.util.Util;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org