http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationReply.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationReply.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationReply.java index 6e01ce6..ae5c4cc 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationReply.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationReply.java @@ -24,10 +24,10 @@ import java.util.List; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.james.jmap.api.vacation.Vacation; import org.apache.james.jmap.utils.MimeMessageBodyGenerator; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.AutomaticallySentMailDetector; import com.github.fge.lambdas.Throwing;
http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java index e9b4d0d..b62702c 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java @@ -23,8 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; -import org.apache.james.jmap.send.MailMetadata; import org.apache.james.core.MailAddress; +import org.apache.james.jmap.send.MailMetadata; 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/43fdedc3/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java index fd02f3c..7dff577 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/VacationReplyTest.java @@ -33,9 +33,9 @@ import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.james.jmap.api.vacation.Vacation; import org.apache.james.jmap.utils.MimeMessageBodyGenerator; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessorTest.java index 9e3fa63..52db6a8 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessorTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessorTest.java @@ -42,7 +42,6 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.metrics.api.NoopMetricFactory; -import org.apache.james.util.OptionalUtils; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java b/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java index 861a8ad..8c4cbfd 100644 --- a/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java +++ b/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java @@ -20,17 +20,17 @@ package org.apache.james.imapserver.netty; import static org.assertj.core.api.Assertions.assertThat; + import java.util.concurrent.TimeUnit; -import org.apache.james.imap.api.ImapConfiguration; import org.apache.commons.configuration.DefaultConfigurationBuilder; - -import com.google.common.collect.ImmutableSet; - +import org.apache.james.imap.api.ImapConfiguration; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import com.google.common.collect.ImmutableSet; + public class IMAPServerTest { @Rule public ExpectedException expectedException = ExpectedException.none(); http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java index 8a5944d..178e80d 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.lmtpserver.netty; - import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.lmtpserver.CoreCmdHandlerLoader; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java index e376ffc..e888af1 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java @@ -20,7 +20,6 @@ package org.apache.james.pop3server.jmx; import java.util.Collection; - import org.apache.james.protocols.api.handler.CommandHandler; import org.apache.james.protocols.api.handler.ProtocolHandler; import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java index 2d50b89..b9c0078 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesDataCmdHandler.java @@ -20,14 +20,14 @@ package org.apache.james.smtpserver; import javax.inject.Inject; -import org.apache.james.server.core.MailImpl; -import org.apache.james.server.core.MimeMessageInputStreamSource; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.protocols.api.ProtocolSession.State; import org.apache.james.protocols.smtp.SMTPResponse; import org.apache.james.protocols.smtp.SMTPRetCode; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.core.DataCmdHandler; +import org.apache.james.server.core.MailImpl; +import org.apache.james.server.core.MimeMessageInputStreamSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java index 7abbdaf..8bd57bc 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java @@ -27,13 +27,13 @@ import java.util.Map; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.james.core.MailAddress; import org.apache.james.protocols.api.handler.ProtocolHandler; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.queue.api.MailPrioritySupport; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; /** * Handler which set a configured {@link Mail} priority for the mail. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java index 72c5b2e..ea96196 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java @@ -19,12 +19,12 @@ package org.apache.james.smtpserver.fastfail; +import java.util.Arrays; + import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.handler.ProtocolHandler; -import java.util.Arrays; - public class SpamTrapHandler extends org.apache.james.protocols.smtp.core.fastfail.SpamTrapHandler implements ProtocolHandler { @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java index ef663fa..d3f7def 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java @@ -18,15 +18,16 @@ ****************************************************************/ package org.apache.james.smtpserver; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.net.InetSocketAddress; + import org.apache.james.protocols.lib.POP3BeforeSMTPHelper; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession; import org.junit.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class POP3BeforeSMTPHandlerTest { private SMTPSession mockedSession; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java index 88af3a3..7098438 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java @@ -46,6 +46,7 @@ import org.apache.commons.net.ProtocolCommandEvent; import org.apache.commons.net.ProtocolCommandListener; import org.apache.commons.net.smtp.SMTPClient; import org.apache.commons.net.smtp.SMTPReply; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.mock.SimpleDomainList; @@ -69,7 +70,6 @@ import org.apache.james.user.api.UsersRepository; import org.apache.james.user.lib.mock.InMemoryUsersRepository; import org.apache.mailet.HostAddress; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.junit.After; import org.junit.Before; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java index ab6c2c0..4ae6b2d 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java @@ -18,16 +18,17 @@ ****************************************************************/ package org.apache.james.smtpserver; +import static org.junit.Assert.assertEquals; + import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; + import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession; import org.apache.mailet.Mail; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; - public class SetMimeHeaderHandlerTest { private SMTPSession mockedSMTPSession; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java index e46f5d5..2569678 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java @@ -20,13 +20,15 @@ package org.apache.james.smtpserver; import java.util.Arrays; import java.util.Random; + import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import javax.mail.internet.ParseException; + +import org.apache.james.core.MailAddress; import org.apache.james.smtpserver.mock.MockMimeMessage; import org.apache.james.smtpserver.mock.mailet.MockMail; -import org.apache.james.core.MailAddress; /** * some utilities for James unit testing http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java index e66fed8..a28fbe5 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java @@ -29,8 +29,8 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import org.apache.commons.lang.NotImplementedException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.PerRecipientHeaders; import org.apache.mailet.PerRecipientHeaders.Header; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java index 170cc9f..8ad7f6f 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java @@ -20,6 +20,7 @@ package org.apache.james.smtpserver.mock.mailet; import java.util.Iterator; import java.util.Properties; + import org.apache.mailet.MailetConfig; import org.apache.mailet.MailetContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/JwtFilter.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/JwtFilter.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/JwtFilter.java index 3dda17b..d72b532 100644 --- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/JwtFilter.java +++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/JwtFilter.java @@ -26,8 +26,8 @@ import java.util.Optional; import javax.inject.Inject; import org.apache.james.jwt.JwtTokenVerifier; - import org.eclipse.jetty.http.HttpStatus; + import spark.Request; import spark.Response; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/webadmin/webadmin-swagger/src/main/java/org/apache/james/webadmin/swagger/routes/SwaggerRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-swagger/src/main/java/org/apache/james/webadmin/swagger/routes/SwaggerRoutes.java b/server/protocols/webadmin/webadmin-swagger/src/main/java/org/apache/james/webadmin/swagger/routes/SwaggerRoutes.java index 4dde510..59ddc3f 100644 --- a/server/protocols/webadmin/webadmin-swagger/src/main/java/org/apache/james/webadmin/swagger/routes/SwaggerRoutes.java +++ b/server/protocols/webadmin/webadmin-swagger/src/main/java/org/apache/james/webadmin/swagger/routes/SwaggerRoutes.java @@ -19,14 +19,13 @@ package org.apache.james.webadmin.swagger.routes; - import javax.inject.Inject; import org.apache.james.webadmin.Routes; import org.apache.james.webadmin.WebAdminConfiguration; import org.apache.james.webadmin.swagger.SwaggerParser; - import org.eclipse.jetty.http.HttpStatus; + import spark.Service; public class SwaggerRoutes implements Routes { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java index 193beb6..142b77b 100644 --- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java +++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java @@ -40,13 +40,13 @@ import org.apache.activemq.ActiveMQSession; import org.apache.activemq.BlobMessage; import org.apache.activemq.command.ActiveMQBlobMessage; import org.apache.activemq.util.JMSExceptionSupport; -import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; -import org.apache.james.server.core.MimeMessageInputStream; -import org.apache.james.server.core.MimeMessageSource; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.queue.api.MailQueue; import org.apache.james.queue.api.MailQueueItemDecoratorFactory; import org.apache.james.queue.jms.JMSMailQueue; +import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; +import org.apache.james.server.core.MimeMessageInputStream; +import org.apache.james.server.core.MimeMessageSource; import org.apache.mailet.Mail; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java index b0b7292..3bdbcdc 100644 --- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java +++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java @@ -31,8 +31,8 @@ import java.util.concurrent.TimeUnit; import javax.mail.MessagingException; import org.apache.commons.io.IOUtils; -import org.apache.james.server.core.MailImpl; import org.apache.james.queue.api.MailQueue; +import org.apache.james.server.core.MailImpl; import org.apache.mailet.Mail; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java index fc32416..599be33 100644 --- a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java +++ b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java @@ -42,12 +42,12 @@ import javax.mail.util.SharedFileInputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; -import org.apache.james.server.core.MimeMessageSource; import org.apache.james.lifecycle.api.Disposable; import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.queue.api.MailQueueItemDecoratorFactory; import org.apache.james.queue.api.ManageableMailQueue; +import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; +import org.apache.james.server.core.MimeMessageSource; import org.apache.mailet.Mail; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java index 047f822..462e750 100644 --- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java +++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java @@ -47,8 +47,7 @@ import javax.mail.MessagingException; import javax.mail.internet.AddressException; import javax.mail.internet.MimeMessage; -import org.apache.james.server.core.MailImpl; -import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; +import org.apache.james.core.MailAddress; import org.apache.james.lifecycle.api.Disposable; import org.apache.james.metrics.api.Metric; import org.apache.james.metrics.api.MetricFactory; @@ -57,8 +56,9 @@ import org.apache.james.queue.api.MailPrioritySupport; import org.apache.james.queue.api.MailQueue; import org.apache.james.queue.api.MailQueueItemDecoratorFactory; import org.apache.james.queue.api.ManageableMailQueue; +import org.apache.james.server.core.MailImpl; +import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; import org.apache.mailet.Mail; -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/43fdedc3/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java index 2a70a98..fa53de9 100644 --- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java +++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java @@ -26,9 +26,9 @@ import javax.jms.ObjectMessage; import javax.mail.util.SharedByteArrayInputStream; import org.apache.commons.io.IOUtils; -import org.apache.james.server.core.MimeMessageSource; import org.apache.james.lifecycle.api.Disposable; import org.apache.james.lifecycle.api.LifecycleUtil; +import org.apache.james.server.core.MimeMessageSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java index 1348388..0b43edf 100644 --- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java +++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java @@ -34,6 +34,7 @@ import javax.management.openmbean.CompositeType; import javax.management.openmbean.OpenType; import javax.management.openmbean.SimpleType; +import org.apache.james.core.MailAddress; import org.apache.james.queue.api.MailQueue.MailQueueException; import org.apache.james.queue.api.MailQueueManagementMBean; import org.apache.james.queue.api.ManageableMailQueue; @@ -41,7 +42,6 @@ import org.apache.james.queue.api.ManageableMailQueue.MailQueueItemView; import org.apache.james.queue.api.ManageableMailQueue.MailQueueIterator; import org.apache.james.queue.api.ManageableMailQueue.Type; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; /** * JMX MBean implementation which expose management functions by wrapping a http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java index d14f65f..9933bbb 100644 --- a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java +++ b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java @@ -1,13 +1,13 @@ package org.apache.james.queue.jms; +import java.util.Arrays; + import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; import org.junit.AfterClass; import org.junit.BeforeClass; -import java.util.Arrays; - public class JMSMailQueueTest extends AbstractJMSMailQueueTest { private static BrokerService broker; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
