http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/api/src/test/java/org/apache/mailet/MailAddressTest.java ---------------------------------------------------------------------- diff --git a/mailet/api/src/test/java/org/apache/mailet/MailAddressTest.java b/mailet/api/src/test/java/org/apache/mailet/MailAddressTest.java deleted file mode 100644 index aa63231..0000000 --- a/mailet/api/src/test/java/org/apache/mailet/MailAddressTest.java +++ /dev/null @@ -1,229 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.mailet; - -import org.junit.Test; - -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; - -import static org.junit.Assert.*; - -public class MailAddressTest { - - private static final String - GOOD_LOCAL_PART = "\"quoted@local part\"", - GOOD_QUOTED_LOCAL_PART = "\"quoted@local part\"@james.apache.org", - GOOD_ADDRESS = "server-dev@james.apache.org", - GOOD_DOMAIN = "james.apache.org"; - - private static final String[] GOOD_ADDRESSES = { - GOOD_ADDRESS, - GOOD_QUOTED_LOCAL_PART, - "server-...@james-apache.org", - "server-dev@[127.0.0.1]", - "server-dev@#123", - "server-dev@#123.apache.org", - "server....@james.apache.org", - "\\.server-dev@james.apache.org", - "server-dev\\.@james.apache.org", - }; - - private static final String[] BAD_ADDRESSES = { - "", - "server-dev", - "server-dev@", - "[]", - "server-dev@[]", - "server-dev@#", - "quoted local-p...@james.apache.org", - "quoted@local-p...@james.apache.org", - "local-pa...@james.apache.org", - ".local-p...@james.apache.org", - "local-p...@.james.apache.org", - "local-p...@james.apache.org.", - "local-p...@james.apache..org", - "server-...@-james.apache.org", - "server-dev@james.apache.org-", - "server-dev@#james.apache.org", - "server-dev@#123james.apache.org", - "server-dev@#-123.james.apache.org", - "server-dev@james. apache.org", - "server-dev@james\\.apache.org", - "server-dev@[300.0.0.1]", - "server-dev@[127.0.1]", - "server-dev@[0127.0.0.1]", - "server-dev@[127.0.1.1a]", - "server-dev@[127\\.0.1.1]", - "server-dev@[127.0.1.1.1]", - "server-dev@[127.0.1.-1]" - }; - - /** - * Test method for {@link org.apache.mailet.MailAddress#hashCode()}. - * - * @throws AddressException - */ - @Test - public void testHashCode() throws AddressException { - - MailAddress a = new MailAddress(GOOD_ADDRESS); - MailAddress b = new MailAddress(GOOD_ADDRESS); - assertTrue(a.hashCode() + " != " + b.hashCode(), a.hashCode() == b.hashCode()); - } - - /** - * Test method for {@link org.apache.mailet.MailAddress#MailAddress(java.lang.String)}. - * - * @throws AddressException - */ - @Test - public void testMailAddressString() throws AddressException { - - MailAddress a = new MailAddress(GOOD_ADDRESS); - assertTrue(GOOD_ADDRESS.equals(a.toString())); - - for (String goodAddress : GOOD_ADDRESSES) { - try { - a = new MailAddress(goodAddress); - } catch (AddressException e) { - fail(e.getMessage()); - } - } - - for (String badAddress : BAD_ADDRESSES) { - try { - a = new MailAddress(badAddress); - fail(badAddress); - } catch (AddressException ignore) { - } - } - } - - /** - * Test method for {@link org.apache.mailet.MailAddress#MailAddress(java.lang.String, java.lang.String)}. - */ - @Test - public void testMailAddressStringString() { - - try { - new MailAddress("local-part", "domain"); - } catch (AddressException e) { - assertTrue(e.getMessage(), false); - } - try { - MailAddress a = new MailAddress("local-part", "-domain"); - assertFalse(a.toString(), true); - } catch (AddressException e) { - assertTrue(true); - } - } - - /** - * Test method for {@link org.apache.mailet.MailAddress#MailAddress(javax.mail.internet.InternetAddress)}. - */ - @Test - public void testMailAddressInternetAddress() { - - try { - new MailAddress(new InternetAddress(GOOD_QUOTED_LOCAL_PART)); - } catch (AddressException e) { - System.out.println("AddressException" + e.getMessage()); - assertTrue(e.getMessage(), false); - } - } - - /** - * Test method for {@link org.apache.mailet.MailAddress#getDomain()}. - */ - @Test - public void testGetDomain() { - - try { - MailAddress a = new MailAddress(new InternetAddress(GOOD_ADDRESS)); - assertTrue(a.getDomain() + " != " + GOOD_DOMAIN, a.getDomain().equals(GOOD_DOMAIN)); - } catch (AddressException e) { - System.out.println("AddressException" + e.getMessage()); - assertTrue(e.getMessage(), false); - } - } - - /** - * Test method for {@link org.apache.mailet.MailAddress#getLocalPart()}. - */ - @Test - public void testGetLocalPart() { - - try { - MailAddress a = new MailAddress(new InternetAddress(GOOD_QUOTED_LOCAL_PART)); - assertTrue(GOOD_LOCAL_PART + " != " + a.getLocalPart(), a.getLocalPart().equals(GOOD_LOCAL_PART)); - } catch (AddressException e) { - System.out.println("AddressException" + e.getMessage()); - assertTrue(e.getMessage(), false); - } - } - - /** - * Test method for {@link org.apache.mailet.MailAddress#toString()}. - */ - @Test - public void testToString() { - - try { - MailAddress a = new MailAddress(new InternetAddress(GOOD_ADDRESS)); - assertTrue(a.toString() + " != " + GOOD_ADDRESS, a.toString().equals(GOOD_ADDRESS)); - } catch (AddressException e) { - System.out.println("AddressException" + e.getMessage()); - assertTrue(e.getMessage(), false); - } - } - - /** - * Test method for {@link org.apache.mailet.MailAddress#toInternetAddress()}. - */ - @Test - public void testToInternetAddress() { - - try { - InternetAddress b = new InternetAddress(GOOD_ADDRESS); - MailAddress a = new MailAddress(b); - assertTrue(a.toInternetAddress().equals(b)); - assertTrue(a.toString() + " != " + GOOD_ADDRESS, a.toString().equals(GOOD_ADDRESS)); - } catch (AddressException e) { - System.out.println("AddressException" + e.getMessage()); - assertTrue(e.getMessage(), false); - } - } - - /** - * Test method for {@link org.apache.mailet.MailAddress#equals(java.lang.Object)}. - * - * @throws AddressException - */ - @Test - public void testEqualsObject() throws AddressException { - - MailAddress a = new MailAddress(GOOD_ADDRESS); - MailAddress b = new MailAddress(GOOD_ADDRESS); - - assertTrue(a.toString() + " != " + b.toString(), a.equals(b)); - assertFalse(a.toString() + " != " + null, a.equals(null)); - } -}
http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java b/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java index d95a061..8054943 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/AutomaticallySentMailDetectorImpl.java @@ -33,7 +33,7 @@ import org.apache.james.mime4j.parser.MimeStreamParser; import org.apache.james.mime4j.stream.BodyDescriptor; import org.apache.james.mime4j.stream.MimeConfig; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; public class AutomaticallySentMailDetectorImpl implements AutomaticallySentMailDetector { http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java index 858ba6c..262965f 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericMatcher.java @@ -25,7 +25,7 @@ import java.util.Collection; import javax.mail.MessagingException; 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.Matcher; import org.apache.mailet.MatcherConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java index 0676c13..c7691bf 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java @@ -26,7 +26,7 @@ import java.util.Collection; import javax.mail.MessagingException; 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/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java b/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java index 2628fdf..8249e49 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java @@ -26,7 +26,7 @@ import java.util.Collection; 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 org.apache.mailet.MatcherConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java b/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java index 99d0095..e0f38f9 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/AutomaticallySentMailDetectorImplTest.java @@ -32,7 +32,7 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.util.ByteArrayDataSource; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.MimeMessageBuilder; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/base/src/test/java/org/apache/mailet/base/MailAddressFixture.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/MailAddressFixture.java b/mailet/base/src/test/java/org/apache/mailet/base/MailAddressFixture.java index ca1725d..b1a4883 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/MailAddressFixture.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/MailAddressFixture.java @@ -21,7 +21,7 @@ package org.apache.mailet.base; import javax.mail.internet.AddressException; -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/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java b/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java index 331efbe..bc49fec 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/MatcherInverterTest.java @@ -29,7 +29,7 @@ import java.util.Collection; import javax.mail.MessagingException; 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.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java index 98c7579..8a4bcde 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java @@ -36,7 +36,7 @@ import javax.mail.internet.InternetAddress; 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.PerRecipientHeaders; import org.apache.mailet.PerRecipientHeaders.Header; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java index 14409fb..9c54dc0 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java @@ -33,7 +33,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/mailet/base/src/test/java/org/apache/mailet/base/test/MailUtil.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/MailUtil.java b/mailet/base/src/test/java/org/apache/mailet/base/test/MailUtil.java index 17f26f6..148e352 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/MailUtil.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/MailUtil.java @@ -26,7 +26,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; /** * some utilities for James unit testing http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java index 4baa77d..e4ed9cd 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java @@ -39,7 +39,7 @@ import org.apache.james.transport.SMIMEAttributeNames; 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.GenericMailet; import org.apache.mailet.base.RFC2822Headers; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java index d47c901..1646361 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMEEncrypted.java @@ -27,7 +27,7 @@ import javax.mail.internet.MimeMessage; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; /** * Checks if a mail is smime encrypted. http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java index 42e35d0..88ab165 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsSMIMESigned.java @@ -27,7 +27,7 @@ import javax.mail.internet.MimeMessage; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; /** * checks if a mail is smime signed. http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java index a307c36..30f920d 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java @@ -30,7 +30,7 @@ import java.util.List; import javax.mail.MessagingException; 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/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java index 33eca9d..023199f 100644 --- a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java +++ b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java @@ -34,7 +34,7 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.lang3.tuple.Pair; import org.apache.james.transport.mailets.model.ICAL; 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/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/model/ICAL.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/model/ICAL.java b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/model/ICAL.java index 14db606..29dc158 100644 --- a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/model/ICAL.java +++ b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/model/ICAL.java @@ -22,7 +22,7 @@ package org.apache.james.transport.mailets.model; import java.util.Objects; import java.util.Optional; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java index 5538b15..21c061e 100644 --- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java +++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java @@ -31,7 +31,7 @@ import java.util.stream.Collectors; import javax.mail.MessagingException; 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.FakeMailetConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java index 99db64b..4699ae3 100644 --- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java +++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/model/ICALTest.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.io.ByteArrayInputStream; -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/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddDeliveredToHeader.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddDeliveredToHeader.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddDeliveredToHeader.java index d4a4082..c1651a0 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddDeliveredToHeader.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddDeliveredToHeader.java @@ -22,7 +22,7 @@ package org.apache.james.transport.mailets; import javax.mail.MessagingException; 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.base.GenericMailet; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java index 0e4bc26..8aec378 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java @@ -42,7 +42,7 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.io.IOUtils; 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/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java index 6f822db..04c8c72 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java @@ -27,7 +27,7 @@ import java.util.Vector; import javax.mail.MessagingException; 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.base.GenericMailet; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java index 4a12bf8..56e8646 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecipientToLowerCase.java @@ -23,7 +23,7 @@ import javax.mail.MessagingException; import javax.mail.internet.AddressException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import com.github.steveash.guavate.Guavate; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java index c562ee8..ef1e20c 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java @@ -36,7 +36,7 @@ import org.apache.james.mime4j.field.address.LenientAddressParser; import org.apache.james.mime4j.util.MimeUtil; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java index d5b2601..5539786 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java @@ -28,7 +28,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.apache.mailet.base.GenericMatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java index 7229510..8133740 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/All.java @@ -20,7 +20,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericMatcher; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java index 5195543..c505816 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java @@ -37,7 +37,7 @@ import javax.mail.internet.MimeMessage; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java index cf15c14..119b8fd 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandForListserv.java @@ -23,7 +23,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.Experimental; import org.apache.mailet.base.GenericRecipientMatcher; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import javax.mail.MessagingException; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java index f64b007..a784edf 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CommandListservMatcher.java @@ -23,7 +23,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.Experimental; import org.apache.mailet.base.GenericRecipientMatcher; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import javax.mail.MessagingException; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java index e1ec507..b4e9aa3 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/CompareNumericHeaderValue.java @@ -24,7 +24,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.Experimental; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java index 6b707f3..a16baff 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/FetchedFrom.java @@ -21,7 +21,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import javax.mail.internet.MimeMessage; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java index e9c0612..6896967 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/GenericRegexMatcher.java @@ -29,7 +29,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.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java index a998039..5f58a75 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasAttachment.java @@ -23,7 +23,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import javax.mail.MessagingException; import javax.mail.Multipart; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java index 5b7e757..ab981ab 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java @@ -28,7 +28,7 @@ import javax.mail.internet.MimeMessage; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java index 1fe2108..c659634 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeader.java @@ -33,7 +33,7 @@ import org.apache.james.mime4j.codec.DecodeMonitor; import org.apache.james.mime4j.codec.DecoderUtil; import org.apache.james.mime4j.util.MimeUtil; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java index 05ee715..3295015 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasHeaderWithPrefix.java @@ -27,7 +27,7 @@ import javax.mail.MessagingException; import org.apache.james.transport.mailets.utils.MimeMessageUtils; 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.base.Strings; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java index 41dcf91..a00f2bf 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttribute.java @@ -27,7 +27,7 @@ import java.util.Collection; import javax.mail.MessagingException; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java index bfc6aac..4a02a35 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValue.java @@ -26,7 +26,7 @@ import java.util.Collection; import javax.mail.MessagingException; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java index 1253ede..84f3fbc 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegex.java @@ -24,7 +24,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.MatcherConfig; import java.util.Collection; import java.util.regex.Pattern; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java index 2600007..36c0684 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java @@ -26,7 +26,7 @@ import java.util.Locale; import java.util.StringTokenizer; import java.util.Vector; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericRecipientMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java index 66b1b11..9d37136 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIsLocal.java @@ -22,7 +22,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericRecipientMatcher; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; /** * Matches mail to Domains which are local http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java index fd5373b..cdbdbf9 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/IsSingleRecipient.java @@ -23,7 +23,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericMatcher; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java index 6030e91..0c567df 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIs.java @@ -24,7 +24,7 @@ import java.util.Collection; import javax.mail.MessagingException; import org.apache.james.transport.matchers.utils.MailAddressCollectionReader; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericRecipientMatcher; import com.google.common.base.Strings; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java index cc687a2..7155581 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsLocal.java @@ -22,7 +22,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericRecipientMatcher; -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/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java index 2ee1b16..67b0c49 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RecipientIsRegex.java @@ -23,7 +23,7 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.apache.mailet.base.GenericRecipientMatcher; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import javax.mail.MessagingException; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java index ddd91a0..3c248ba 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java @@ -25,7 +25,7 @@ import org.apache.mailet.base.MailetUtil; import org.apache.mailet.base.RFC2822Headers; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import javax.mail.Header; import javax.mail.MessagingException; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java index 016aeca..54aa8af 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthSuccessful.java @@ -24,7 +24,7 @@ package org.apache.james.transport.matchers; import com.google.common.collect.ImmutableList; import org.apache.mailet.base.GenericMatcher; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java index cc3fc52..ba9719f 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.StringTokenizer; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java index ea15d7d..bc9afa9 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPIsAuthNetwork.java @@ -24,7 +24,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.Experimental; import org.apache.mailet.base.GenericMatcher; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java index 073aad3..d6f67e1 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIs.java @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.Locale; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java index 0c9b5d5..6eac31d 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.Locale; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java index b0d7239..1513674 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIs.java @@ -26,7 +26,7 @@ import javax.mail.MessagingException; import org.apache.james.transport.matchers.utils.MailAddressCollectionReader; 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.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java index 4cf9db3..8903278 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsLocal.java @@ -23,7 +23,7 @@ import java.util.Collection; import javax.mail.MessagingException; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java index bd244ab..b791ff5 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsNull.java @@ -21,7 +21,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericMatcher; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java index 8b32a4f..3988356 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderIsRegex.java @@ -21,7 +21,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import java.util.Collection; import java.util.regex.Pattern; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java index df173cf..3c3ba02 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SentByMailet.java @@ -23,7 +23,7 @@ import java.util.Collection; import com.google.common.collect.ImmutableList; 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/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java index 78175f3..f2bfff2 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SizeGreaterThan.java @@ -23,7 +23,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import javax.mail.MessagingException; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java index 44429e5..8be7516 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectIs.java @@ -23,7 +23,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import javax.mail.internet.MimeMessage; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java index 8e15957..c48c6a5 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SubjectStartsWith.java @@ -23,7 +23,7 @@ package org.apache.james.transport.matchers; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyLines.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyLines.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyLines.java index 958990f..5ebd8b0 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyLines.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyLines.java @@ -24,7 +24,7 @@ import java.util.Collection; import javax.mail.MessagingException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.base.MailetUtil; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyRecipients.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyRecipients.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyRecipients.java index f7d3e92..555a92d 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyRecipients.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/TooManyRecipients.java @@ -24,7 +24,7 @@ import java.util.Collection; import javax.mail.MessagingException; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.base.MailetUtil; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java index a764d5a..ece24da 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java @@ -23,7 +23,7 @@ import java.util.Set; import javax.mail.MessagingException; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericRecipientMatcher; import com.google.common.base.Splitter; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/main/java/org/apache/james/transport/matchers/utils/MailAddressCollectionReader.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/utils/MailAddressCollectionReader.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/utils/MailAddressCollectionReader.java index 6371d35..bbbbbba 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/utils/MailAddressCollectionReader.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/utils/MailAddressCollectionReader.java @@ -22,7 +22,7 @@ package org.apache.james.transport.matchers.utils; import java.util.Set; import javax.mail.internet.AddressException; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import com.github.steveash.guavate.Guavate; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java index f3e1c3a..beb7db6 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/LogMessageTest.java @@ -36,7 +36,7 @@ import javax.mail.internet.AddressException; 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.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/mailet/standard/src/test/java/org/apache/james/transport/mailets/RecipientToLowerCaseTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RecipientToLowerCaseTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RecipientToLowerCaseTest.java index b062cb7..ed1d4b7 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RecipientToLowerCaseTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RecipientToLowerCaseTest.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; -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/mailet/standard/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java index 233d909..7f5c898 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.mock; import javax.mail.MessagingException; 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.MailetException; import org.apache.mailet.base.test.FakeMail; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java index cdcb968..3d25483 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/UseHeaderRecipientsTest.java @@ -22,7 +22,7 @@ package org.apache.james.transport.mailets; import static org.assertj.core.api.Assertions.assertThat; 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/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java index fbef0a7..342e154 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java @@ -24,7 +24,7 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.base.test.FakeMail; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java index 83e578c..47f60fe 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueRegexTest.java @@ -24,7 +24,7 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; import junit.framework.AssertionFailedError; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java index ee373f3..f67cc74 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/HasMailAttributeWithValueTest.java @@ -24,7 +24,7 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; public class HasMailAttributeWithValueTest extends AbstractHasMailAttributeTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsLocalTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsLocalTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsLocalTest.java index 853e7e5..5fdb250 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsLocalTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/RecipientIsLocalTest.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.MailetContext; 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/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java index 0ca0337..4c1374e 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthSuccessfulTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; 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/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java index 3f5a533..970ba27 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPAuthUserIsTest.java @@ -24,9 +24,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.james.transport.matchers.SMTPAuthUserIs; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; public class SMTPAuthUserIsTest extends AbstractHasMailAttributeTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java index 282879c..8f90d00 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java @@ -24,7 +24,7 @@ import java.util.Collection; import javax.mail.MessagingException; -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.apache.mailet.base.test.FakeMatcherConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java index d61b52a..6ab12eb 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java @@ -33,7 +33,7 @@ import java.util.Collection; import javax.mail.MessagingException; 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.Matcher; import org.apache.mailet.base.test.FakeMail; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsTest.java index 9546906..2904f8a 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsTest.java @@ -29,7 +29,7 @@ import java.util.Collection; import javax.mail.MessagingException; 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.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java index 87b81a7..f97aea6 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java @@ -31,7 +31,7 @@ import java.util.Collection; import javax.mail.MessagingException; 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.Matcher; import org.apache.mailet.base.test.FakeMail; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsNullTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsNullTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsNullTest.java index ed3a77e..8241b64 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsNullTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsNullTest.java @@ -23,7 +23,7 @@ package org.apache.james.transport.matchers; import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES; import static org.assertj.core.api.Assertions.assertThat; -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/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java index 2538914..114dc26 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsRegexTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.mail.MessagingException; -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/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java index 234e7ad..1c7b823 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.mail.MessagingException; -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/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java index 06ac680..67e6285 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; 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/mailet/standard/src/test/java/org/apache/james/transport/matchers/SubjectIsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SubjectIsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SubjectIsTest.java index fe388c2..11193fa 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SubjectIsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SubjectIsTest.java @@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.mail.MessagingException; import javax.mail.internet.AddressException; -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.apache.mailet.base.test.MailUtil; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/matchers/SubjectStartsWithTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SubjectStartsWithTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SubjectStartsWithTest.java index dd7c28c..e927980 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SubjectStartsWithTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SubjectStartsWithTest.java @@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.mail.MessagingException; import javax.mail.internet.AddressException; -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.apache.mailet.base.test.MailUtil; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyLinesTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyLinesTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyLinesTest.java index 575d396..691b27d 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyLinesTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyLinesTest.java @@ -25,7 +25,7 @@ import java.util.Collection; import javax.mail.MessagingException; -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.apache.mailet.base.test.MimeMessageBuilder; http://git-wip-us.apache.org/repos/asf/james-project/blob/936746b9/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java index d399d11..41ee23a 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/TooManyRecipientsTest.java @@ -25,7 +25,7 @@ import java.util.Collection; import javax.mail.MessagingException; -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/mailet/standard/src/test/java/org/apache/james/transport/matchers/util/MailAddressCollectionReaderTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/util/MailAddressCollectionReaderTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/util/MailAddressCollectionReaderTest.java index c7c0494..ce9f83a 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/util/MailAddressCollectionReaderTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/util/MailAddressCollectionReaderTest.java @@ -22,7 +22,7 @@ package org.apache.james.transport.matchers.util; import static org.assertj.core.api.Assertions.assertThat; import org.apache.james.transport.matchers.utils.MailAddressCollectionReader; -import org.apache.mailet.MailAddress; +import org.apache.james.core.MailAddress; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
