http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java index f304cbd..9393490 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java @@ -36,7 +36,7 @@ import org.apache.james.lifecycle.api.Disposable; import org.apache.james.mailetcontainer.impl.matchers.CompositeMatcher; import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor; import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Mailet; import org.apache.mailet.Matcher;
http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java index 3d5e7e7..456d098 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java @@ -25,7 +25,7 @@ import java.util.Set; import javax.mail.MessagingException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Matcher; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java index 7b46a4f..1cc0cc6 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java @@ -25,7 +25,7 @@ import java.util.Optional; import javax.mail.MessagingException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Matcher; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java index 47bb7c6..4c0ed8c 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java @@ -25,7 +25,7 @@ import java.util.HashSet; import javax.mail.MessagingException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Matcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java index 32794cc..cb67528 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java @@ -25,7 +25,7 @@ import java.util.Optional; import javax.mail.MessagingException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Matcher; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java index db12893..aa0e0e7 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java @@ -43,7 +43,7 @@ import org.apache.james.mailetcontainer.impl.MatcherMailetPair; import org.apache.james.mailetcontainer.impl.jmx.JMXStateMailetProcessorListener; import org.apache.james.mailetcontainer.impl.matchers.CompositeMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; import org.apache.mailet.MailetContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java index b1f88ac..f5e5f76 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java @@ -30,7 +30,7 @@ import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.lib.AbstractDomainList; import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.user.memory.MemoryUsersRepository; -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/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java index 490b248..a851eb3 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java index ca555da..f3bb18b 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java @@ -24,7 +24,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java index 94fb41c..4fa4b15 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java @@ -28,7 +28,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java index c06aeaf..ac16d65 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java index b000490..ec66062 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java @@ -30,7 +30,7 @@ import javax.mail.MessagingException; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.james.core.MailImpl; +import org.apache.james.server.core.MailImpl; import org.apache.james.mailetcontainer.api.MailProcessor; import org.apache.james.mailetcontainer.api.mock.MockMailProcessor; import org.apache.mailet.Mail; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java index 8958f00..47a4baf 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java @@ -21,14 +21,14 @@ package org.apache.james.mailetcontainer.lib; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.james.core.MailImpl; +import org.apache.james.server.core.MailImpl; import org.apache.james.mailetcontainer.api.mock.ExceptionThrowingMailet; import org.apache.james.mailetcontainer.api.mock.ExceptionThrowingMatcher; import org.apache.james.mailetcontainer.api.mock.MockMailet; import org.apache.james.mailetcontainer.api.mock.MockMatcher; import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Mailet; import org.apache.mailet.Matcher; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java index 5ce3f5f..095af8e 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java @@ -32,14 +32,14 @@ import javax.inject.Inject; import javax.mail.MessagingException; import javax.mail.internet.ParseException; -import org.apache.james.core.MailImpl; +import org.apache.james.server.core.MailImpl; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.rrt.lib.RecipientRewriteTableUtil; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java index 4028e7b..2d9924b 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java @@ -37,7 +37,7 @@ import org.apache.james.util.bayesian.JDBCBayesianAnalyzer; import org.apache.james.util.sql.JDBCUtil; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.apache.mailet.base.RFC2822Headers; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java index 2886391..9ba3b46 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java @@ -40,7 +40,7 @@ import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java index 8a72e57..88f745b 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java @@ -32,7 +32,7 @@ import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; -import org.apache.james.core.MailImpl; +import org.apache.james.server.core.MailImpl; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.james.transport.mailets.redirect.InitParameters; @@ -52,7 +52,7 @@ import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.commons.lang.time.FastDateFormat; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.DateFormats; import org.apache.mailet.base.GenericMailet; import org.apache.mailet.base.RFC2822Headers; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java index 312306f..59ca7d1 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java @@ -39,7 +39,7 @@ import org.apache.james.transport.util.ReplyToUtils; import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java index 6b71b97..a4d56a0 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java @@ -35,7 +35,7 @@ import javax.sql.DataSource; import org.apache.james.util.sql.JDBCUtil; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetException; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java index a06266f..5d4e759 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java @@ -34,7 +34,7 @@ import javax.sql.DataSource; import org.apache.james.rrt.lib.RecipientRewriteTableUtil; import org.apache.james.util.sql.JDBCUtil; import org.apache.mailet.Experimental; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetException; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java index ed95c5a..8d030d4 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java @@ -41,7 +41,7 @@ import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetConfig; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java index 07bc700..62377ee 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java @@ -41,7 +41,7 @@ import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetConfig; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java index a1652fe..b3ba95b 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java @@ -37,7 +37,7 @@ import org.apache.james.rrt.lib.Mapping; import org.apache.james.rrt.lib.Mappings; import org.apache.james.util.streams.Iterators; 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; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java index 616b7a0..cc1f1fd 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java @@ -42,7 +42,7 @@ import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java index 1d74732..1650b44 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java @@ -42,7 +42,7 @@ import org.apache.james.transport.mailets.remoteDelivery.DeliveryRunnable; import org.apache.james.transport.mailets.remoteDelivery.RemoteDeliveryConfiguration; import org.apache.james.transport.mailets.remoteDelivery.RemoteDeliverySocketFactory; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java index 393bd6e..46efc81 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java @@ -40,7 +40,7 @@ import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java index 6bd7519..21e9de0 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java @@ -28,7 +28,7 @@ import org.apache.james.jspf.impl.DefaultSPF; import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java index 4f61488..2822e80 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java @@ -31,7 +31,7 @@ import org.apache.james.transport.mailets.jsieve.delivery.SieveExecutor; import org.apache.james.transport.mailets.jsieve.delivery.SievePoster; 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.GenericMailet; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java index 56f4e77..3635080 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java @@ -28,7 +28,7 @@ import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java index cc48148..e7b2d13 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java @@ -53,7 +53,7 @@ import org.apache.james.util.sql.JDBCUtil; import org.apache.james.util.sql.SqlResources; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.DateFormats; import org.apache.mailet.base.GenericMailet; import org.apache.mailet.base.RFC2822Headers; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java index 1afe6be..d362a3f 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java @@ -28,7 +28,7 @@ import javax.mail.MessagingException; import org.apache.james.rrt.lib.RecipientRewriteTableUtil; import org.apache.mailet.Experimental; -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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/DeliveryUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/DeliveryUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/DeliveryUtils.java index 22cb40d..3385f38 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/DeliveryUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/DeliveryUtils.java @@ -19,7 +19,7 @@ package org.apache.james.transport.mailets.delivery; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; public class DeliveryUtils { http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java index 4257917..f4743cb 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java @@ -27,7 +27,7 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; import org.apache.mailet.PerRecipientHeaders.Header; import org.apache.mailet.base.RFC2822Headers; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java index 4082d4f..fed03e0 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java @@ -22,7 +22,7 @@ package org.apache.james.transport.mailets.delivery; import javax.mail.MessagingException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; public interface MailStore { String DELIVERY_PATH_PREFIX = "DeliveryPath_"; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java index 47dc518..335389c 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java @@ -25,7 +25,7 @@ import javax.mail.Flags; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import org.apache.james.core.MimeMessageInputStream; +import org.apache.james.server.core.MimeMessageInputStream; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java index 87a910d..21673b9 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java @@ -25,7 +25,7 @@ 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.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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java index 6800d8e..f9a0925 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java @@ -24,7 +24,7 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.joda.time.DateTime; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java index 2354ff0..0dbb78f 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java @@ -22,7 +22,7 @@ package org.apache.james.transport.mailets.jsieve; import javax.mail.MessagingException; 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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java index 24f08ce..6c10428 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java @@ -23,7 +23,7 @@ import javax.mail.MessagingException; import org.apache.jsieve.mail.Action; import org.apache.jsieve.mail.ActionFileInto; 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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java index 6d48cc8..9e21e6a 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java @@ -27,7 +27,7 @@ import javax.mail.internet.InternetAddress; import org.apache.jsieve.mail.Action; import org.apache.jsieve.mail.ActionRedirect; 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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java index 63d2f84..fdb3f33 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java @@ -39,7 +39,7 @@ import org.apache.james.mdn.type.DispositionType; import org.apache.jsieve.mail.Action; import org.apache.jsieve.mail.ActionReject; 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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java index b87b82a..06ba496 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java @@ -21,7 +21,7 @@ package org.apache.james.transport.mailets.jsieve; import org.apache.james.sieverepository.api.SieveRepository; 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.joda.time.DateTime; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java index dbebaeb..be6bf21 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java @@ -49,7 +49,7 @@ import org.apache.jsieve.mail.MailUtils; import org.apache.jsieve.mail.SieveMailException; import org.apache.jsieve.mail.optional.EnvelopeAccessors; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; import org.joda.time.DateTime; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java index 9453de5..614ddf7 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java @@ -28,7 +28,7 @@ import javax.mail.internet.AddressException; import org.apache.jsieve.mail.Action; import org.apache.jsieve.mail.optional.ActionVacation; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.joda.time.Days; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java index 6bb8cba..73340ab 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java @@ -32,7 +32,7 @@ import javax.mail.internet.MimeMultipart; import javax.mail.util.ByteArrayDataSource; 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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java index ceb8d09..787eab1 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java @@ -36,7 +36,7 @@ import org.apache.jsieve.exception.SieveException; import org.apache.jsieve.parser.generated.ParseException; import org.apache.jsieve.parser.generated.TokenMgrError; 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; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java index 39e6b3b..824b988 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java @@ -28,7 +28,7 @@ import org.apache.james.transport.mailets.jsieve.Poster; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; public class SievePoster implements Poster { private final String folder; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AddressExtractor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AddressExtractor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AddressExtractor.java index 43272f9..0b4f871 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AddressExtractor.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AddressExtractor.java @@ -26,7 +26,7 @@ import javax.mail.MessagingException; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; import org.apache.mailet.base.StringUtils; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailMessageAlteringUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailMessageAlteringUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailMessageAlteringUtils.java index b6a956b..0a1f25f 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailMessageAlteringUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailMessageAlteringUtils.java @@ -27,7 +27,7 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; -import org.apache.james.core.MimeMessageUtil; +import org.apache.james.server.core.MimeMessageUtil; import org.apache.james.transport.mailets.utils.MimeMessageUtils; import org.apache.mailet.Mail; import org.apache.mailet.base.RFC2822Headers; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java index c1e0d2c..90c7b75 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java @@ -26,11 +26,11 @@ import javax.mail.Message; import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; -import org.apache.james.core.MailImpl; +import org.apache.james.server.core.MailImpl; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.util.MailAddressUtils; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.DateFormats; import org.apache.mailet.base.RFC2822Headers; import org.apache.mailet.base.StringUtils; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessage.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessage.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessage.java index dc3b048..5f02575 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessage.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessage.java @@ -25,7 +25,7 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.RFC2822Headers; import com.google.common.base.Splitter; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java index 44ab401..0cf003c 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java @@ -22,7 +22,7 @@ import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; -import org.apache.james.core.MailImpl; +import org.apache.james.server.core.MailImpl; import org.apache.mailet.Mail; import org.apache.mailet.base.StringUtils; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java index be4fd3f..50bcded 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java @@ -28,7 +28,7 @@ import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.Redirect; import org.apache.james.transport.mailets.utils.MimeMessageModifier; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/SpecialAddress.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/SpecialAddress.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/SpecialAddress.java index 640c1f0..4fb0d9f 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/SpecialAddress.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/SpecialAddress.java @@ -19,7 +19,7 @@ package org.apache.james.transport.mailets.redirect; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java index cef6c33..3ec875b 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java @@ -26,7 +26,7 @@ import javax.mail.Address; import javax.mail.internet.AddressException; import org.apache.james.util.OptionalUtils; -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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/Bouncer.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/Bouncer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/Bouncer.java index d0a12c4..8cca867 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/Bouncer.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/Bouncer.java @@ -29,7 +29,7 @@ import javax.mail.MessagingException; import javax.mail.SendFailedException; 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; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/InternetAddressConverter.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/InternetAddressConverter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/InternetAddressConverter.java index af446ec..ca9037f 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/InternetAddressConverter.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/InternetAddressConverter.java @@ -22,7 +22,7 @@ package org.apache.james.transport.mailets.remoteDelivery; import java.util.Collection; import javax.mail.internet.InternetAddress; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java index c0f8f82..f3b6870 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java @@ -33,7 +33,7 @@ import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.TemporaryResolutionException; import org.apache.mailet.HostAddress; 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/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java index 78f0bb7..c05b790 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java @@ -42,7 +42,7 @@ import org.apache.james.util.sql.JDBCUtil; import org.apache.james.util.sql.SqlResources; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java index d7991ed..1fe84eb 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java @@ -42,7 +42,7 @@ import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java index e602f68..2950f4f 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java @@ -29,7 +29,7 @@ import javax.mail.MessagingException; import org.apache.james.dnsservice.api.DNSService; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java index ec6d087..6aa7b2a 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java @@ -29,7 +29,7 @@ import javax.mail.MessagingException; import org.apache.mailet.Experimental; 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/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java index b977e22..f07665d 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java @@ -36,7 +36,7 @@ import org.apache.james.mailbox.quota.QuotaRootResolver; import org.apache.james.user.api.UsersRepository; 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.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java index 3e068b1..cc438fe 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java @@ -20,7 +20,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Matcher; import javax.mail.MessagingException; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java index 8542f85..05fab7d 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java @@ -33,7 +33,7 @@ import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.library.netmatcher.NetMatcher; import org.apache.mailet.Experimental; 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/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java index a75f6c2..2cca1c4 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java @@ -20,7 +20,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java index 331bc07..6741ce7 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java @@ -20,7 +20,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java index 3279118..c28eee0 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java @@ -23,7 +23,7 @@ import java.util.Collection; import org.apache.mailet.Experimental; 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/mailet/mailets/src/main/java/org/apache/james/transport/util/MailAddressUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailAddressUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailAddressUtils.java index 0a19e1f..708ee4a 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailAddressUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailAddressUtils.java @@ -24,7 +24,7 @@ import javax.mail.internet.AddressException; 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 com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/util/RecipientsUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/RecipientsUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/RecipientsUtils.java index e1220c1..16c45ac 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/RecipientsUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/RecipientsUtils.java @@ -25,7 +25,7 @@ import javax.mail.MessagingException; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/util/ReplyToUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/ReplyToUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/ReplyToUtils.java index 58f42fa..1b00a6f 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/ReplyToUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/ReplyToUtils.java @@ -23,7 +23,7 @@ import javax.mail.MessagingException; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; public class ReplyToUtils { http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java index 0d33658..1caa0a5 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java @@ -23,7 +23,7 @@ import javax.mail.MessagingException; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; public class SenderUtils { http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java index 5e68d80..05507ae 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java @@ -32,7 +32,7 @@ import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.james.transport.mailets.redirect.SpecialAddressKind; 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/mailet/mailets/src/main/java/org/apache/james/transport/util/TosUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/TosUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/TosUtils.java index 44c03a1..06176cf 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/TosUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/TosUtils.java @@ -26,7 +26,7 @@ import javax.mail.internet.InternetAddress; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java index 557f101..1515afd 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java @@ -35,7 +35,7 @@ import javax.mail.internet.NewsAddress; import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/BounceTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/BounceTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/BounceTest.java index e5b3e97..cbe0af2 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/BounceTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/BounceTest.java @@ -32,7 +32,7 @@ import javax.mail.internet.MimeMessage; import org.apache.james.dnsservice.api.DNSService; import org.apache.mailet.Mail; -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/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java index 13d2152..280b3e6 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java @@ -38,7 +38,7 @@ import javax.mail.internet.MimeMessage; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.DateFormats; 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/ForwardTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java index bc2b318..e3def5f 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java @@ -30,7 +30,7 @@ import javax.mail.Session; import javax.mail.internet.MimeMessage; import org.apache.james.dnsservice.api.DNSService; -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/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java index aca75e9..fd455ed 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java @@ -32,7 +32,7 @@ import javax.mail.internet.MimeMessage; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.redirect.SpecialAddress; -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/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java index b800abc..6b9c6b4 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java @@ -32,7 +32,7 @@ import javax.mail.internet.MimeMessage; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.redirect.SpecialAddress; -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/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java index 4e31a6f..242c0b3 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java @@ -37,7 +37,7 @@ import org.apache.james.rrt.api.RecipientRewriteTable.ErrorMappingException; import org.apache.james.rrt.api.RecipientRewriteTableException; import org.apache.james.rrt.lib.MappingsImpl; import org.apache.mailet.Mail; -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/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecordingMailContext.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecordingMailContext.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecordingMailContext.java index 1fb078c..6866a48 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecordingMailContext.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecordingMailContext.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.apache.mailet.TemporaryLookupException; import org.apache.mailet.base.test.FakeMailContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java index 3c99341..7f90aab 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java @@ -29,7 +29,7 @@ import javax.mail.Session; import javax.mail.internet.MimeMessage; import org.apache.james.dnsservice.api.DNSService; -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/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java index b3b7e5e..aae7a06 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java @@ -32,7 +32,7 @@ import javax.mail.Session; import javax.mail.internet.MimeMessage; import org.apache.james.dnsservice.api.DNSService; -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/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java index 79a12c0..05202af 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java @@ -27,7 +27,7 @@ import org.apache.james.sieverepository.api.SieveRepository; import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; import org.apache.james.transport.mailets.jsieve.ResourceLocator; import org.apache.james.user.api.UsersRepository; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.junit.Before; import org.junit.Test; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
