Author: bago
Date: Sat May 6 08:13:12 2006
New Revision: 400322
URL: http://svn.apache.org/viewcvs?rev=400322&view=rev
Log:
Refactored direct instanceof/calls of avalon framework marker interfaces to
ContainerUtil.method facility.
This is only needed to have a better overview of the places where we do
"container" related things for our own objects.
Now a search for ContainerUtil in the code is really useful to understand how
we use the avalon framework inside james.
Modified:
james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java
james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java
james/server/trunk/src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
james/server/trunk/src/java/org/apache/james/core/MimeMessageWrapper.java
james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.java
james/server/trunk/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java
james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.java
james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.java
james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java
james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
james/server/trunk/src/java/org/apache/james/smtpserver/SMTPServer.java
james/server/trunk/src/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java
james/server/trunk/src/test/org/apache/james/JamesTest.java
james/server/trunk/src/test/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
james/server/trunk/src/test/org/apache/james/dnsserver/DNSServerTest.java
james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java
james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
james/server/trunk/src/test/org/apache/james/transport/LinearProcessorTest.java
Modified:
james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java
(original)
+++ james/server/trunk/src/java/org/apache/james/core/AbstractJamesService.java
Sat May 6 08:13:12 2006
@@ -22,7 +22,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
@@ -441,9 +441,7 @@
protected WatchdogFactory getWatchdogFactory() {
WatchdogFactory theWatchdogFactory = null;
theWatchdogFactory = new ThreadPerWatchdogFactory(threadPool, timeout);
- if (theWatchdogFactory instanceof LogEnabled) {
- ((LogEnabled)theWatchdogFactory).enableLogging(getLogger());
- }
+ ContainerUtil.enableLogging(theWatchdogFactory,getLogger());
return theWatchdogFactory;
}
Modified: james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java
(original)
+++ james/server/trunk/src/java/org/apache/james/core/AvalonMailStore.java Sat
May 6 08:13:12 2006
@@ -32,7 +32,6 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.commons.collections.ReferenceMap;
import org.apache.james.services.MailRepository;
@@ -271,9 +270,7 @@
try {
reply = (MailRepository)
this.getClass().getClassLoader().loadClass(repClass).newInstance();
- if (reply instanceof LogEnabled) {
- setupLogger(reply);
- }
+ ContainerUtil.enableLogging(reply,getLogger());
ContainerUtil.contextualize(reply,context);
ContainerUtil.service(reply,m_manager);
Modified:
james/server/trunk/src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
---
james/server/trunk/src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
(original)
+++
james/server/trunk/src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
Sat May 6 08:13:12 2006
@@ -18,6 +18,7 @@
package org.apache.james.core;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.container.ContainerUtil;
import javax.activation.DataHandler;
import javax.mail.Address;
@@ -754,9 +755,7 @@
if (wrapped != null) {
refCount.decrementReferenceCount();
if (refCount.getReferenceCount()<=0) {
- if (wrapped instanceof Disposable) {
- ((Disposable) wrapped).dispose();
- }
+ ContainerUtil.dispose(wrapped);
}
wrapped = null;
}
Modified:
james/server/trunk/src/java/org/apache/james/core/MimeMessageWrapper.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/core/MimeMessageWrapper.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/core/MimeMessageWrapper.java
(original)
+++ james/server/trunk/src/java/org/apache/james/core/MimeMessageWrapper.java
Sat May 6 08:13:12 2006
@@ -36,6 +36,7 @@
import java.util.Enumeration;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.io.IOUtil;
import org.apache.mailet.RFC2822Headers;
@@ -449,9 +450,7 @@
if (sourceIn != null) {
IOUtil.shutdownStream(sourceIn);
}
- if (source instanceof Disposable) {
- ((Disposable)source).dispose();
- }
+ ContainerUtil.dispose(source);
}
/**
Modified:
james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.java
(original)
+++ james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.java Sat
May 6 08:13:12 2006
@@ -23,13 +23,11 @@
import org.apache.avalon.excalibur.pool.ObjectFactory;
import org.apache.avalon.excalibur.pool.Pool;
import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-
import org.apache.james.core.AbstractJamesService;
import org.apache.james.nntpserver.repository.NNTPRepository;
import org.apache.james.services.UsersRepository;
@@ -128,12 +126,8 @@
theHandlerPool = new DefaultPool(theHandlerFactory, null, 5, 30);
getLogger().debug("Using an unbounded pool for NNTP handlers.");
}
- if (theHandlerPool instanceof LogEnabled) {
- ((LogEnabled)theHandlerPool).enableLogging(getLogger());
- }
- if (theHandlerPool instanceof Initializable) {
- ((Initializable)theHandlerPool).initialize();
- }
+ ContainerUtil.enableLogging(theHandlerPool, getLogger());
+ ContainerUtil.initialize(theHandlerPool);
theWatchdogFactory = getWatchdogFactory();
}
Modified:
james/server/trunk/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
---
james/server/trunk/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java
(original)
+++
james/server/trunk/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java
Sat May 6 08:13:12 2006
@@ -21,16 +21,17 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.james.context.AvalonContextUtilities;
import org.apache.james.util.Lock;
import org.apache.james.util.io.IOUtil;
import javax.mail.internet.MimeMessage;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -115,9 +116,7 @@
for ( int i = 0 ; i < worker.length ; i++ ) {
worker[i] = new SpoolerRunnable(threadIdleTime,spoolPath);
- if ( worker[i] instanceof LogEnabled ) {
- ((LogEnabled)worker[i]).enableLogging(getLogger());
- }
+ ContainerUtil.enableLogging(worker[i], getLogger());
}
// TODO: Replace this with a standard Avalon thread pool
Modified:
james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.java
(original)
+++ james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.java Sat
May 6 08:13:12 2006
@@ -23,13 +23,11 @@
import org.apache.avalon.excalibur.pool.ObjectFactory;
import org.apache.avalon.excalibur.pool.Pool;
import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.logger.LogEnabled;
-
import org.apache.james.core.AbstractJamesService;
import org.apache.james.services.MailServer;
import org.apache.james.services.UsersRepository;
@@ -125,12 +123,8 @@
theHandlerPool = new DefaultPool(theHandlerFactory, null, 5, 30);
getLogger().debug("Using an unbounded pool for POP3 handlers.");
}
- if (theHandlerPool instanceof LogEnabled) {
- ((LogEnabled)theHandlerPool).enableLogging(getLogger());
- }
- if (theHandlerPool instanceof Initializable) {
- ((Initializable)theHandlerPool).initialize();
- }
+ ContainerUtil.enableLogging(theHandlerPool, getLogger());
+ ContainerUtil.initialize(theHandlerPool);
theWatchdogFactory = getWatchdogFactory();
}
Modified:
james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
---
james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.java
(original)
+++
james/server/trunk/src/java/org/apache/james/remotemanager/RemoteManager.java
Sat May 6 08:13:12 2006
@@ -23,13 +23,11 @@
import org.apache.avalon.excalibur.pool.ObjectFactory;
import org.apache.avalon.excalibur.pool.Pool;
import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.LogEnabled;
-
+import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.core.AbstractJamesService;
import org.apache.james.services.MailServer;
import org.apache.james.services.UsersRepository;
@@ -152,12 +150,8 @@
theHandlerPool = new DefaultPool(theHandlerFactory, null, 5, 30);
getLogger().debug("Using an unbounded pool for RemoteManager
handlers.");
}
- if (theHandlerPool instanceof LogEnabled) {
- ((LogEnabled)theHandlerPool).enableLogging(getLogger());
- }
- if (theHandlerPool instanceof Initializable) {
- ((Initializable)theHandlerPool).initialize();
- }
+ ContainerUtil.enableLogging(theHandlerPool, getLogger());
+ ContainerUtil.initialize(theHandlerPool);
theWatchdogFactory = getWatchdogFactory();
}
@@ -182,7 +176,7 @@
protected ConnectionHandler newHandler()
throws Exception {
RemoteManagerHandler theHandler =
(RemoteManagerHandler)theHandlerPool.get();
- theHandler.enableLogging(getLogger());
+ ContainerUtil.enableLogging(theHandler, getLogger());
Watchdog theWatchdog =
theWatchdogFactory.getWatchdog(theHandler.getWatchdogTarget());
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java
(original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java
Sat May 6 08:13:12 2006
@@ -19,7 +19,6 @@
import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.Constants;
@@ -414,9 +413,7 @@
//do the clean up
if(mail != null) {
- if (mail instanceof Disposable) {
- ((Disposable) mail).dispose();
- }
+ ContainerUtil.dispose(mail);
// remember the ehlo mode
Object currentHeloMode = state.get(CURRENT_HELO_MODE);
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
---
james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
(original)
+++
james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
Sat May 6 08:13:12 2006
@@ -17,21 +17,20 @@
package org.apache.james.smtpserver;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Locale;
-
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+
/**
* The SMTPHandlerChain is per service object providing access
* ConnectHandlers, Commandhandlers and message handlers
@@ -70,9 +69,7 @@
Object handler =
classLoader.loadClass(className).newInstance();
//enable logging
- if (handler instanceof LogEnabled) {
-
((LogEnabled)handler).enableLogging(getLogger());
- }
+ ContainerUtil.enableLogging(handler, getLogger());
//servicing the handler
ContainerUtil.service(handler,serviceManager);
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/SMTPServer.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/smtpserver/SMTPServer.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/SMTPServer.java
(original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/SMTPServer.java Sat
May 6 08:13:12 2006
@@ -23,11 +23,9 @@
import org.apache.avalon.excalibur.pool.ObjectFactory;
import org.apache.avalon.excalibur.pool.Pool;
import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.Constants;
@@ -267,12 +265,8 @@
theHandlerPool = new DefaultPool(theHandlerFactory, null, 5, 30);
getLogger().debug("Using an unbounded pool for SMTP handlers.");
}
- if (theHandlerPool instanceof LogEnabled) {
- ((LogEnabled)theHandlerPool).enableLogging(getLogger());
- }
- if (theHandlerPool instanceof Initializable) {
- ((Initializable)theHandlerPool).initialize();
- }
+ ContainerUtil.enableLogging(theHandlerPool, getLogger());
+ ContainerUtil.initialize(theHandlerPool);
theWatchdogFactory = getWatchdogFactory();
}
Modified:
james/server/trunk/src/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
---
james/server/trunk/src/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java
(original)
+++
james/server/trunk/src/java/org/apache/james/util/watchdog/ThreadPerWatchdogFactory.java
Sat May 6 08:13:12 2006
@@ -17,16 +17,9 @@
package org.apache.james.util.watchdog;
-import org.apache.avalon.excalibur.pool.DefaultPool;
-import org.apache.avalon.excalibur.pool.HardResourceLimitingPool;
-import org.apache.avalon.excalibur.pool.ObjectFactory;
-import org.apache.avalon.excalibur.pool.Pool;
-import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.excalibur.thread.ThreadPool;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.excalibur.thread.ThreadPool;
/**
* This class is a factory to produce Watchdogs, each of which is associated
@@ -65,7 +58,7 @@
public Watchdog getWatchdog(WatchdogTarget theTarget)
throws Exception {
InaccurateTimeoutWatchdog watchdog = new
InaccurateTimeoutWatchdog(timeout, theTarget, myThreadPool);
- watchdog.enableLogging(getLogger());
+ ContainerUtil.enableLogging(watchdog, getLogger());
return watchdog;
}
}
Modified: james/server/trunk/src/test/org/apache/james/JamesTest.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/JamesTest.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/JamesTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/JamesTest.java Sat May 6
08:13:12 2006
@@ -19,6 +19,7 @@
package org.apache.james;
import org.apache.avalon.cornerstone.services.store.Store;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.services.MailServer;
import org.apache.james.services.MailServerTestAllImplementations;
import org.apache.james.services.UsersRepository;
@@ -40,13 +41,13 @@
james.service(setUpServiceManager());
MockLogger mockLogger = new MockLogger();
mockLogger.disableDebug();
- james.enableLogging(mockLogger);
+ ContainerUtil.enableLogging(james, mockLogger);
try {
JamesTestConfiguration conf = new JamesTestConfiguration();
conf.init();
- james.configure(conf);
- james.contextualize(new
MockContext(File.createTempFile("james_test", "tmp")));
- james.initialize();
+ ContainerUtil.configure(james, conf);
+ ContainerUtil.contextualize(james, new
MockContext(File.createTempFile("james_test", "tmp")));
+ ContainerUtil.initialize(james);
} catch (Exception e) {
e.printStackTrace();
fail("James.initialize() failed");
Modified:
james/server/trunk/src/test/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
---
james/server/trunk/src/test/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
(original)
+++
james/server/trunk/src/test/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
Sat May 6 08:13:12 2006
@@ -107,7 +107,7 @@
MimeMessage mm3 = getWrappedMessage(m2clone.getMessage());
assertNotNull(mm3);
// dispose m2 and check that the clone has still a valid message and
it is the same!
- ((MailImpl) m2).dispose();
+ ContainerUtil.dispose(m2);
assertEquals(mm3,getWrappedMessage(m2clone.getMessage()));
// change the message that should be not referenced by m2 that has
// been disposed, so it should not clone it!
@@ -126,7 +126,7 @@
MimeMessage mm = getWrappedMessage(mail.getMessage());
assertNotSame(mail.getMessage(),mailClone.getMessage());
// dispose mail and check that the clone has still a valid message and
it is the same!
- ((MailImpl) mail).dispose();
+ ContainerUtil.dispose(mail);
// dumb test
assertTrue(isSameMimeMessage(mailClone.getMessage(),mailClone.getMessage()));
// change the message that should be not referenced by mail that has
@@ -143,12 +143,12 @@
mail = new MailImpl("test",new MailAddress("[email protected]"),r,mw);
// cloning the message
MailImpl mailClone = (MailImpl) mail.duplicate();
- mail.dispose();
+ ContainerUtil.dispose(mail);
assertNotNull(getWrappedMessage(mailClone.getMessage()));
assertNull(mail.getMessage());
- mailClone.dispose();
+ ContainerUtil.dispose(mailClone);
assertNull(mailClone.getMessage());
assertNull(mail.getMessage());
Modified:
james/server/trunk/src/test/org/apache/james/dnsserver/DNSServerTest.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/dnsserver/DNSServerTest.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/dnsserver/DNSServerTest.java
(original)
+++ james/server/trunk/src/test/org/apache/james/dnsserver/DNSServerTest.java
Sat May 6 08:13:12 2006
@@ -18,6 +18,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.test.mock.avalon.MockLogger;
import org.xbill.DNS.Name;
import org.xbill.DNS.Record;
@@ -97,14 +98,14 @@
Configuration c = db.build(
new
ByteArrayInputStream("<dnsserver><autodiscover>true</autodiscover><authoritative>false</authoritative></dnsserver>".getBytes()),
"dnsserver");
- dnsServer.enableLogging(new MockLogger());
- dnsServer.configure(c);
- dnsServer.initialize();
+ ContainerUtil.enableLogging(dnsServer, new MockLogger());
+ ContainerUtil.configure(dnsServer, c);
+ ContainerUtil.initialize(dnsServer);
}
protected void tearDown() throws Exception {
dnsServer.setLookupper(null);
- dnsServer.dispose();
+ ContainerUtil.dispose(dnsServer);
}
private class ZoneLookupper implements Lookupper {
Modified:
james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java
(original)
+++ james/server/trunk/src/test/org/apache/james/pop3server/POP3ServerTest.java
Sat May 6 08:13:12 2006
@@ -18,6 +18,7 @@
import org.apache.avalon.cornerstone.services.sockets.SocketManager;
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStreamSource;
@@ -70,23 +71,22 @@
protected void setUp() throws Exception {
m_pop3Server = new POP3Server();
- m_pop3Server.enableLogging(new MockLogger());
-
- m_pop3Server.service(setUpServiceManager());
+ ContainerUtil.enableLogging(m_pop3Server, new MockLogger());
+ ContainerUtil.service(m_pop3Server, setUpServiceManager());
m_testConfiguration = new POP3TestConfiguration(m_pop3ListenerPort);
}
private void finishSetUp(POP3TestConfiguration testConfiguration)
throws Exception {
testConfiguration.init();
- m_pop3Server.configure(testConfiguration);
- m_pop3Server.initialize();
+ ContainerUtil.configure(m_pop3Server, testConfiguration);
+ ContainerUtil.initialize(m_pop3Server);
}
private MockServiceManager setUpServiceManager() {
MockServiceManager serviceManager = new MockServiceManager();
SimpleConnectionManager connectionManager = new
SimpleConnectionManager();
- connectionManager.enableLogging(new MockLogger());
+ ContainerUtil.enableLogging(connectionManager, new MockLogger());
serviceManager.put(JamesConnectionManager.ROLE, connectionManager);
m_mailServer = new MockMailServer();
serviceManager
Modified:
james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
---
james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java
(original)
+++
james/server/trunk/src/test/org/apache/james/remotemanager/RemoteManagerTest.java
Sat May 6 08:13:12 2006
@@ -18,9 +18,9 @@
package org.apache.james.remotemanager;
-import junit.framework.TestCase;
import org.apache.avalon.cornerstone.services.sockets.SocketManager;
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.net.telnet.TelnetClient;
import org.apache.james.services.JamesConnectionManager;
import org.apache.james.services.MailServer;
@@ -45,6 +45,8 @@
import java.util.Iterator;
import java.util.List;
+import junit.framework.TestCase;
+
/**
* Tests the org.apache.james.remotemanager.RemoteManager
* TODO: impl missing command tests for:
@@ -67,17 +69,16 @@
protected void setUp() throws Exception {
m_remoteManager = new RemoteManager();
- m_remoteManager.enableLogging(new MockLogger());
-
- m_remoteManager.service(setUpServiceManager());
+ ContainerUtil.enableLogging(m_remoteManager, new MockLogger());
+ ContainerUtil.service(m_remoteManager, setUpServiceManager());
m_testConfiguration = new
RemoteManagerTestConfiguration(m_remoteManagerListenerPort);
}
protected void finishSetUp(RemoteManagerTestConfiguration
testConfiguration) {
testConfiguration.init();
try {
- m_remoteManager.configure(testConfiguration);
- m_remoteManager.initialize();
+ ContainerUtil.configure(m_remoteManager, testConfiguration);
+ ContainerUtil.initialize(m_remoteManager);
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -141,7 +142,7 @@
private MockServiceManager setUpServiceManager() {
MockServiceManager serviceManager = new MockServiceManager();
SimpleConnectionManager connectionManager = new
SimpleConnectionManager();
- connectionManager.enableLogging(new MockLogger());
+ ContainerUtil.enableLogging(connectionManager, new MockLogger());
serviceManager.put(JamesConnectionManager.ROLE, connectionManager);
MockMailServer mailServer = new MockMailServer();
serviceManager.put(MailServer.ROLE, mailServer);
Modified:
james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
(original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/SMTPServerTest.java
Sat May 6 08:13:12 2006
@@ -18,6 +18,7 @@
import org.apache.avalon.cornerstone.services.sockets.SocketManager;
import org.apache.avalon.cornerstone.services.threads.ThreadManager;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.services.DNSServer;
import org.apache.james.services.JamesConnectionManager;
import org.apache.james.services.MailServer;
@@ -86,23 +87,22 @@
protected void setUp() throws Exception {
m_smtpServer = new SMTPServer();
- m_smtpServer.enableLogging(new MockLogger());
-
- m_smtpServer.service(setUpServiceManager());
+ ContainerUtil.enableLogging(m_smtpServer,new MockLogger());
+ ContainerUtil.service(m_smtpServer, setUpServiceManager());
m_testConfiguration = new SMTPTestConfiguration(m_smtpListenerPort);
}
private void finishSetUp(SMTPTestConfiguration testConfiguration) throws
Exception {
testConfiguration.init();
- m_smtpServer.configure(testConfiguration);
- m_smtpServer.initialize();
+ ContainerUtil.configure(m_smtpServer, testConfiguration);
+ ContainerUtil.initialize(m_smtpServer);
m_mailServer.setMaxMessageSizeBytes(m_testConfiguration.getMaxMessageSize());
}
private MockServiceManager setUpServiceManager() throws Exception {
MockServiceManager serviceManager = new MockServiceManager();
SimpleConnectionManager connectionManager = new
SimpleConnectionManager();
- connectionManager.enableLogging(new MockLogger());
+ ContainerUtil.enableLogging(connectionManager, new MockLogger());
serviceManager.put(JamesConnectionManager.ROLE, connectionManager);
serviceManager.put("org.apache.mailet.MailetContext", new
MockMailContext());
m_mailServer = new MockMailServer();
Modified:
james/server/trunk/src/test/org/apache/james/transport/LinearProcessorTest.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/transport/LinearProcessorTest.java?rev=400322&r1=400321&r2=400322&view=diff
==============================================================================
---
james/server/trunk/src/test/org/apache/james/transport/LinearProcessorTest.java
(original)
+++
james/server/trunk/src/test/org/apache/james/transport/LinearProcessorTest.java
Sat May 6 08:13:12 2006
@@ -16,6 +16,7 @@
***********************************************************************/
package org.apache.james.transport;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Logger;
import org.apache.james.core.MailImpl;
@@ -217,13 +218,13 @@
super.setUp();
t = new LinearProcessor();
Logger l = new ConsoleLogger();
- t.enableLogging(l);
- t.initialize();
+ ContainerUtil.enableLogging(t, l);
+ ContainerUtil.initialize(t);
}
public void tearDown() throws Exception {
- t.dispose();
+ ContainerUtil.dispose(t);
super.tearDown();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
