from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaRootProcessor.java"
   contains "import org.apache.james.core.quota.QuotaCountLimit;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/GetMetadataProcessor.java"
   contains "import static org.apache.james.util.ReactorUtils.logOnError;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/MoveProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/UnselectProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/CopyProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java"
   contains "import static org.apache.james.util.ReactorUtils.logOnError;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/SetQuotaProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java"
   contains "import static org.apache.james.util.ReactorUtils.logOnError;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/CompressProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/NoopProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java"
   contains "import static org.apache.james.util.ReactorUtils.logAsMono;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java"
   contains "import org.apache.james.util.ReactorUtils;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java"
   contains "import org.apache.james.util.ReactorUtils;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/ListProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/GetQuotaProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/IdleProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/IdProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/LSubProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/NamespaceProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/CheckProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/SetMetadataProcessor.java"
   contains "import static org.apache.james.util.ReactorUtils.logOnError;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java"
   contains "import org.apache.james.util.ReactorUtils;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/SelectProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/ExamineProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/ReplaceProcessor.java"
   contains "import static org.apache.james.util.ReactorUtils.logOnError;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/MyRightsProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/SetACLProcessor.java"
   contains "import static org.apache.james.util.ReactorUtils.logOnError;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/ListRightsProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java"
   contains "import static org.apache.james.util.ReactorUtils.logOnError;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java"
   contains "import static org.apache.james.util.ReactorUtils.logOnError;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/base/AbstractProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/processor/base/ImapResponseMessageProcessor.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/message/request/LoginRequest.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/decode/parser/LoginCommandParser.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/api/process/ImapSession.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/imap/src/main/java/org/apache/james/imap/main/PathConverter.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/core/DataLineMessageHookHandler.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/lmtp/src/main/java/org/apache/james/protocols/lmtp/hook/DeliverToRecipientHook.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/netty/src/main/java/org/apache/james/protocols/netty/ProtocolMDCContextFactory.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelInboundHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelope.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java"
   contains "import org.apache.james.core.MaybeSender;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SMTPMDCContextFactory.java"
   contains "import org.apache.james.core.MaybeSender;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractAuthRequiredToRelayRcptHook.java"
   contains "import org.apache.james.core.Domain;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/PostmasterAbuseRcptHook.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AcceptRecipientIfRelayingIsAllowed.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationHook.java"
   contains "import org.apache.james.core.Domain;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java"
   contains "import org.apache.james.core.MaybeSender;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java"
   contains "import org.apache.james.core.Domain;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/SimpleHook.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java"
   contains "import org.apache.james.core.MailAddress;"

from: protocols
to: core
evidence:
 - file: "protocols/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UserCmdHandler.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractApopCmdHandler.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/AbstractPassCmdHandler.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StatCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/QuitCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RsetCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UnknownCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/RetrCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/NoopCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ListCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/CapaCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/UidlCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/DeleCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/StlsCmdHandler.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/MDCConstants.java"
   contains "import org.apache.james.util.MDCBuilder;"

from: protocols
to: core
evidence:
 - file: "protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/managesieve/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/managesieve/src/main/java/org/apache/james/managesieve/core/PlainAuthenticationProcessor.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/managesieve/src/main/java/org/apache/james/managesieve/util/SettableSession.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/managesieve/src/main/java/org/apache/james/managesieve/api/AuthenticationProcessor.java"
   contains "import org.apache.james.core.Username;"

from: protocols
to: core
evidence:
 - file: "protocols/managesieve/src/main/java/org/apache/james/managesieve/api/Session.java"
   contains "import org.apache.james.core.Username;"