http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java index 644be9f..c5c19d2 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java @@ -44,7 +44,7 @@ import org.apache.james.metrics.api.MetricFactory; import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.user.api.UsersRepository; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; import org.apache.mailet.base.test.FakeMailetConfig;
http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java index c855eff..19932f3 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java @@ -34,7 +34,7 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.io.IOUtils; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.PerRecipientHeaders.Header; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.RFC2822Headers; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java index f333e20..7cb7c23 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java @@ -34,7 +34,7 @@ import org.apache.james.transport.mailets.Sieve; import org.apache.james.transport.mailets.jsieve.ResourceLocator; import org.apache.james.user.api.UsersRepository; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; import org.apache.mailet.base.test.FakeMailetConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java index ebf9e9d..32a3844 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SimpleMailStoreTest.java @@ -30,7 +30,7 @@ import javax.mail.internet.MimeMessage; import org.apache.james.metrics.api.Metric; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.MimeMessageBuilder; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java index 7b8f15e..760909c 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java @@ -45,7 +45,7 @@ import org.apache.james.metrics.api.MetricFactory; import org.apache.james.transport.mailets.ToRecipientFolder; import org.apache.james.user.api.UsersRepository; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; import org.apache.mailet.base.test.FakeMailetConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java index 1f743ba..7095a4c 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java @@ -43,7 +43,7 @@ import org.apache.james.sieverepository.api.SieveRepository; import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; import org.apache.james.user.api.UsersRepository; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; import org.apache.mailet.base.test.FakeMailetConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java index f9db7eb..302a8a3 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Optional; import javax.mail.MessagingException; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; import org.junit.Before; import org.junit.Rule; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java index f996bf5..187847f 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java @@ -20,7 +20,7 @@ package org.apache.james.transport.mailets.redirect; import static org.mockito.Mockito.mock; -import org.apache.james.core.MailImpl; +import org.apache.james.server.core.MailImpl; import org.apache.james.dnsservice.api.DNSService; import org.junit.Rule; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java index 0cdaca2..0619cf8 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java @@ -30,7 +30,7 @@ import javax.mail.Session; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.joda.time.DateTime; import org.junit.After; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/SpecialAddressTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/SpecialAddressTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/SpecialAddressTest.java index ddddccb..6a4bf2c 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/SpecialAddressTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/SpecialAddressTest.java @@ -21,7 +21,7 @@ package org.apache.james.transport.mailets.redirect; import static org.assertj.core.api.Assertions.assertThat; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.junit.Test; public class SpecialAddressTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/InternetAddressConverterTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/InternetAddressConverterTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/InternetAddressConverterTest.java index 9020533..a0326a4 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/InternetAddressConverterTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/InternetAddressConverterTest.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.mail.internet.InternetAddress; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.MailAddressFixture; import org.junit.Rule; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java index 698960c..e4e2c58 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java @@ -31,7 +31,7 @@ import javax.mail.MessagingException; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.mock.MockDNSService; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java index 5acf65f..21afe44 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java @@ -42,7 +42,7 @@ import org.apache.james.mailbox.store.quota.CurrentQuotaCalculator; import org.apache.james.mailbox.store.quota.DefaultQuotaRootResolver; import org.apache.james.mailbox.store.quota.StoreQuotaManager; import org.apache.james.user.api.UsersRepository; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java index fa8521d..ac631ed 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java @@ -27,7 +27,7 @@ import java.util.Collection; import javax.mail.MessagingException; import org.apache.james.dnsservice.api.mock.MockDNSService; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java index 374c97a..f08db89 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java @@ -27,7 +27,7 @@ import java.util.Collection; import javax.mail.MessagingException; import org.apache.james.dnsservice.api.mock.MockDNSService; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java index 651c19c..4f1e862 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java @@ -25,7 +25,7 @@ import java.util.List; import javax.mail.internet.InternetAddress; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java index 8649088..8f85bf7 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java @@ -31,7 +31,7 @@ import javax.mail.internet.MimeMessage.RecipientType; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java index 77ad785..5776782 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java @@ -22,7 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java index 12994c3..fa0627e 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java @@ -22,7 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java index 550fdb3..15a2a48 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java @@ -31,7 +31,7 @@ import javax.mail.internet.MimeMessage; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.RFC2822Headers; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java index 21c8846..4e647e2 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java @@ -32,7 +32,7 @@ import javax.mail.internet.MimeMessage.RecipientType; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java index 9c6296f..631914d 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java @@ -26,7 +26,7 @@ import javax.mail.Session; import javax.mail.internet.ParseException; import org.apache.commons.configuration.ConfigurationException; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; /** * <p> http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java index 8a7dbf2..a33eb59 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java @@ -32,11 +32,11 @@ import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import javax.mail.internet.ParseException; -import org.apache.james.core.MailImpl; +import org.apache.james.server.core.MailImpl; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.RFC2822Headers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java index b0f540d..fb1e2f2 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java @@ -33,7 +33,7 @@ import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.queue.api.MailQueue; import org.apache.james.user.api.UsersRepository; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java index 2e82905..7bee2a2 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java @@ -28,7 +28,7 @@ import javax.mail.Session; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.queue.api.MailQueue; import org.apache.james.user.api.UsersRepository; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; /** * <p> http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/jmap/src/main/java/org/apache/james/jmap/UserProvisioningFilter.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/UserProvisioningFilter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/UserProvisioningFilter.java index 6857479..043a363 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/UserProvisioningFilter.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/UserProvisioningFilter.java @@ -38,7 +38,7 @@ import org.apache.james.metrics.api.TimeMetric; import org.apache.james.user.api.AlreadyExistInUsersRepositoryException; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java index 68bcb55..53475c5 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java @@ -25,7 +25,7 @@ import java.util.Collection; import org.apache.james.jmap.send.MailMetadata; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationMailet.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationMailet.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationMailet.java index 2ec52b3..1f47b14 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationMailet.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationMailet.java @@ -35,7 +35,7 @@ import org.apache.james.jmap.utils.MimeMessageBodyGenerator; import org.apache.james.util.CompletableFutureUtil; import org.apache.james.util.date.ZonedDateTimeProvider; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.AutomaticallySentMailDetector; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationReply.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationReply.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationReply.java index 9ad8e0f..6e01ce6 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationReply.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationReply.java @@ -27,7 +27,7 @@ import javax.mail.internet.MimeMessage; import org.apache.james.jmap.api.vacation.Vacation; import org.apache.james.jmap.utils.MimeMessageBodyGenerator; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.AutomaticallySentMailDetector; import com.github.fge.lambdas.Throwing; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/MailFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/MailFactory.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/MailFactory.java index bbe5fa8..4fa46c5 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/MailFactory.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/MailFactory.java @@ -27,12 +27,12 @@ import java.util.stream.Collectors; import javax.mail.MessagingException; import javax.mail.internet.AddressException; -import org.apache.james.core.MailImpl; +import org.apache.james.server.core.MailImpl; import org.apache.james.jmap.model.Emailer; import org.apache.james.jmap.model.Message; import org.apache.james.jmap.model.MessageFactory.MetaDataWithContent; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java index f318565..ea25479 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; import org.apache.james.jmap.send.MailMetadata; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationMailetTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationMailetTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationMailetTest.java index 5fc3297..6890acf 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationMailetTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationMailetTest.java @@ -40,7 +40,7 @@ import org.apache.james.jmap.api.vacation.Vacation; import org.apache.james.jmap.api.vacation.VacationRepository; import org.apache.james.jmap.utils.MimeMessageBodyGenerator; import org.apache.james.util.date.ZonedDateTimeProvider; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; import org.apache.mailet.base.AutomaticallySentMailDetector; import org.apache.mailet.base.test.FakeMail; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java index 8174995..fd02f3c 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java @@ -35,7 +35,7 @@ import javax.mail.internet.MimeMessage; import org.apache.james.jmap.api.vacation.Vacation; import org.apache.james.jmap.utils.MimeMessageBodyGenerator; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java index 81e3992..bec084b 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java @@ -41,7 +41,7 @@ import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.model.TestMessageId; import org.apache.james.util.mime.MessageContentExtractor; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java index 98e885a..514effd 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java @@ -24,12 +24,13 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import javax.mail.internet.AddressException; + +import org.apache.james.core.MailAddress; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.WiringException; import org.apache.james.protocols.lmtp.LMTPMultiResponse; import org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook; -import org.apache.james.protocols.smtp.MailAddress; -import org.apache.james.protocols.smtp.MailAddressException; import org.apache.james.protocols.smtp.SMTPResponse; import org.apache.james.protocols.smtp.SMTPRetCode; import org.apache.james.protocols.smtp.SMTPSession; @@ -53,12 +54,12 @@ public class DataLineLMTPHandler extends DataLineJamesMessageHookHandler { // build a wrapper around the Mail final ReadOnlyMailEnvelope env = new ReadOnlyMailEnvelope(mail); - for (org.apache.mailet.MailAddress recipient : mail.getRecipients()) { + for (MailAddress recipient : mail.getRecipients()) { // TODO: the transformation code between MailAddress is purely to compile. No idea if it does what it's supposed MailAddress recipientAddress; try { recipientAddress = new MailAddress(recipient.getLocalPart(), recipient.getDomain()); - } catch (MailAddressException e) { + } catch (AddressException e) { throw new RuntimeException(e); } Response response = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java index 32c8ab2..dd213e6 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java @@ -27,12 +27,12 @@ import javax.inject.Named; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; +import org.apache.james.core.MailAddress; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook; -import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.MailEnvelope; import org.apache.james.protocols.smtp.SMTPRetCode; import org.apache.james.protocols.smtp.SMTPSession; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java index d56ad6f..8cd5d67 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AddDefaultAttributesMessageHook.java @@ -20,7 +20,7 @@ package org.apache.james.smtpserver; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; -import org.apache.james.core.MailImpl; +import org.apache.james.server.core.MailImpl; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; import org.apache.james.protocols.smtp.hook.HookReturnCode; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java index 5c41c2b..f82523e 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java @@ -32,18 +32,13 @@ import javax.mail.internet.AddressException; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; -import org.apache.james.core.MailImpl; -import org.apache.james.core.MimeMessageCopyOnWriteProxy; -import org.apache.james.core.MimeMessageInputStream; -import org.apache.james.core.MimeMessageInputStreamSource; +import org.apache.james.core.MailAddress; import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.ExtensibleHandler; import org.apache.james.protocols.api.handler.LineHandler; import org.apache.james.protocols.api.handler.WiringException; -import org.apache.james.protocols.smtp.MailAddress; -import org.apache.james.protocols.smtp.MailAddressException; import org.apache.james.protocols.smtp.MailEnvelope; import org.apache.james.protocols.smtp.SMTPResponse; import org.apache.james.protocols.smtp.SMTPRetCode; @@ -54,8 +49,11 @@ import org.apache.james.protocols.smtp.dsn.DSNStatus; import org.apache.james.protocols.smtp.hook.HookResult; import org.apache.james.protocols.smtp.hook.HookResultHook; import org.apache.james.protocols.smtp.hook.MessageHook; +import org.apache.james.server.core.MailImpl; +import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; +import org.apache.james.server.core.MimeMessageInputStream; +import org.apache.james.server.core.MimeMessageInputStreamSource; import org.apache.james.smtpserver.model.MailetMailAddressAdapter; -import org.apache.james.smtpserver.model.ProtocolMailAddressAdapter; import org.apache.mailet.Mail; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -102,7 +100,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib List<MailAddress> recipientCollection = (List<MailAddress>) session.getAttachment(SMTPSession.RCPT_LIST, State.Transaction); MailAddress mailAddress = (MailAddress) session.getAttachment(SMTPSession.SENDER, State.Transaction); - List<org.apache.mailet.MailAddress> rcpts = new ArrayList<>(); + List<MailAddress> rcpts = new ArrayList<>(); for (MailAddress address : recipientCollection) { rcpts.add(new MailetMailAddressAdapter(address)); } @@ -275,10 +273,10 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib public List<MailAddress> getRecipients() { //TODO: not sure this MailAddress transformation code does the right thing List<MailAddress> mailAddressList = new ArrayList<>(); - for (org.apache.mailet.MailAddress address : mail.getRecipients()) { + for (MailAddress address : mail.getRecipients()) { try { mailAddressList.add(new MailAddress(address.getLocalPart(), address.getDomain())); - } catch (MailAddressException ex) { + } catch (AddressException ex) { throw new RuntimeException(ex); } } @@ -287,12 +285,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib @Override public MailAddress getSender() { - try { - return new ProtocolMailAddressAdapter(mail.getSender()); - } catch (MailAddressException e) { - // should not occur here, cause it should have happened before - throw new RuntimeException(e); - } + return mail.getSender(); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java index 212e1bd..2d50b89 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java @@ -20,8 +20,8 @@ package org.apache.james.smtpserver; import javax.inject.Inject; -import org.apache.james.core.MailImpl; -import org.apache.james.core.MimeMessageInputStreamSource; +import org.apache.james.server.core.MailImpl; +import org.apache.james.server.core.MimeMessageInputStreamSource; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.smtp.SMTPResponse; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java index 864c737..18d9ffd 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java @@ -33,7 +33,7 @@ import org.apache.james.protocols.smtp.hook.HookResult; import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.queue.api.MailPrioritySupport; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; /** * Handler which set a configured {@link Mail} priority for the mail. http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java index 2cf9d52..8a24d28 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java @@ -33,7 +33,7 @@ import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.queue.api.MailQueue; import org.apache.james.queue.api.MailQueueFactory; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java index 8f9e027..60173c0 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java @@ -22,9 +22,9 @@ import javax.inject.Inject; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; +import org.apache.james.core.MailAddress; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; -import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.core.AbstractSenderAuthIdentifyVerificationRcptHook; import org.apache.james.protocols.smtp.hook.HookResult; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java index 97c0a6d..e8fa8bf 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java @@ -37,11 +37,11 @@ import javax.sql.DataSource; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.library.netmatcher.NetMatcher; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.protocols.api.handler.ProtocolHandler; -import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler; import org.apache.james.protocols.smtp.hook.HookResult; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java index 523f8b6..f5f3e2e 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java @@ -22,6 +22,7 @@ import javax.inject.Inject; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; +import org.apache.james.core.MailAddress; import org.apache.james.jspf.core.DNSService; import org.apache.james.jspf.core.exceptions.SPFErrorConstants; import org.apache.james.jspf.executor.SPFResult; @@ -29,7 +30,6 @@ import org.apache.james.jspf.impl.DefaultSPF; import org.apache.james.jspf.impl.SPF; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.api.handler.ProtocolHandler; -import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPRetCode; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.dsn.DSNStatus; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java index 7d4362f..882f0c0 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java @@ -22,10 +22,10 @@ import javax.inject.Inject; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; +import org.apache.james.core.MailAddress; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.protocols.api.handler.ProtocolHandler; -import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.core.fastfail.AbstractValidRcptHandler; import org.apache.james.rrt.api.RecipientRewriteTable; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java index 2047306..10df4e1 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java @@ -27,11 +27,11 @@ import javax.inject.Inject; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.TemporaryResolutionException; import org.apache.james.dnsservice.library.netmatcher.NetMatcher; import org.apache.james.protocols.api.handler.ProtocolHandler; -import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPRetCode; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.dsn.DSNStatus; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/MailetMailAddressAdapter.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/MailetMailAddressAdapter.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/MailetMailAddressAdapter.java index 4eaede1..1acb936 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/MailetMailAddressAdapter.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/MailetMailAddressAdapter.java @@ -20,13 +20,13 @@ package org.apache.james.smtpserver.model; import javax.mail.internet.AddressException; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; public class MailetMailAddressAdapter extends MailAddress { private static final long serialVersionUID = 1L; - public MailetMailAddressAdapter(org.apache.james.protocols.smtp.MailAddress mailAddress) throws AddressException { + public MailetMailAddressAdapter(MailAddress mailAddress) throws AddressException { super(mailAddress.getLocalPart(), mailAddress.getDomain()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/ProtocolMailAddressAdapter.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/ProtocolMailAddressAdapter.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/ProtocolMailAddressAdapter.java index 8aa0019..a128f04 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/ProtocolMailAddressAdapter.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/model/ProtocolMailAddressAdapter.java @@ -18,13 +18,15 @@ ****************************************************************/ package org.apache.james.smtpserver.model; -import org.apache.james.protocols.smtp.MailAddress; -import org.apache.james.protocols.smtp.MailAddressException; +import javax.mail.internet.AddressException; +import org.apache.james.core.MailAddress; + +@Deprecated public class ProtocolMailAddressAdapter extends MailAddress { - public ProtocolMailAddressAdapter(org.apache.mailet.MailAddress mailAddress) throws MailAddressException { - super(mailAddress.toString()); + public ProtocolMailAddressAdapter(MailAddress mailAddress) throws AddressException { + super(mailAddress.asString()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java index 98bbbd1..ce4b504 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java @@ -69,7 +69,7 @@ import org.apache.james.user.api.UsersRepository; import org.apache.james.user.lib.mock.InMemoryUsersRepository; import org.apache.mailet.HostAddress; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.junit.After; import org.junit.Before; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java index 3018bee..243536e 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java @@ -24,10 +24,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import org.apache.james.core.MailAddress; import org.apache.james.jspf.core.DNSRequest; import org.apache.james.jspf.core.DNSService; import org.apache.james.jspf.core.exceptions.TimeoutException; -import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java index ec007af..e46f5d5 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java @@ -26,7 +26,7 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.ParseException; import org.apache.james.smtpserver.mock.MockMimeMessage; import org.apache.james.smtpserver.mock.mailet.MockMail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; /** * some utilities for James unit testing http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java index 79a8589..34efb66 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java @@ -25,9 +25,9 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import org.apache.james.core.MailAddress; import org.apache.james.domainlist.api.mock.SimpleDomainList; import org.apache.james.protocols.api.ProtocolSession.State; -import org.apache.james.protocols.smtp.MailAddress; import org.apache.james.protocols.smtp.SMTPConfiguration; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookReturnCode; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java index 523dc9c..ab94a2d 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java @@ -26,12 +26,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import javax.mail.internet.ParseException; - +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.mock.MockDNSService; -import org.apache.james.protocols.smtp.MailAddress; -import org.apache.james.protocols.smtp.MailAddressException; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession; @@ -103,7 +100,7 @@ public class ValidRcptMXTest { } @Test - public void testRejectLoopbackMX() throws ParseException, MailAddressException { + public void testRejectLoopbackMX() throws Exception { Collection<String> bNetworks = new ArrayList<>(); bNetworks.add("127.0.0.1"); http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java index 6f1aac2..e66fed8 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java @@ -30,7 +30,7 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.lang.NotImplementedException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.PerRecipientHeaders; import org.apache.mailet.PerRecipientHeaders.Header; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java index 2686fd8..9e1b342 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java @@ -29,7 +29,7 @@ import javax.mail.internet.MimeMessage; import org.apache.mailet.HostAddress; import org.apache.mailet.LookupException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java index 028f8b3..919ac42 100644 --- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java @@ -271,4 +271,6 @@ public class WebAdminServerIntegrationTest { ; } + //TODO: check Groups full path + } http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/protocols/webadmin/webadmin-data/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml index fc67952..6f302db 100644 --- a/server/protocols/webadmin/webadmin-data/pom.xml +++ b/server/protocols/webadmin/webadmin-data/pom.xml @@ -35,6 +35,10 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-core</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-data-api</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java index bd41981..7e35cdb 100644 --- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java +++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java @@ -40,9 +40,9 @@ import org.apache.activemq.ActiveMQSession; import org.apache.activemq.BlobMessage; import org.apache.activemq.command.ActiveMQBlobMessage; import org.apache.activemq.util.JMSExceptionSupport; -import org.apache.james.core.MimeMessageCopyOnWriteProxy; -import org.apache.james.core.MimeMessageInputStream; -import org.apache.james.core.MimeMessageSource; +import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; +import org.apache.james.server.core.MimeMessageInputStream; +import org.apache.james.server.core.MimeMessageSource; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.queue.api.MailQueue; import org.apache.james.queue.api.MailQueueItemDecoratorFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java index d1f1aef..e8153ec 100644 --- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java +++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java @@ -24,7 +24,7 @@ import java.io.InputStream; import javax.jms.JMSException; import org.apache.activemq.BlobMessage; -import org.apache.james.core.MimeMessageSource; +import org.apache.james.server.core.MimeMessageSource; /** * @@ -40,7 +40,7 @@ public class MimeMessageBlobMessageSource extends MimeMessageSource implements A } /** - * @see org.apache.james.core.MimeMessageSource#getInputStream() + * @see org.apache.james.server.core.MimeMessageSource#getInputStream() */ public InputStream getInputStream() throws IOException { try { @@ -51,7 +51,7 @@ public class MimeMessageBlobMessageSource extends MimeMessageSource implements A } /** - * @see org.apache.james.core.MimeMessageSource#getSourceId() + * @see org.apache.james.server.core.MimeMessageSource#getSourceId() */ public String getSourceId() { return sourceId; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java index 0ec3281..6488e80 100644 --- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java +++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java @@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit; import javax.mail.MessagingException; import org.apache.commons.io.IOUtils; -import org.apache.james.core.MailImpl; +import org.apache.james.server.core.MailImpl; import org.apache.james.queue.api.MailQueue; import org.apache.mailet.Mail; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java index 7a14a4b..076d96e 100644 --- a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java +++ b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java @@ -41,8 +41,8 @@ import javax.mail.util.SharedFileInputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.james.core.MimeMessageCopyOnWriteProxy; -import org.apache.james.core.MimeMessageSource; +import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; +import org.apache.james.server.core.MimeMessageSource; import org.apache.james.lifecycle.api.Disposable; import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.queue.api.MailQueueItemDecoratorFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java index f39653d..4cd4f02 100644 --- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java +++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java @@ -47,8 +47,8 @@ import javax.mail.MessagingException; import javax.mail.internet.AddressException; import javax.mail.internet.MimeMessage; -import org.apache.james.core.MailImpl; -import org.apache.james.core.MimeMessageCopyOnWriteProxy; +import org.apache.james.server.core.MailImpl; +import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; import org.apache.james.lifecycle.api.Disposable; import org.apache.james.metrics.api.Metric; import org.apache.james.metrics.api.MetricFactory; @@ -58,7 +58,7 @@ import org.apache.james.queue.api.MailQueue; import org.apache.james.queue.api.MailQueueItemDecoratorFactory; import org.apache.james.queue.api.ManageableMailQueue; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java index 0b223dd..2a70a98 100644 --- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java +++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java @@ -26,7 +26,7 @@ import javax.jms.ObjectMessage; import javax.mail.util.SharedByteArrayInputStream; import org.apache.commons.io.IOUtils; -import org.apache.james.core.MimeMessageSource; +import org.apache.james.server.core.MimeMessageSource; import org.apache.james.lifecycle.api.Disposable; import org.apache.james.lifecycle.api.LifecycleUtil; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java index e0b042a..1348388 100644 --- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java +++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java @@ -41,7 +41,7 @@ import org.apache.james.queue.api.ManageableMailQueue.MailQueueItemView; import org.apache.james.queue.api.ManageableMailQueue.MailQueueIterator; import org.apache.james.queue.api.ManageableMailQueue.Type; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; /** * JMX MBean implementation which expose management functions by wrapping a http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java index 1e2af52..56211d8 100644 --- a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java +++ b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java @@ -38,16 +38,15 @@ import javax.mail.Session; import javax.mail.internet.MimeMessage; import org.apache.activemq.ActiveMQConnectionFactory; -import org.apache.james.core.MailImpl; +import org.apache.james.core.MailAddress; import org.apache.james.metrics.api.NoopMetricFactory; -import org.apache.james.protocols.smtp.MailAddressException; import org.apache.james.queue.api.MailQueue.MailQueueItem; import org.apache.james.queue.api.MailQueueItemDecoratorFactory; import org.apache.james.queue.api.ManageableMailQueue; import org.apache.james.queue.api.ManageableMailQueue.MailQueueIterator; import org.apache.james.queue.api.RawMailQueueItemDecoratorFactory; +import org.apache.james.server.core.MailImpl; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; import org.junit.Before; import org.junit.Test; @@ -76,7 +75,7 @@ public abstract class AbstractJMSMailQueueTest { } @Test - public void testFIFO() throws MessagingException, InterruptedException, IOException, MailAddressException { + public void testFIFO() throws Exception { // should be empty assertEquals(0, queue.getSize()); @@ -116,7 +115,7 @@ public abstract class AbstractJMSMailQueueTest { } @Test - public void testDelayedDeQueue() throws MessagingException, InterruptedException, IOException, MailAddressException { + public void testDelayedDeQueue() throws Exception { // should be empty assertEquals(0, queue.getSize()); @@ -151,7 +150,7 @@ public abstract class AbstractJMSMailQueueTest { } @Test - public void testFlush() throws MessagingException, InterruptedException, IOException, MailAddressException { + public void testFlush() throws Exception { // should be empty assertEquals(0, queue.getSize()); @@ -190,7 +189,7 @@ public abstract class AbstractJMSMailQueueTest { } @Test - public void testRemoveWithRecipient() throws MessagingException, InterruptedException, MailAddressException { + public void testRemoveWithRecipient() throws Exception { assertEquals(0, queue.getSize()); Mail mail = createMail(); @@ -216,7 +215,7 @@ public abstract class AbstractJMSMailQueueTest { } @Test - public void testRemoveWithSender() throws MessagingException, InterruptedException, MailAddressException { + public void testRemoveWithSender() throws Exception { assertEquals(0, queue.getSize()); MailImpl mail = createMail(); @@ -242,7 +241,7 @@ public abstract class AbstractJMSMailQueueTest { } @Test - public void testRemoveWithName() throws MessagingException, InterruptedException, MailAddressException { + public void testRemoveWithName() throws Exception { assertEquals(0, queue.getSize()); MailImpl mail = createMail(); @@ -318,7 +317,7 @@ public abstract class AbstractJMSMailQueueTest { } @Test - public void testPrioritySupport() throws InterruptedException, MessagingException, IOException, MailAddressException { + public void testPrioritySupport() throws Exception { // should be empty assertEquals(0, queue.getSize()); @@ -353,7 +352,7 @@ public abstract class AbstractJMSMailQueueTest { } @Test - public void testBrowse() throws MessagingException, InterruptedException, IOException, MailAddressException { + public void testBrowse() throws Exception { // should be empty assertEquals(0, queue.getSize()); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
