Author: norman
Date: Sun Jan 17 22:02:43 2010
New Revision: 900225
URL: http://svn.apache.org/viewvc?rev=900225&view=rev
Log:
Remove some more dependencies on avalon configuration in unit tests
fix generics warnings
Modified:
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java
james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/NNTPServerTest.java
james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/NNTPTestConfiguration.java
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTestConfiguration.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/JamesMailetLoaderTest.java
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
Modified:
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/test/mock/james/MockMailServer.java?rev=900225&r1=900224&r2=900225&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/test/mock/james/MockMailServer.java
Sun Jan 17 22:02:43 2010
@@ -39,7 +39,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.Map;
public class MockMailServer implements MailServer, Disposable {
@@ -52,7 +51,7 @@
private final InMemorySpoolRepository mails = new
InMemorySpoolRepository();
private String lastMailKey = null;
- private HashMap inboxes;
+ private HashMap<String,MailRepository> inboxes;
private boolean virtualHosting;
@@ -60,7 +59,7 @@
this.m_users = usersRepository;
}
- public void sendMail(MailAddress sender, Collection recipients,
MimeMessage msg) throws MessagingException {
+ public void sendMail(MailAddress sender, Collection<MailAddress>
recipients, MimeMessage msg) throws MessagingException {
// Object[] mailObjects = new Object[]{sender, recipients, new
MimeMessageCopyOnWriteProxy(msg)};
// mails.add(mailObjects);
//
@@ -70,7 +69,7 @@
m.dispose();
}
- public void sendMail(MailAddress sender, Collection recipients,
InputStream msg) throws MessagingException {
+ public void sendMail(MailAddress sender, Collection<MailAddress>
recipients, InputStream msg) throws MessagingException {
// Object[] mailObjects = new Object[]{sender, recipients, msg};
// mails.add(mailObjects);
MailImpl m = new MailImpl(MailUtil.newId(), sender, recipients, msg);
@@ -90,7 +89,7 @@
public void sendMail(MimeMessage message) throws MessagingException {
// taken from class org.apache.james.James
MailAddress sender = new
MailAddress((InternetAddress)message.getFrom()[0]);
- Collection recipients = new HashSet();
+ Collection<MailAddress> recipients = new HashSet<MailAddress>();
Address addresses[] = message.getAllRecipients();
if (addresses != null) {
for (int i = 0; i < addresses.length; i++) {
@@ -116,16 +115,11 @@
public void setUserInbox(String userName, MailRepository inbox) {
if (inboxes == null) {
- inboxes = new HashMap();
+ inboxes = new HashMap<String,MailRepository>();
}
inboxes.put(userName,inbox);
}
- public Map getRepositoryCounters() {
- return null; // trivial implementation
- }
-
-
public synchronized String getId() {
return MailUtil.newId();
}
@@ -165,9 +159,9 @@
// }
mails.dispose();
if (inboxes!=null) {
- Iterator i = inboxes.values().iterator();
+ Iterator<MailRepository> i = inboxes.values().iterator();
while (i.hasNext()) {
- MailRepository m = (MailRepository) i.next();
+ MailRepository m = i.next();
ContainerUtil.dispose(m);
}
}
Modified:
james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/NNTPServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/NNTPServerTest.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/NNTPServerTest.java
(original)
+++
james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/NNTPServerTest.java
Sun Jan 17 22:02:43 2010
@@ -52,7 +52,6 @@
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.ConfigurationAdapter;
public class NNTPServerTest extends TestCase {
protected int m_nntpListenerPort = Util.getNonPrivilegedPort();
@@ -107,11 +106,10 @@
protected void finishSetUp(NNTPTestConfiguration testConfiguration)
throws Exception {
testConfiguration.init();
- ConfigurationAdapter conf = new
ConfigurationAdapter(testConfiguration);
- m_nntpServer.configure(conf);
+ m_nntpServer.configure(testConfiguration);
m_nntpServer.init();
- protoserver.configure(conf);
+ protoserver.configure(testConfiguration);
protoserver.init();
}
Modified:
james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/NNTPTestConfiguration.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/NNTPTestConfiguration.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/NNTPTestConfiguration.java
(original)
+++
james/server/trunk/nntpserver-function/src/test/java/org/apache/james/nntpserver/NNTPTestConfiguration.java
Sun Jan 17 22:02:43 2010
@@ -19,16 +19,14 @@
package org.apache.james.nntpserver;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.james.test.util.Util;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
-public class NNTPTestConfiguration extends DefaultConfiguration {
+public class NNTPTestConfiguration extends DefaultConfigurationBuilder {
private int m_nntpListenerPort;
private boolean m_authRequired = false;
public NNTPTestConfiguration(int m_nntpListenerPort) {
- super("nntpserver");
this.m_nntpListenerPort = m_nntpListenerPort;
}
@@ -37,17 +35,11 @@
}
public void init() {
- setAttribute("enabled", true);
- addChild(Util.getValuedConfiguration("port", "" +
m_nntpListenerPort));
- DefaultConfiguration handlerConfig = new
DefaultConfiguration("handler");
- handlerConfig.addChild(Util.getValuedConfiguration("helloName",
- "myMailServer"));
-
handlerConfig.addChild(Util.getValuedConfiguration("connectiontimeout",
- "360000"));
-
handlerConfig.addChild(Util.getValuedConfiguration("authRequired",
- m_authRequired + ""));
-
- addChild(handlerConfig);
+ addProperty("[...@enabled]", true);
+ addProperty("port", "" + m_nntpListenerPort);
+ addProperty("handler.helloName","myMailServer");
+ addProperty("handler.connectiontimeout",360000);
+ addProperty("handler.authRequired",m_authRequired);
}
}
Modified:
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
(original)
+++
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Sun Jan 17 22:02:43 2010
@@ -56,7 +56,6 @@
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.ConfigurationAdapter;
import org.apache.james.util.POP3BeforeSMTPHelper;
import org.apache.mailet.MailAddress;
@@ -119,11 +118,10 @@
protected void finishSetUp(POP3TestConfiguration testConfiguration)
throws Exception {
testConfiguration.init();
- ConfigurationAdapter conf = new
ConfigurationAdapter(testConfiguration);
- m_pop3Server.configure(conf);
+ m_pop3Server.configure(testConfiguration);
m_pop3Server.init();
- protoserver.configure(conf);
+ protoserver.configure(testConfiguration);
protoserver.init();
}
Modified:
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
(original)
+++
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
Sun Jan 17 22:02:43 2010
@@ -19,37 +19,22 @@
package org.apache.james.pop3server;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.pop3server.core.CoreCmdHandlerLoader;
-import org.apache.james.test.util.Util;
-public class POP3TestConfiguration extends DefaultConfiguration {
+public class POP3TestConfiguration extends DefaultConfigurationBuilder {
private int m_pop3ListenerPort;
public POP3TestConfiguration(int pop3ListenerPort) {
- super("pop3server");
m_pop3ListenerPort = pop3ListenerPort;
}
public void init() {
- setAttribute("enabled", true);
- addChild(Util.getValuedConfiguration("port", "" + m_pop3ListenerPort));
- DefaultConfiguration handlerConfig = new
DefaultConfiguration("handler");
- handlerConfig.addChild(Util.getValuedConfiguration("helloName",
"myMailServer"));
-
handlerConfig.addChild(Util.getValuedConfiguration("connectiontimeout",
"360000"));
-
- DefaultConfiguration config = new DefaultConfiguration("handlerchain");
-
- config.addChild(createHandler(CoreCmdHandlerLoader.class.getName()));
- handlerConfig.addChild(config);
- addChild(handlerConfig);
- }
-
- private DefaultConfiguration createHandler(String className) {
- DefaultConfiguration d = new DefaultConfiguration("handler");
-
- d.setAttribute("class", className);
- return d;
+ addProperty("[...@enabled]", true);
+ addProperty("port", m_pop3ListenerPort);
+ addProperty("handler.helloName", "myMailServer");
+ addProperty("handler.connectiontimeout", "360000");
+ addProperty("handler.handlerchain.handle...@class]",
CoreCmdHandlerLoader.class.getName());
}
}
Modified:
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
(original)
+++
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTest.java
Sun Jan 17 22:02:43 2010
@@ -70,7 +70,6 @@
import org.apache.james.test.mock.james.MockUsersStore;
import org.apache.james.test.util.Util;
import org.apache.james.userrepository.MockUsersRepository;
-import org.apache.james.util.ConfigurationAdapter;
import org.apache.james.util.InternetPrintWriter;
/**
@@ -134,9 +133,8 @@
protected void finishSetUp(RemoteManagerTestConfiguration
testConfiguration) throws Exception {
testConfiguration.init();
try {
- ConfigurationAdapter conf = new
ConfigurationAdapter(testConfiguration);
- protoserver.configure(conf);
- handlerFactory.configure(conf);
+ protoserver.configure(testConfiguration);
+ handlerFactory.configure(testConfiguration);
handlerFactory.init();
protoserver.init();
Modified:
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTestConfiguration.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTestConfiguration.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTestConfiguration.java
(original)
+++
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/RemoteManagerTestConfiguration.java
Sun Jan 17 22:02:43 2010
@@ -21,11 +21,10 @@
package org.apache.james.remotemanager;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.remotemanager.core.CoreCmdHandlerLoader;
-import org.apache.james.test.util.Util;
-public class RemoteManagerTestConfiguration extends DefaultConfiguration {
+public class RemoteManagerTestConfiguration extends
DefaultConfigurationBuilder {
private int m_remoteManagerListenerPort;
private Integer m_connectionLimit = null;
@@ -33,8 +32,6 @@
private String m_loginPassword = "testPassword";
public RemoteManagerTestConfiguration(int smtpListenerPort) {
- super("smptserver");
-
m_remoteManagerListenerPort = smtpListenerPort;
}
@@ -61,38 +58,18 @@
public void init() {
- setAttribute("enabled", true);
+ addProperty("[...@enabled]", true);
- addChild(Util.getValuedConfiguration("port", "" +
m_remoteManagerListenerPort));
- if (m_connectionLimit != null)
addChild(Util.getValuedConfiguration("connectionLimit", "" +
m_connectionLimit.intValue()));
+ addProperty("port", m_remoteManagerListenerPort);
+ if (m_connectionLimit != null) addProperty("connectionLimit",
m_connectionLimit.intValue());
- DefaultConfiguration handlerConfig = new
DefaultConfiguration("handler");
- handlerConfig.addChild(Util.getValuedConfiguration("helloName",
"myMailServer"));
-
handlerConfig.addChild(Util.getValuedConfiguration("connectiontimeout",
"360000"));
-
- DefaultConfiguration adminAccounts = new
DefaultConfiguration("administrator_accounts");
-
- DefaultConfiguration account = new DefaultConfiguration("account");
-
- account.setAttribute("login", m_loginName);
- account.setAttribute("password", m_loginPassword);
-
- adminAccounts.addChild(account);
- handlerConfig.addChild(adminAccounts);
- DefaultConfiguration config = new DefaultConfiguration("handlerchain");
-
- config.addChild(createHandler(CoreCmdHandlerLoader.class.getName()));
- handlerConfig.addChild(config);
- addChild(handlerConfig);
- }
+ addProperty("handler.helloName", "myMailServer");
+ addProperty("handler.connectiontimeout", 360000);
+
+ addProperty("handler.administrator_accounts.accoun...@login]",
m_loginName);
+ addProperty("handler.administrator_accounts.accoun...@password]",
m_loginPassword);
- private DefaultConfiguration createHandler(String className) {
- DefaultConfiguration d = new DefaultConfiguration("handler");
+ addProperty("handler.handlerchain.handle...@class]",
CoreCmdHandlerLoader.class.getName());
- d.setAttribute("class", className);
- return d;
-
}
-
-
}
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
Sun Jan 17 22:02:43 2010
@@ -224,11 +224,10 @@
protected void finishSetUp(SMTPTestConfiguration testConfiguration) throws
Exception {
testConfiguration.init();
- ConfigurationAdapter conf = new
ConfigurationAdapter(testConfiguration);
- m_smtpServer.configure(conf);
+ m_smtpServer.configure(testConfiguration);
m_smtpServer.init();
- protoServer.configure(conf);
+ protoServer.configure(testConfiguration);
protoServer.init();
m_mailServer.setMaxMessageSizeBytes(m_testConfiguration.getMaxMessageSize()*1024);
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
Sun Jan 17 22:02:43 2010
@@ -21,18 +21,16 @@
package org.apache.james.smtpserver;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.smtpserver.integration.CoreCmdHandlerLoader;
import org.apache.james.smtpserver.protocol.core.fastfail.DNSRBLHandler;
import org.apache.james.smtpserver.protocol.core.fastfail.MaxRcptHandler;
import
org.apache.james.smtpserver.protocol.core.fastfail.ResolvableEhloHeloHandler;
import
org.apache.james.smtpserver.protocol.core.fastfail.ReverseEqualsEhloHeloHandler;
import
org.apache.james.smtpserver.protocol.core.fastfail.ValidSenderDomainHandler;
-import org.apache.james.test.mock.util.AttrValConfiguration;
-import org.apache.james.test.util.Util;
-public class SMTPTestConfiguration extends DefaultConfiguration {
+public class SMTPTestConfiguration extends DefaultConfigurationBuilder {
private int m_smtpListenerPort;
private int m_maxMessageSizeKB = 0;
@@ -55,8 +53,6 @@
public SMTPTestConfiguration(int smtpListenerPort) {
- super("smptserver");
-
m_smtpListenerPort = smtpListenerPort;
}
@@ -147,86 +143,49 @@
}
public void init() throws ConfigurationException {
- setAttribute("enabled", true);
+ addProperty("[...@enabled]", true);
- addChild(Util.getValuedConfiguration("port", "" + m_smtpListenerPort));
- if (m_connectionLimit != null)
addChild(Util.getValuedConfiguration("connectionLimit", "" +
m_connectionLimit.intValue()));
- if (m_connectionBacklog != null)
addChild(Util.getValuedConfiguration("connectionBacklog", "" +
m_connectionBacklog.intValue()));
-
- DefaultConfiguration handlerConfig = new
DefaultConfiguration("handler");
- handlerConfig.addChild(Util.getValuedConfiguration("helloName",
"myMailServer"));
-
handlerConfig.addChild(Util.getValuedConfiguration("connectiontimeout",
"360000"));
-
handlerConfig.addChild(Util.getValuedConfiguration("authorizedAddresses",
m_authorizedAddresses));
- handlerConfig.addChild(Util.getValuedConfiguration("maxmessagesize",
"" + m_maxMessageSizeKB));
- handlerConfig.addChild(Util.getValuedConfiguration("authRequired",
m_authorizingMode));
-
handlerConfig.addChild(Util.getValuedConfiguration("heloEhloEnforcement",
m_heloEhloEnforcement+""));
-
handlerConfig.addChild(Util.getValuedConfiguration("addressBracketsEnforcement",
m_addressBracketsEnforcement+""));
+ addProperty("port", m_smtpListenerPort);
+ if (m_connectionLimit != null) addProperty("connectionLimit",
m_connectionLimit.intValue());
+ if (m_connectionBacklog != null) addProperty("connectionBacklog",
m_connectionBacklog.intValue());
- DefaultConfiguration tlsConfig = new DefaultConfiguration("startTLS");
- tlsConfig.setAttribute("enable", m_startTLS);
- tlsConfig.addChild(new
AttrValConfiguration("keystore","file://conf/test_keystore"));
- tlsConfig.addChild(new AttrValConfiguration("secret", "jamestest"));
- addChild(tlsConfig);
+ addProperty("handler.helloName", "myMailServer");
+ addProperty("handler.connectiontimeout", 360000);
+ addProperty("handler.authorizedAddresses", m_authorizedAddresses);
+ addProperty("handler.maxmessagesize", m_maxMessageSizeKB);
+ addProperty("handler.authRequired", m_authorizingMode);
+ addProperty("handler.heloEhloEnforcement", m_heloEhloEnforcement);
+ addProperty("handler.addressBracketsEnforcement",
m_addressBracketsEnforcement);
- if (m_verifyIdentity)
handlerConfig.addChild(Util.getValuedConfiguration("verifyIdentity", "" +
m_verifyIdentity));
+ addProperty("starttl...@enable]", m_startTLS);
+ addProperty("starttl...@keystore]","file://conf/test_keystore");
+ addProperty("starttl...@secret]", "jamestest");
+ if (m_verifyIdentity) addProperty("handler.verifyIdentity",
m_verifyIdentity);
- DefaultConfiguration config = new DefaultConfiguration("handlerchain");
-
// add the rbl handler
if (m_useRBL) {
- DefaultConfiguration handler = new DefaultConfiguration("handler");
- handler.setAttribute("class", DNSRBLHandler.class.getName());
-
- DefaultConfiguration blacklist = new DefaultConfiguration(
- "blacklist");
- blacklist.setValue("bl.spamcop.net.");
- DefaultConfiguration rblServers = new DefaultConfiguration(
- "rblservers");
- rblServers.addChild(blacklist);
-
- handler.addChild(rblServers);
- config.addChild(handler);
-
+
+ addProperty("handler.handlerchain.handle...@class]",
DNSRBLHandler.class.getName());
+
addProperty("handler.handlerchain.handler.rblservers.blacklist","bl.spamcop.net.");
}
if (m_heloResolv || m_ehloResolv) {
- DefaultConfiguration d = createHandler(
- ResolvableEhloHeloHandler.class.getName());
- d.addChild(Util.getValuedConfiguration("checkAuthNetworks",
- m_checkAuthNetworks + ""));
- config.addChild(d);
+ addProperty("handler.handlerchain.handle...@class]",
ResolvableEhloHeloHandler.class.getName());
+ addProperty("handler.handlerchain.handler.checkAuthNetworks",
m_checkAuthNetworks);
}
if (m_reverseEqualsHelo || m_reverseEqualsEhlo) {
- DefaultConfiguration d = createHandler(
- ReverseEqualsEhloHeloHandler.class.getName());
- d.addChild(Util.getValuedConfiguration("checkAuthNetworks",
- m_checkAuthNetworks + ""));
- config.addChild(d);
+ addProperty("handler.handlerchain.handle...@class]",
ReverseEqualsEhloHeloHandler.class.getName());
+ addProperty("handler.handlerchain.handler.checkAuthNetworks",
m_checkAuthNetworks);
}
if (m_senderDomainResolv) {
- DefaultConfiguration d = createHandler(
- ValidSenderDomainHandler.class.getName());
- d.addChild(Util.getValuedConfiguration("checkAuthNetworks",
- m_checkAuthNetworks + ""));
- config.addChild(d);
+ addProperty("handler.handlerchain.handle...@class]",
ValidSenderDomainHandler.class.getName());
+ addProperty("handler.handlerchain.handler.checkAuthNetworks",
m_checkAuthNetworks);
}
if (m_maxRcpt > 0) {
- DefaultConfiguration d = createHandler(MaxRcptHandler.class
- .getName());
- d.addChild(Util.getValuedConfiguration("maxRcpt", m_maxRcpt + ""));
- config.addChild(d);
+ addProperty("handler.handlerchain.handle...@class]",
MaxRcptHandler.class.getName());
+ addProperty("handler.handlerchain.handler.maxRcpt", m_maxRcpt);
}
-
- config.addChild(createHandler(CoreCmdHandlerLoader.class.getName()));
- handlerConfig.addChild(config);
- addChild(handlerConfig);
- }
-
- private DefaultConfiguration createHandler(String className) {
- DefaultConfiguration d = new DefaultConfiguration("handler");
-
- d.setAttribute("class", className);
- return d;
+ addProperty("handler.handlerchain.handle...@class]",
CoreCmdHandlerLoader.class.getName());
}
}
Modified:
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/JamesMailetLoaderTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/JamesMailetLoaderTest.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/JamesMailetLoaderTest.java
(original)
+++
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/JamesMailetLoaderTest.java
Sun Jan 17 22:02:43 2010
@@ -21,37 +21,35 @@
package org.apache.james.transport;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.mail.MessagingException;
+
import junit.framework.TestCase;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
+
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.kernel.mock.FakeLoader;
-import org.apache.james.test.util.Util;
import org.apache.james.transport.mailets.MailetLoaderTestMailet;
-import org.apache.james.util.ConfigurationAdapter;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetConfig;
-import javax.mail.MessagingException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
public class JamesMailetLoaderTest extends TestCase {
private JamesMailetLoader m_jamesMailetLoader = new JamesMailetLoader();
private JamesMailetLoaderConfiguration m_conf = new
JamesMailetLoaderConfiguration();
- private class JamesMailetLoaderConfiguration extends DefaultConfiguration {
+ private class JamesMailetLoaderConfiguration extends
DefaultConfigurationBuilder {
private List<String> m_packageNames = new ArrayList<String>();
public JamesMailetLoaderConfiguration() {
- super("mailetpackages");
}
public void init() {
for (Iterator<String> iterator = m_packageNames.iterator();
iterator.hasNext();) {
String packageName = (String) iterator.next();
- addChild(Util.getValuedConfiguration("mailetpackage",
packageName));
+ addProperty("mailetpackage", packageName);
}
}
@@ -69,7 +67,7 @@
private void setUpLoader() throws Exception {
m_conf.init();
m_jamesMailetLoader.setLog(new SimpleLog("Test"));
- m_jamesMailetLoader.configure(new ConfigurationAdapter(m_conf));
+ m_jamesMailetLoader.configure(m_conf);
m_jamesMailetLoader.setLoaderService(new FakeLoader());
}
Modified:
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java
(original)
+++
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java
Sun Jan 17 22:02:43 2010
@@ -46,6 +46,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import junit.framework.TestCase;
@@ -69,7 +70,7 @@
private class CheckerMailet extends GenericMailet {
- public ArrayList receivedMails = new ArrayList();
+ public List<Mail> receivedMails = new ArrayList<Mail>();
public void service(Mail mail) throws MessagingException {
Mail m2 = new MailImpl(mail, mail.getName());
@@ -148,14 +149,14 @@
linearProcessor.add(all, checkerMailet);
linearProcessor.closeProcessorLists();
- Collection recipients = new ArrayList();
+ Collection<MailAddress> recipients = new ArrayList<MailAddress>();
recipients.add(new MailAddress("rec1", "domain.com"));
recipients.add(new MailAddress("rec2", "domain.com"));
try {
MailImpl m = new MailImpl("mail1", new MailAddress("sender",
"domain.com"), recipients, mimeMessage);
linearProcessor.service(m);
- ArrayList a = checkerMailet.receivedMails;
+ List<Mail> a = checkerMailet.receivedMails;
assertEquals(2, a.size());
Mail mail1 = ((Mail) a.get(0));
Mail mail2 = ((Mail) a.get(1));
@@ -198,7 +199,7 @@
linearProcessor.add(all, checkerMailet);
linearProcessor.closeProcessorLists();
- Collection recipients = new ArrayList();
+ Collection<MailAddress> recipients = new ArrayList<MailAddress>();
recipients.add(new MailAddress("rec1", "domain.com"));
recipients.add(new MailAddress("rec2", "domain.com"));
try {
@@ -206,7 +207,7 @@
"domain.com"), recipients, mimeMessage);
m.setState("MYSTATE");
linearProcessor.service(m);
- ArrayList a = checkerMailet.receivedMails;
+ List<Mail> a = checkerMailet.receivedMails;
assertEquals(2, a.size());
Mail mail1 = ((Mail) a.get(0));
Mail mail2 = ((Mail) a.get(1));
Modified:
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
(original)
+++
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
Sun Jan 17 22:02:43 2010
@@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import javax.mail.MessagingException;
@@ -54,7 +55,7 @@
*/
public class LocalDeliveryTest extends TestCase {
- private HashMap mailboxes;
+ private HashMap<String,MailRepository> mailboxes;
private FakeMailContext mockMailetContext;
private MockMailServer mockMailServer;
private MockUsersRepository mockUsersRepository;
@@ -66,7 +67,7 @@
Mail mail = createMail(new String[] {"unknownu...@ignoreddomain"});
m.service(mail);
- HashMap expectedMails = new HashMap();
+ Map<String, String[]> expectedMails = new HashMap<String,String[]>();
expectedMails.put("errors", new String[]
{"unknownu...@ignoreddomain"});
assertDeliveryWorked(mail, expectedMails);
@@ -80,7 +81,7 @@
Mail mail = createMail(new String[] {"localu...@ignoreddomain"});
m.service(mail);
- HashMap expectedMails = new HashMap();
+ Map<String,String[]> expectedMails = new HashMap<String,String[]>();
expectedMails.put("localuser", new String[]
{"localu...@ignoreddomain"});
assertDeliveryWorked(mail, expectedMails);
@@ -93,7 +94,7 @@
Mail mail = createMail(new String[] {"localu...@ignoreddomain"});
m.service(mail);
- HashMap expectedMails = new HashMap();
+ Map<String,String[]> expectedMails = new HashMap<String,String[]>();
expectedMails.put("errors", new String[] {"localu...@ignoreddomain"});
assertDeliveryWorked(mail, expectedMails);
@@ -107,7 +108,7 @@
Mail mail = createMail(new String[] {"localu...@ignoreddomain"});
m.service(mail);
- HashMap expectedMails = new HashMap();
+ Map<String,String[]> expectedMails = new HashMap<String,String[]>();
expectedMails.put("localuser", new String[]
{"localu...@ignoreddomain"});
assertDeliveryWorked(mail, expectedMails);
@@ -121,7 +122,7 @@
Mail mail = createMail(new String[] {"aliasedu...@ignoreddomain"});
m.service(mail);
- HashMap expectedMails = new HashMap();
+ Map<String,String[]> expectedMails = new HashMap<String,String[]>();
expectedMails.put("localuser", new String[]
{"localu...@ignoreddomain"});
assertDeliveryWorked(mail, expectedMails);
@@ -134,7 +135,7 @@
Mail mail = createMail(new String[] {"aliasedu...@ignoreddomain"});
m.service(mail);
- HashMap expectedMails = new HashMap();
+ Map<String,String[]> expectedMails = new HashMap<String,String[]>();
expectedMails.put("aliasedUser", new String[]
{"aliasedu...@ignoreddomain"});
assertDeliveryWorked(mail, expectedMails);
@@ -148,7 +149,7 @@
Mail mail = createMail(new String[] {"forwardingu...@ignoreddomain"});
m.service(mail);
- HashMap expectedMails = new HashMap();
+ Map<String,String[]> expectedMails = new HashMap<String,String[]>();
expectedMails.put("errors", new String[]
{"forwardingu...@ignoreddomain"});
assertDeliveryWorked(mail, expectedMails);
@@ -163,7 +164,7 @@
Mail mail = createMail(new String[] {"forwardingu...@ignoreddomain"});
m.service(mail);
- HashMap expectedMails = new HashMap();
+ Map<String,String[]> expectedMails = new HashMap<String,String[]>();
expectedMails.put("resent", new String[] {"remoteu...@remotedomain"});
assertDeliveryWorked(mail, expectedMails);
@@ -178,7 +179,7 @@
Mail mail = createMail(new String[]
{"aliasforwardu...@ignoreddomain"});
m.service(mail);
- HashMap expectedMails = new HashMap();
+ Map<String,String[]> expectedMails = new HashMap<String,String[]>();
expectedMails.put("resent", new String[] {"remoteu...@remotedomain"});
assertDeliveryWorked(mail, expectedMails);
@@ -192,7 +193,7 @@
Mail mail = createMail(new String[]
{"aliasforwardu...@ignoreddomain"});
m.service(mail);
- HashMap expectedMails = new HashMap();
+ Map<String,String[]> expectedMails = new HashMap<String,String[]>();
expectedMails.put("localuser", new String[]
{"localu...@ignoreddomain"});
assertDeliveryWorked(mail, expectedMails);
@@ -226,7 +227,7 @@
Mail mail = createMail(new String[] {"virt...@hosting"});
m.service(mail);
- HashMap expectedMails = new HashMap();
+ Map<String,String[]> expectedMails = new HashMap<String,String[]>();
expectedMails.put("virt...@hosting", new String[] {"virt...@hosting"});
assertDeliveryWorked(mail, expectedMails);
@@ -263,22 +264,24 @@
u.setForwarding(true);
u.setForwardingDestination(new MailAddress("localu...@ignoreddomain"));
mockMailServer = new MockMailServer(mockUsersRepository);
- mailboxes = new HashMap();
+ mailboxes = new HashMap<String,MailRepository>();
mailboxes.put("localuser", new InMemorySpoolRepository());
mailboxes.put("aliasedUser", new InMemorySpoolRepository());
mailboxes.put("virt...@hosting",new InMemorySpoolRepository());
- Iterator mbi = mailboxes.keySet().iterator();
+ Iterator<String> mbi = mailboxes.keySet().iterator();
while (mbi.hasNext()) {
- String mboxName = (String) mbi.next();
+ String mboxName = mbi.next();
mockMailServer.setUserInbox(mboxName, (MailRepository)
mailboxes.get(mboxName));
}
mockMailetContext = new FakeMailContext() {
+ @SuppressWarnings("unchecked")
public void sendMail(MailAddress sender, Collection recipients,
MimeMessage msg) throws MessagingException {
mockMailServer.sendMail(sender, recipients, msg);
}
+ @SuppressWarnings("unchecked")
public void sendMail(MailAddress sender, Collection recipients,
MimeMessage msg, String state) throws MessagingException {
MailImpl m = new MailImpl(MailUtil.newId(), sender,
recipients, msg);
m.setState(state);
@@ -310,11 +313,11 @@
* @param expectedMails
* @throws MessagingException
*/
- private void assertDeliveryWorked(Mail mail, HashMap expectedMails) throws
MessagingException {
+ private void assertDeliveryWorked(Mail mail, Map<String,String[]>
expectedMails) throws MessagingException {
assertEquals(Mail.GHOST, mail.getState());
- Iterator mboxes = mailboxes.keySet().iterator();
+ Iterator<String> mboxes = mailboxes.keySet().iterator();
while (mboxes.hasNext()) {
- String mboxName = (String) mboxes.next();
+ String mboxName = mboxes.next();
MailRepository inMemorySpoolRepository = (MailRepository)
mailboxes.get(mboxName);
assertExpectedMailsInRepository(mail, (String[])
expectedMails.get(mboxName), inMemorySpoolRepository);
@@ -323,9 +326,9 @@
MailRepository sentMailsRepository =
mockMailServer.getSentMailsRepository();
MailRepository errorsMailRepository = new InMemorySpoolRepository();
- Iterator keys = sentMailsRepository.list();
+ Iterator<String> keys = sentMailsRepository.list();
while (keys.hasNext()) {
- String nextKey = (String) keys.next();
+ String nextKey = keys.next();
Mail m = sentMailsRepository.retrieve(nextKey);
if (Mail.ERROR.equals(m.getState())) {
errorsMailRepository.store(m);
@@ -352,12 +355,12 @@
* @throws MessagingException
*/
private void assertExpectedMailsInRepository(Mail mail, String[]
expectedDeliveries, MailRepository inMemorySpoolRepository) throws
MessagingException {
- List c = expectedDeliveries != null ? new
ArrayList(Arrays.asList(expectedDeliveries)) : new ArrayList();
- Iterator i = inMemorySpoolRepository.list();
+ List<String> c = expectedDeliveries != null ? new
ArrayList<String>(Arrays.asList(expectedDeliveries)) : new ArrayList<String>();
+ Iterator<String> i = inMemorySpoolRepository.list();
System.out.println("check: "+c.size()+"|"+inMemorySpoolRepository);
for (int j = 0; j < c.size(); j++) {
assertTrue("No mails have been found in the repository",
i.hasNext());
- String next = (String) i.next();
+ String next = i.next();
assertNotNull("Mail has not been stored", next);
Mail storedMail = inMemorySpoolRepository.retrieve(next);
assertNotNull("Mail cannot be retrieved", storedMail);
@@ -379,7 +382,7 @@
*/
private Mail createMail(String[] recipients) throws MessagingException {
Mail mail = new FakeMail();
- ArrayList a = new ArrayList(recipients.length);
+ List<MailAddress> a = new ArrayList<MailAddress>(recipients.length);
for (int i = 0; i < recipients.length; i++) {
a.add(new MailAddress(recipients[i]));
}
Modified:
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java
(original)
+++
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/VirtualUserTableTest.java
Sun Jan 17 22:02:43 2010
@@ -86,7 +86,7 @@
table.service(mail);
assertEquals(3,mail.getRecipients().size());
- Iterator it = mail.getRecipients().iterator();
+ Iterator<MailAddress> it = mail.getRecipients().iterator();
assertEquals("whate...@localhost",
((MailAddress)it.next()).toString());
assertEquals("b...@localhost", ((MailAddress)it.next()).toString());
assertEquals("apa...@localhost", ((MailAddress)it.next()).toString());
Modified:
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java
(original)
+++
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepository.java
Sun Jan 17 22:02:43 2010
@@ -34,7 +34,7 @@
public class MockUsersRepository extends AbstractUsersRepository {
- private final HashMap m_users = new HashMap();
+ private final HashMap<String,User> m_users = new HashMap<String,User>();
/**
* force the repository to hold implementations of JamesUser interface,
instead of User
@@ -165,17 +165,17 @@
return m_users.size();
}
- protected List listUserNames() {
- Iterator users = m_users.values().iterator();
- List userNames = new LinkedList();
+ protected List<String> listUserNames() {
+ Iterator<User> users = m_users.values().iterator();
+ List<String> userNames = new LinkedList<String>();
while ( users.hasNext() ) {
- User user = (User)users.next();
+ User user = users.next();
userNames.add(user.getUserName());
}
return userNames;
}
- public Iterator list() {
+ public Iterator<String> list() {
return listUserNames().iterator();
}
Modified:
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java?rev=900225&r1=900224&r2=900225&view=diff
==============================================================================
---
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
(original)
+++
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
Sun Jan 17 22:02:43 2010
@@ -59,6 +59,7 @@
assertFalse("users repository not empty",
usersRepository.list().hasNext());
}
+ @SuppressWarnings("deprecation")
public void testAddUserOnce() {
boolean res = usersRepository.addUser("username", "password");
assertTrue("User not added", res);
@@ -83,6 +84,7 @@
}
+ @SuppressWarnings("deprecation")
public void testUserAddedIsFound() {
boolean res = usersRepository.addUser("username", "password");
assertTrue("User not added", res);
@@ -105,20 +107,20 @@
}
public void testUserListing() {
- ArrayList keys = new ArrayList(3);
+ ArrayList<String> keys = new ArrayList<String>(3);
keys.add("username1");
keys.add("username2");
keys.add("username3");
- for (Iterator i = keys.iterator(); i.hasNext(); ) {
- String username = (String) i.next();
+ for (Iterator<String> i = keys.iterator(); i.hasNext(); ) {
+ String username = i.next();
boolean res = usersRepository.addUser(username, username);
assertTrue("User "+username+" not added", res);
}
assertEquals("Wrong number of users found", keys.size(),
usersRepository.countUsers());
// check list return all and only the expected users
- ArrayList check = new ArrayList(keys);
- for (Iterator i = usersRepository.list(); i.hasNext(); ) {
+ ArrayList<String> check = new ArrayList<String>(keys);
+ for (Iterator<String> i = usersRepository.list(); i.hasNext(); ) {
String username = (String) i.next();
if (getPasswordsEnabled()) {
assertTrue(usersRepository.test(username, username));
@@ -178,6 +180,7 @@
}
+ @SuppressWarnings("deprecation")
public void testCaseInsensitivesMethods() {
assertTrue("User not added", usersRepository.addUser("userName",
"password"));
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
