Author: norman
Date: Sun Oct 25 17:44:24 2009
New Revision: 829621
URL: http://svn.apache.org/viewvc?rev=829621&view=rev
Log:
Replace deprecated methods / add Generics
Modified:
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractAvalonStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
james/server/trunk/experimental-activemq-function/src/main/java/org/apache/james/jms/activemq/BrokerManager.java
james/server/trunk/experimental-activemq-function/src/main/java/org/apache/james/jms/builder/SimpleMailBuilder.java
james/server/trunk/experimental-activemq-function/src/test/java/org/apache/james/jms/builders/SimpleMailBuilderTest.java
james/server/trunk/jcr-store/src/main/java/org/apache/james/jcr/JCRMailRepository.java
james/server/trunk/jcr-store/src/test/java/org/apache/james/jcr/JcrUserRepositoryTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RecipientIsRegexTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/AbstractRemoteDeliveryTest.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/IOMessagingException.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/NullMessagingException.java
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/ProcMail.java
james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jcr/AvalonJCRMailRepository.java
james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jms/activemq/JMSService.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTestConfiguration.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java
Modified:
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractAvalonStore.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractAvalonStore.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractAvalonStore.java
(original)
+++
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AbstractAvalonStore.java
Sun Oct 25 17:44:24 2009
@@ -42,7 +42,7 @@
extends AbstractLogEnabled
implements Serviceable, Configurable, Initializable {
- private HashMap objects;
+ private HashMap<String,Object> objects;
/**
* The Avalon configuration used by the instance
@@ -77,7 +77,7 @@
throws Exception {
getLogger().info(getStoreName() + " init...");
- objects = new HashMap();
+ objects = new HashMap<String,Object>();
Configuration[] repConfs = getConfigurations(configuration);
ClassLoader theClassLoader = null;
@@ -137,7 +137,7 @@
* @return an Iterator over the set of repository names
* for this store
*/
- protected Iterator getObjectNames() {
+ protected Iterator<String> getObjectNames() {
return this.objects.keySet().iterator();
}
Modified:
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java
(original)
+++
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java
Sun Oct 25 17:44:24 2009
@@ -58,7 +58,7 @@
* @return an Iterator over the set of repository names
* for this store
*/
- public Iterator getRepositoryNames() {
+ public Iterator<String> getRepositoryNames() {
return getObjectNames();
}
Modified:
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java
(original)
+++
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/management/UserManagementTest.java
Sun Oct 25 17:44:24 2009
@@ -229,7 +229,7 @@
}
public void testListRepositories() throws UserManagementException {
- List userRepositoryNames = m_userManagement.getUserRepositoryNames();
+ List<String> userRepositoryNames =
m_userManagement.getUserRepositoryNames();
assertTrue("default is there",
userRepositoryNames.contains("LocalUsers"));
}
}
Modified:
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
(original)
+++
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
Sun Oct 25 17:44:24 2009
@@ -114,7 +114,7 @@
user.setAlias(alias);
repos.updateUser(user);
- Collection map = ((VirtualUserTable) repos).getMappings(username,
domain);
+ Collection<String> map = ((VirtualUserTable)
repos).getMappings(username, domain);
assertNull("No mapping", map);
user.setAliasing(true);
@@ -134,7 +134,7 @@
user.setForwarding(true);
repos.updateUser(user);
map = ((VirtualUserTable) repos).getMappings(username, domain);
- Iterator mappings = map.iterator();
+ Iterator<String> mappings = map.iterator();
assertTrue("Two mapping",map.size() == 2);
assertEquals("Alias found", mappings.next().toString(), alias + "@" +
domain);
assertEquals("Forward found", mappings.next().toString(), forward);
Modified:
james/server/trunk/experimental-activemq-function/src/main/java/org/apache/james/jms/activemq/BrokerManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-activemq-function/src/main/java/org/apache/james/jms/activemq/BrokerManager.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/experimental-activemq-function/src/main/java/org/apache/james/jms/activemq/BrokerManager.java
(original)
+++
james/server/trunk/experimental-activemq-function/src/main/java/org/apache/james/jms/activemq/BrokerManager.java
Sun Oct 25 17:44:24 2009
@@ -48,7 +48,7 @@
public class BrokerManager {
private final BrokerService broker;
- private final Collection registrations;
+ private final Collection<ConsumerRegistration> registrations;
private final Log log;
private ActiveMQConnectionFactory factory;
@@ -57,7 +57,7 @@
public BrokerManager(final BrokerService broker, final Log log) {
this.broker = broker;
- this.registrations = new ArrayList();
+ this.registrations = new ArrayList<ConsumerRegistration>();
this.log = log;
}
@@ -73,8 +73,8 @@
factory = new
ActiveMQConnectionFactory("vm://localhost");
connection = factory.createConnection();
- for (final Iterator
it=registrations.iterator();it.hasNext();) {
- final ConsumerRegistration registration
= (ConsumerRegistration) it.next();
+ for (final Iterator<ConsumerRegistration>
it=registrations.iterator();it.hasNext();) {
+ final ConsumerRegistration registration
= it.next();
try {
registration.register(this);
it.remove();
Modified:
james/server/trunk/experimental-activemq-function/src/main/java/org/apache/james/jms/builder/SimpleMailBuilder.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-activemq-function/src/main/java/org/apache/james/jms/builder/SimpleMailBuilder.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/experimental-activemq-function/src/main/java/org/apache/james/jms/builder/SimpleMailBuilder.java
(original)
+++
james/server/trunk/experimental-activemq-function/src/main/java/org/apache/james/jms/builder/SimpleMailBuilder.java
Sun Oct 25 17:44:24 2009
@@ -73,7 +73,7 @@
}
public Mail build(String text) throws MessagingException {
- final Collection recipients = new ArrayList();
+ final Collection<MailAddress> recipients = new
ArrayList<MailAddress>();
MailAddress sender = null;
final int length = text.length();
int position = 0;
@@ -135,7 +135,7 @@
return result;
}
- private void parseTo(final String text, Collection addresses, final int
length, int position) throws ParseException {
+ private void parseTo(final String text, Collection<MailAddress>
addresses, final int length, int position) throws ParseException {
int eol = text.indexOf('\r', position);
if (eol == -1) {
eol = length;
@@ -160,7 +160,7 @@
}
}
- private void addMailAddresses(Collection addresses, final MailboxList
mailboxes) throws ParseException {
+ private void addMailAddresses(Collection<MailAddress> addresses, final
MailboxList mailboxes) throws ParseException {
int size = mailboxes.size();
for (int i=0;i< size;i++) {
final MailAddress address =
toMailAddress(mailboxes.get(i));
Modified:
james/server/trunk/experimental-activemq-function/src/test/java/org/apache/james/jms/builders/SimpleMailBuilderTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-activemq-function/src/test/java/org/apache/james/jms/builders/SimpleMailBuilderTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/experimental-activemq-function/src/test/java/org/apache/james/jms/builders/SimpleMailBuilderTest.java
(original)
+++
james/server/trunk/experimental-activemq-function/src/test/java/org/apache/james/jms/builders/SimpleMailBuilderTest.java
Sun Oct 25 17:44:24 2009
@@ -68,9 +68,9 @@
assertEquals(KEY, mail.getName());
MailAddress sender = mail.getSender();
assertNotNull("Use 'from' header", sender);
- assertEquals("foobar", sender.getUser());
- assertEquals("Blurdybloop.COM", sender.getHost());
- Collection recipients = mail.getRecipients();
+ assertEquals("foobar", sender.getLocalPart());
+ assertEquals("Blurdybloop.COM", sender.getDomain());
+ Collection<MailAddress> recipients = mail.getRecipients();
assertNotNull(recipients);
assertEquals("Use 'to' header", 1, recipients.size());
MimeMessage message = mail.getMessage();
Modified:
james/server/trunk/jcr-store/src/main/java/org/apache/james/jcr/JCRMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/jcr-store/src/main/java/org/apache/james/jcr/JCRMailRepository.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/jcr-store/src/main/java/org/apache/james/jcr/JCRMailRepository.java
(original)
+++
james/server/trunk/jcr-store/src/main/java/org/apache/james/jcr/JCRMailRepository.java
Sun Oct 25 17:44:24 2009
@@ -100,11 +100,11 @@
- public Iterator list() throws MessagingException {
+ public Iterator<String> list() throws MessagingException {
try {
Session session = login();
try {
- Collection keys = new ArrayList();
+ Collection<String> keys = new ArrayList<String>();
QueryManager manager =
session.getWorkspace().getQueryManager();
Query query = manager.createQuery(
"/jcr:root/" + path + "//element(*,james:mail)",
@@ -213,14 +213,14 @@
remove(mail.getName());
}
- public void remove(Collection mails) throws MessagingException {
+ public void remove(Collection<Mail> mails) throws MessagingException {
try {
Session session = login();
try {
QueryManager manager =
session.getWorkspace().getQueryManager();
- Iterator iterator = mails.iterator();
+ Iterator<Mail> iterator = mails.iterator();
while (iterator.hasNext()) {
- Mail mail = (Mail) iterator.next();
+ Mail mail = iterator.next();
try {
String name = ISO9075.encode(
Text.escapeIllegalJcrChars(mail.getName()));
@@ -483,11 +483,12 @@
* @throws MessagingException if a messaging error occurs
* @throws RepositoryException if a repository error occurs
*/
- private Collection getRecipients(Node node)
+ @SuppressWarnings("unchecked")
+ private Collection<MailAddress> getRecipients(Node node)
throws MessagingException, RepositoryException {
try {
Value[] values = node.getProperty("james:recipients").getValues();
- Collection recipients = new ArrayList(values.length);
+ Collection<MailAddress> recipients = new
ArrayList<MailAddress>(values.length);
for (int i = 0; i < values.length; i++) {
recipients.add(new MailAddress(values[i].getString()));
}
@@ -505,10 +506,10 @@
* @throws MessagingException if a messaging error occurs
* @throws RepositoryException if a repository error occurs
*/
- private void setRecipients(Node node, Collection recipients)
+ private void setRecipients(Node node, Collection<MailAddress> recipients)
throws MessagingException, RepositoryException {
String[] values = new String[recipients.size()];
- Iterator iterator = recipients.iterator();
+ Iterator<MailAddress> iterator = recipients.iterator();
for (int i = 0; iterator.hasNext(); i++) {
values[i] = iterator.next().toString();
}
@@ -619,7 +620,7 @@
*/
private void setAttributes(Node node, Mail mail)
throws RepositoryException, IOException {
- Iterator iterator = mail.getAttributeNames();
+ Iterator<String> iterator = mail.getAttributeNames();
while (iterator.hasNext()) {
String name = (String) iterator.next();
Object value = mail.getAttribute(name);
Modified:
james/server/trunk/jcr-store/src/test/java/org/apache/james/jcr/JcrUserRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/jcr-store/src/test/java/org/apache/james/jcr/JcrUserRepositoryTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/jcr-store/src/test/java/org/apache/james/jcr/JcrUserRepositoryTest.java
(original)
+++
james/server/trunk/jcr-store/src/test/java/org/apache/james/jcr/JcrUserRepositoryTest.java
Sun Oct 25 17:44:24 2009
@@ -22,8 +22,6 @@
import java.io.File;
import java.io.StringReader;
-import javax.jcr.Repository;
-
import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.core.config.RepositoryConfig;
import org.apache.james.api.user.UsersRepository;
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java
Sun Oct 25 17:44:24 2009
@@ -48,6 +48,6 @@
public void service(Mail mail) throws MessagingException {
MailetContext context = config.getMailetContext();
context.log("Hello, World!");
- context.log("You have mail from " + mail.getSender().getUser());
+ context.log("You have mail from " + mail.getSender().getLocalPart());
}
}
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
Sun Oct 25 17:44:24 2009
@@ -77,13 +77,13 @@
context.log("Remote Address: " + mail.getRemoteAddr());
context.log("Remote Host: " + mail.getRemoteHost());
context.log("State: " + mail.getState());
- context.log("Sender host: " + mail.getSender().getHost());
- context.log("Sender user: " + mail.getSender().getUser());
- Collection recipients = mail.getRecipients();
- for (Iterator it = recipients.iterator(); it.hasNext();)
+ context.log("Sender host: " + mail.getSender().getDomain());
+ context.log("Sender user: " + mail.getSender().getLocalPart());
+ Collection<MailAddress> recipients = mail.getRecipients();
+ for (Iterator<MailAddress> it = recipients.iterator(); it.hasNext();)
{
- MailAddress address = (MailAddress) it.next();
- context.log("Recipient: " + address.getUser() + "@" +
address.getHost());
+ MailAddress address = it.next();
+ context.log("Recipient: " + address.getLocalPart() + "@" +
address.getDomain());
}
context.log("Subject: " + message.getSubject());
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
Sun Oct 25 17:44:24 2009
@@ -86,10 +86,10 @@
"Unimplemented mock service");
}
- public Collection getRecipients() {
- ArrayList r = new ArrayList();
+ public Collection<MailAddress> getRecipients() {
+ ArrayList<MailAddress> r = new ArrayList<MailAddress>();
try {
- r = new ArrayList(Arrays
+ r = new ArrayList<MailAddress>(Arrays
.asList(new MailAddress[] { new MailAddress(
"[email protected]") }));
} catch (ParseException e) {
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java
Sun Oct 25 17:44:24 2009
@@ -20,6 +20,7 @@
package org.apache.james.transport.matchers;
+import org.apache.mailet.MailAddress;
import org.apache.mailet.base.GenericMatcher;
import javax.mail.MessagingException;
@@ -54,7 +55,7 @@
setRegex(".*");
setupAll();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNotNull(matchedRecipients);
assertEquals(matchedRecipients.size(), mockedMail.getRecipients()
@@ -66,7 +67,7 @@
setRegex("\\d");
setupAll();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNull(matchedRecipients);
}
@@ -87,7 +88,7 @@
regexException = m.getMessage();
}
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNull(matchedRecipients);
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
Sun Oct 25 17:44:24 2009
@@ -93,7 +93,7 @@
setupMockedMail(LISTED_HOST.toString());
setupMatcher(BLACKLIST);
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNotNull(matchedRecipients);
assertEquals(matchedRecipients.size(),
mockedMail.getRecipients().size());
@@ -103,7 +103,7 @@
setupMockedMail("212.12.14.1");
setupMatcher(BLACKLIST);
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNull(matchedRecipients);
}
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/NESSpamCheckTest.java
Sun Oct 25 17:44:24 2009
@@ -25,6 +25,7 @@
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMatcherConfig;
import org.apache.mailet.base.test.MailUtil;
+import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
import org.apache.mailet.base.RFC2822Headers;
@@ -76,7 +77,7 @@
mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
setupMatcher();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNotNull(matchedRecipients);
assertEquals(matchedRecipients.size(),
mockedMail.getRecipients().size());
@@ -87,7 +88,7 @@
mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
setupMatcher();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNull(matchedRecipients);
}
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RecipientIsRegexTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RecipientIsRegexTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RecipientIsRegexTest.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RecipientIsRegexTest.java
Sun Oct 25 17:44:24 2009
@@ -51,7 +51,7 @@
setupAll();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNotNull(matchedRecipients);
assertEquals(matchedRecipients.size(), mockedMail.getRecipients()
@@ -67,7 +67,7 @@
setupAll();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNotNull(matchedRecipients);
assertEquals(matchedRecipients.size(), 1);
@@ -82,14 +82,14 @@
setupAll();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertEquals(matchedRecipients.size(), 0);
}
// test if an exception was thrown cause the regex was invalid
public void testRegexIsNotMatchedCauseError() throws MessagingException {
- Collection matchedRecipients = null;
+ Collection<MailAddress> matchedRecipients = null;
String invalidRegex = "(!(";
String regexException = null;
String exception = "Malformed pattern: " + invalidRegex;
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
Sun Oct 25 17:44:24 2009
@@ -25,6 +25,8 @@
import javax.mail.MessagingException;
+import org.apache.mailet.MailAddress;
+
public class RemoteAddrInNetworkTest extends AbstractRemoteAddrInNetworkTest {
private final String ALLOWED_NETWORK = "192.168.200.0/24";
@@ -40,7 +42,7 @@
setupAll();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNotNull(matchedRecipients);
assertEquals(matchedRecipients.size(), mockedMail.getRecipients()
@@ -53,7 +55,7 @@
setupAll();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNull(matchedRecipients);
}
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
Sun Oct 25 17:44:24 2009
@@ -25,6 +25,8 @@
import javax.mail.MessagingException;
+import org.apache.mailet.MailAddress;
+
public class RemoteAddrNotInNetworkTest extends
AbstractRemoteAddrInNetworkTest {
private final String ALLOWED_NETWORK = "192.168.200.0/24";
@@ -40,7 +42,7 @@
setupAll();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNotNull(matchedRecipients);
assertEquals(matchedRecipients.size(), mockedMail.getRecipients()
@@ -53,7 +55,7 @@
setupAll();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNull(matchedRecipients);
}
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java
Sun Oct 25 17:44:24 2009
@@ -50,7 +50,7 @@
setupMockedMail();
setupMatcher();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNotNull(matchedRecipients);
assertEquals(matchedRecipients.size(), mockedMail.getRecipients()
@@ -66,7 +66,7 @@
setupMockedMail();
setupMatcher();
- Collection matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
assertNull(matchedRecipients);
}
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/AbstractRemoteDeliveryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/AbstractRemoteDeliveryTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/AbstractRemoteDeliveryTest.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/AbstractRemoteDeliveryTest.java
Sun Oct 25 17:44:24 2009
@@ -134,6 +134,7 @@
return servers;
}
+ @SuppressWarnings("static-access")
protected int waitEmptySpool(int maxWait) {
if (maxWait == 0) maxWait = -1;
while (outgoingSpool.size() > 0 && (maxWait > 0 || maxWait == -1)) {
@@ -147,9 +148,9 @@
if (outgoingSpool.size() > 0) {
- Iterator i = outgoingSpool.list();
+ Iterator<String> i = outgoingSpool.list();
while (i.hasNext()) {
- String key = (String) i.next();
+ String key = i.next();
Mail m = null;
try {
m = outgoingSpool.retrieve(key);
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/IOMessagingException.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/IOMessagingException.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/IOMessagingException.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/IOMessagingException.java
Sun Oct 25 17:44:24 2009
@@ -24,6 +24,7 @@
/**
* Used by the remotedelivery tester
*/
+...@suppresswarnings("serial")
public class IOMessagingException extends MessagingException {
}
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/NullMessagingException.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/NullMessagingException.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/NullMessagingException.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/NullMessagingException.java
Sun Oct 25 17:44:24 2009
@@ -24,6 +24,7 @@
/**
* Used by the remotedelivery tester
*/
+...@suppresswarnings("serial")
public class NullMessagingException extends MessagingException {
}
Modified:
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/ProcMail.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/ProcMail.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/ProcMail.java
(original)
+++
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/ProcMail.java
Sun Oct 25 17:44:24 2009
@@ -70,12 +70,12 @@
private String mailName;
private MailStatus startMailStatus;
- private List sendDates;
- private List sendServers;
- private List sendExceptions;
+ private List<Date> sendDates;
+ private List<String> sendServers;
+ private List<Exception> sendExceptions;
- private List bounceStatus;
- private List bounceMails;
+ private List<MailStatus> bounceStatus;
+ private List<Mail> bounceMails;
private MailStatus finalMailStatus;
@@ -113,11 +113,11 @@
private ProcMail(Tester owner) {
this.owner = owner;
state = STATE_IDLE;
- sendDates = new Vector();
- bounceStatus = new Vector();
- sendExceptions = new Vector();
- bounceMails = new Vector();
- sendServers = new Vector();
+ sendDates = new Vector<Date>();
+ bounceStatus = new Vector<MailStatus>();
+ sendExceptions = new Vector<Exception>();
+ bounceMails = new Vector<Mail>();
+ sendServers = new Vector<String>();
lastEventDate = new Date();
}
@@ -156,7 +156,7 @@
// check server
String domain = owner.getDomainAssociated(serverName);
- if (!recipient.getHost().equals(domain)) errorFlags = errorFlags |
ERRORFLAG_WRONGSERVER;
+ if (!recipient.getDomain().equals(domain)) errorFlags = errorFlags |
ERRORFLAG_WRONGSERVER;
}
// public void removed(Mail mail) {
@@ -199,11 +199,11 @@
this.errorFlags = errorFlags;
}
- public List getBounceMails() {
+ public List<Mail> getBounceMails() {
return bounceMails;
}
- public void setBounceMails(List bounceMails) {
+ public void setBounceMails(List<Mail> bounceMails) {
this.bounceMails = bounceMails;
}
@@ -211,11 +211,11 @@
return (Mail) bounceMails.get(idx);
}
- public List getBounceStatus() {
+ public List<MailStatus> getBounceStatus() {
return bounceStatus;
}
- public void setBounceStatus(List bounceStatus) {
+ public void setBounceStatus(List<MailStatus> bounceStatus) {
this.bounceStatus = bounceStatus;
}
@@ -287,11 +287,11 @@
this.recipient = recipient;
}
- public List getSendExceptions() {
+ public List<Exception> getSendExceptions() {
return sendExceptions;
}
- public void setSendExceptions(List sendExceptions) {
+ public void setSendExceptions(List<Exception> sendExceptions) {
this.sendExceptions = sendExceptions;
}
@@ -299,11 +299,11 @@
return (Exception) sendExceptions.get(idx);
}
- public List getSendServers() {
+ public List<String> getSendServers() {
return sendServers;
}
- public void setSendServers(List sendServers) {
+ public void setSendServers(List<String> sendServers) {
this.sendServers = sendServers;
}
@@ -311,11 +311,11 @@
return (String) sendServers.get(idx);
}
- public List getSendDates() {
+ public List<Date> getSendDates() {
return sendDates;
}
- public void setSendDates(List sendDate) {
+ public void setSendDates(List<Date> sendDate) {
this.sendDates = sendDate;
}
@@ -388,8 +388,8 @@
}
public static class Listing {
- HashMap map = new HashMap();
- List list = new Vector();
+ HashMap<String,ProcMail> map = new HashMap<String,ProcMail>();
+ List<ProcMail> list = new Vector<ProcMail>();
public Listing() {
}
Modified:
james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jcr/AvalonJCRMailRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jcr/AvalonJCRMailRepository.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jcr/AvalonJCRMailRepository.java
(original)
+++
james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jcr/AvalonJCRMailRepository.java
Sun Oct 25 17:44:24 2009
@@ -88,7 +88,7 @@
JackrabbitNodeTypeManager jackrabbit =
(JackrabbitNodeTypeManager) manager;
if (!jackrabbit.hasNodeType("james:mail")) {
- Class clazz = AvalonJCRMailRepository.class;
+ Class<?> clazz = AvalonJCRMailRepository.class;
jackrabbit.registerNodeTypes(
clazz.getResourceAsStream("james.cnd"),
JackrabbitNodeTypeManager.TEXT_X_JCR_CND);
Modified:
james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jms/activemq/JMSService.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jms/activemq/JMSService.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jms/activemq/JMSService.java
(original)
+++
james/server/trunk/phoenix-deployment/src/java/org/apache/james/phoenix/jms/activemq/JMSService.java
Sun Oct 25 17:44:24 2009
@@ -112,7 +112,7 @@
protected void setupLogger(Object subject) {
super.setupLogger(subject);
if (!(subject instanceof AbstractLogEnabled)) {
- Class[] commonsLog = {org.apache.commons.logging.Log.class};
+ Class<?>[] commonsLog = {org.apache.commons.logging.Log.class};
try {
Object[] args = {new AvalonLogger(getLogger())};
subject.getClass().getMethod("setLog",
commonsLog).invoke(subject, args);
@@ -199,7 +199,7 @@
private Object load(String className) throws ConfigurationException {
final Object result;
- Class clazz;
+ Class<?> clazz;
try {
clazz = Class.forName(className);
} catch (ClassNotFoundException e) {
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java
Sun Oct 25 17:44:24 2009
@@ -108,8 +108,8 @@
});
serviceManager.put(DomainList.ROLE, new DomainList() {
- public List getDomains() {
- ArrayList d = new ArrayList();
+ public List<String> getDomains() {
+ ArrayList<String> d = new ArrayList<String>();
d.add("localhost");
return d;
}
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTestConfiguration.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTestConfiguration.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTestConfiguration.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTestConfiguration.java
Sun Oct 25 17:44:24 2009
@@ -24,6 +24,7 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.james.test.util.Util;
+...@suppresswarnings("serial")
public class JamesTestConfiguration extends DefaultConfiguration {
public JamesTestConfiguration() {
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
Sun Oct 25 17:44:24 2009
@@ -58,6 +58,7 @@
import org.apache.james.test.util.Util;
import org.apache.james.transport.mailets.RemoteDelivery;
import org.apache.james.userrepository.MockUsersRepository;
+import org.apache.mailet.HostAddress;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
@@ -73,8 +74,8 @@
private InetAddress localhostByName = null;
- public Collection findMXRecords(String hostname) {
- List res = new ArrayList();
+ public Collection<String> findMXRecords(String hostname) {
+ List<String> res = new ArrayList<String>();
if (hostname == null) {
return res;
};
@@ -84,7 +85,7 @@
return res;
}
- public Iterator getSMTPHostAddresses(String domainName) {
+ public Iterator<HostAddress> getSMTPHostAddresses(String domainName) {
throw new UnsupportedOperationException("Unimplemented mock
service");
}
@@ -117,8 +118,8 @@
//return InetAddress.getByName(host);
}
- public Collection findTXTRecords(String hostname) {
- List res = new ArrayList();
+ public Collection<String> findTXTRecords(String hostname) {
+ List<String> res = new ArrayList<String>();
if (hostname == null) {
return res;
};
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java
Sun Oct 25 17:44:24 2009
@@ -95,7 +95,7 @@
}
try {
- ArrayList lockingFailures = new ArrayList();
+ ArrayList<String >lockingFailures = new ArrayList<String>();
int count = 0;
if (key != null) {
@@ -104,8 +104,8 @@
count = spoolManagement.removeSpoolItems(url, key,
lockingFailures, new SpoolFilter(SpoolFilter.ERROR_STATE, header, regex));
}
response = new RemoteManagerResponse();
- for (Iterator iterator = lockingFailures.iterator();
iterator.hasNext();) {
- String lockFailureKey = (String) iterator.next();
+ for (Iterator<String> iterator = lockingFailures.iterator();
iterator.hasNext();) {
+ String lockFailureKey = iterator.next();
response.appendLine("Error locking the mail with key: " +
lockFailureKey);
}
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
Sun Oct 25 17:44:24 2009
@@ -70,15 +70,15 @@
}
try {
- Map mappings = vutManagement.getAllMappings(table);
+ Map<String,Collection<String>> mappings =
vutManagement.getAllMappings(table);
if (mappings == null) {
response = new RemoteManagerResponse("No mappings found");
} else {
response = new RemoteManagerResponse("Mappings:");
- Iterator m = mappings.keySet().iterator();
+ Iterator<String> m = mappings.keySet().iterator();
while (m.hasNext()) {
- String key = m.next().toString();
+ String key = m.next();
response.appendLine(key + " -> " + mappings.get(key));
}
}
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
Sun Oct 25 17:44:24 2009
@@ -60,15 +60,15 @@
public RemoteManagerResponse onCommand(RemoteManagerSession session,
String command, String parameters) {
RemoteManagerResponse response = null;
- Collection domains = domService.getDomains();
+ Collection<String> domains = domService.getDomains();
if (domains == null) {
response = new RemoteManagerResponse("No domains found");
} else {
response = new RemoteManagerResponse("Domains:");
- Iterator d = domains.iterator();
+ Iterator<String> d = domains.iterator();
while(d.hasNext()) {
- response.appendLine(d.next().toString());
+ response.appendLine(d.next());
}
}
return response;
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java
Sun Oct 25 17:44:24 2009
@@ -75,15 +75,15 @@
}
try {
- Collection mappings =
vutManagement.getUserDomainMappings(table, user, domain);
+ Collection<String> mappings =
vutManagement.getUserDomainMappings(table, user, domain);
if (mappings == null) {
response = new RemoteManagerResponse("No mappings found");
} else {
response = new RemoteManagerResponse("Mappings:");
- Iterator m = mappings.iterator();
+ Iterator<String> m = mappings.iterator();
while (m.hasNext()) {
- response.appendLine(m.next().toString());
+ response.appendLine(m.next());
}
}
} catch (VirtualUserTableManagementException e) {
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java
Sun Oct 25 17:44:24 2009
@@ -91,7 +91,7 @@
}
try {
- List spoolItems;
+ List<String> spoolItems;
if (headername == null || regex == null) {
spoolItems = spoolManagement.getSpoolItems(url,
SpoolFilter.ERRORMAIL_FILTER);
@@ -102,8 +102,8 @@
count = spoolItems.size();
if (count > 0) {
response = new RemoteManagerResponse("Messages in spool:");
- for (Iterator iterator = spoolItems.iterator();
iterator.hasNext();) {
- String item = (String) iterator.next();
+ for (Iterator<String> iterator = spoolItems.iterator();
iterator.hasNext();) {
+ String item = iterator.next();
response.appendLine(item);
}
response.appendLine("Number of spooled mails: " + count);
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
Sun Oct 25 17:44:24 2009
@@ -75,8 +75,8 @@
if (parameters == null) {
response = new RemoteManagerResponse("Existing accounts " +
users.countUsers());
- for (Iterator it = users.list(); it.hasNext();) {
- response.appendLine("user: " + (String) it.next());
+ for (Iterator<String> it = users.list(); it.hasNext();) {
+ response.appendLine("user: " + it.next());
}
return response;
} else {
@@ -85,7 +85,7 @@
return response;
}
- ArrayList userList = getDomainUserList(users,parameters);
+ ArrayList<String> userList = getDomainUserList(users,parameters);
response = new RemoteManagerResponse("Existing accounts from
domain " + parameters + " " + userList.size());
for (int i = 0; i <userList.size(); i++) {
response.appendLine("user: " + userList.get(i));
@@ -100,11 +100,11 @@
* @param domain the domain
* @return ArrayList which contains the users
*/
- protected ArrayList getDomainUserList(UsersRepository users, String
domain) {
- ArrayList userList = new ArrayList();
+ protected ArrayList<String> getDomainUserList(UsersRepository users,
String domain) {
+ ArrayList<String> userList = new ArrayList<String>();
- for (Iterator it = users.list(); it.hasNext();) {
- String user = (String) it.next();
+ for (Iterator<String> it = users.list(); it.hasNext();) {
+ String user = it.next();
if (user.endsWith(domain)) {
userList.add(user);
}
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java?rev=829621&r1=829620&r2=829621&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java
Sun Oct 25 17:44:24 2009
@@ -118,7 +118,7 @@
protected boolean processorExists(String name) {
name = name.toLowerCase(Locale.US);
- List processorList =
Arrays.asList(processorManagementService.getProcessorNames());
+ List<String> processorList =
Arrays.asList(processorManagementService.getProcessorNames());
return processorList.contains(name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
