(geronimo-mail) branch main updated: Restructuring of repository to form a mono repo

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/geronimo-mail.git


The following commit(s) were added to refs/heads/main by this push:
     new 8a6cf2b  Restructuring of repository to form a mono repo
8a6cf2b is described below

commit 8a6cf2b45c35526f1d8bb5a676d31af036722437
Author: Richard Zowalla <[email protected]>
AuthorDate: Fri Jan 17 14:40:43 2025 +0100

    Restructuring of repository to form a mono repo
---
 geronimo-mail_2.1/LICENSE => LICENSE               |   0
 geronimo-mail_2.1/NOTICE => NOTICE                 |   0
 geronimo-jakartamail_2.1_spec/LICENSE              | 257 ---------------------
 geronimo-jakartamail_2.1_spec/NOTICE               |   5 -
 geronimo-mail_2.1/.travis.yml                      |   5 -
 .../.gitignore                                     |   0
 .../README.txt                                     |   0
 .../geronimo-mail_2.1_mail/pom.xml                 |   0
 .../geronimo-mail_2.1_mail/src/site/site.xml       |   0
 .../geronimo-mail_2.1_provider/pom.xml             |   0
 .../mail/authentication/AuthenticatorFactory.java  |   0
 .../mail/authentication/ClientAuthenticator.java   |   0
 .../mail/authentication/CramMD5Authenticator.java  |   0
 .../authentication/DigestMD5Authenticator.java     |   0
 .../mail/authentication/LoginAuthenticator.java    |   0
 .../mail/authentication/PlainAuthenticator.java    |   0
 .../mail/authentication/SASLAuthenticator.java     |   0
 .../mail/authentication/XOAUTH2Authenticator.java  |   0
 .../mail/handlers/AbstractImageHandler.java        |   0
 .../mail/handlers/AbstractTextHandler.java         |   0
 .../geronimo/mail/handlers/ImageGifHandler.java    |   0
 .../geronimo/mail/handlers/ImageJpegHandler.java   |   0
 .../geronimo/mail/handlers/MultipartHandler.java   |   0
 .../mail/handlers/RFC822MessageHandler.java        |   0
 .../geronimo/mail/handlers/TextHtmlHandler.java    |   0
 .../geronimo/mail/handlers/TextPlainHandler.java   |   0
 .../geronimo/mail/handlers/TextXmlHandler.java     |   0
 .../org/apache/geronimo/mail/store/imap/ACL.java   |   0
 .../mail/store/imap/IMAPAttachedMessage.java       |   0
 .../geronimo/mail/store/imap/IMAPFolder.java       |   0
 .../geronimo/mail/store/imap/IMAPMessage.java      |   0
 .../geronimo/mail/store/imap/IMAPMimeBodyPart.java |   0
 .../mail/store/imap/IMAPMultipartDataSource.java   |   0
 .../mail/store/imap/IMAPNamespaceFolder.java       |   0
 .../geronimo/mail/store/imap/IMAPRootFolder.java   |   0
 .../geronimo/mail/store/imap/IMAPSSLStore.java     |   0
 .../apache/geronimo/mail/store/imap/IMAPStore.java |   0
 .../apache/geronimo/mail/store/imap/Rights.java    |   0
 .../store/imap/connection/IMAPACLResponse.java     |   0
 .../mail/store/imap/connection/IMAPBody.java       |   0
 .../store/imap/connection/IMAPBodySection.java     |   0
 .../store/imap/connection/IMAPBodyStructure.java   |   0
 .../imap/connection/IMAPCapabilityResponse.java    |   0
 .../mail/store/imap/connection/IMAPCommand.java    |   0
 .../mail/store/imap/connection/IMAPConnection.java |   0
 .../store/imap/connection/IMAPConnectionPool.java  |   0
 .../imap/connection/IMAPContinuationResponse.java  |   0
 .../mail/store/imap/connection/IMAPDateFormat.java |   0
 .../mail/store/imap/connection/IMAPEnvelope.java   |   0
 .../store/imap/connection/IMAPFetchBodyPart.java   |   0
 .../store/imap/connection/IMAPFetchDataItem.java   |   0
 .../store/imap/connection/IMAPFetchResponse.java   |   0
 .../mail/store/imap/connection/IMAPFlags.java      |   0
 .../store/imap/connection/IMAPFlagsResponse.java   |   0
 .../store/imap/connection/IMAPInternalDate.java    |   0
 .../store/imap/connection/IMAPInternetHeader.java  |   0
 .../store/imap/connection/IMAPListResponse.java    |   0
 .../imap/connection/IMAPListRightsResponse.java    |   0
 .../store/imap/connection/IMAPMailboxResponse.java |   0
 .../store/imap/connection/IMAPMailboxStatus.java   |   0
 .../store/imap/connection/IMAPMessageSize.java     |   0
 .../store/imap/connection/IMAPMessageText.java     |   0
 .../imap/connection/IMAPMyRightsResponse.java      |   0
 .../mail/store/imap/connection/IMAPNamespace.java  |   0
 .../imap/connection/IMAPNamespaceResponse.java     |   0
 .../mail/store/imap/connection/IMAPOkResponse.java |   0
 .../connection/IMAPPermanentFlagsResponse.java     |   0
 .../store/imap/connection/IMAPQuotaResponse.java   |   0
 .../imap/connection/IMAPQuotaRootResponse.java     |   0
 .../mail/store/imap/connection/IMAPResponse.java   |   0
 .../store/imap/connection/IMAPResponseBuffer.java  |   0
 .../store/imap/connection/IMAPResponseStream.java  |   0
 .../imap/connection/IMAPResponseTokenizer.java     |   0
 .../imap/connection/IMAPSearchDateFormat.java      |   0
 .../store/imap/connection/IMAPSearchResponse.java  |   0
 .../imap/connection/IMAPServerStatusResponse.java  |   0
 .../store/imap/connection/IMAPSizeResponse.java    |   0
 .../store/imap/connection/IMAPStatusResponse.java  |   0
 .../store/imap/connection/IMAPTaggedResponse.java  |   0
 .../mail/store/imap/connection/IMAPUid.java        |   0
 .../imap/connection/IMAPUntaggedResponse.java      |   0
 .../connection/IMAPUntaggedResponseHandler.java    |   0
 .../geronimo/mail/store/nntp/NNTPFolder.java       |   0
 .../geronimo/mail/store/nntp/NNTPGroupFolder.java  |   0
 .../geronimo/mail/store/nntp/NNTPMessage.java      |   0
 .../geronimo/mail/store/nntp/NNTPRootFolder.java   |   0
 .../geronimo/mail/store/nntp/NNTPSSLStore.java     |   0
 .../apache/geronimo/mail/store/nntp/NNTPStore.java |   0
 .../mail/store/nntp/newsrc/NNTPNewsrc.java         |   0
 .../mail/store/nntp/newsrc/NNTPNewsrcFile.java     |   0
 .../mail/store/nntp/newsrc/NNTPNewsrcGroup.java    |   0
 .../geronimo/mail/store/nntp/newsrc/Range.java     |   0
 .../geronimo/mail/store/nntp/newsrc/RangeList.java |   0
 .../geronimo/mail/store/pop3/POP3Constants.java    |   0
 .../geronimo/mail/store/pop3/POP3Folder.java       |   0
 .../geronimo/mail/store/pop3/POP3Message.java      |   0
 .../geronimo/mail/store/pop3/POP3RootFolder.java   |   0
 .../geronimo/mail/store/pop3/POP3SSLStore.java     |   0
 .../apache/geronimo/mail/store/pop3/POP3Store.java |   0
 .../mail/store/pop3/connection/POP3Connection.java |   0
 .../store/pop3/connection/POP3ConnectionPool.java  |   0
 .../store/pop3/connection/POP3ListResponse.java    |   0
 .../mail/store/pop3/connection/POP3Response.java   |   0
 .../store/pop3/connection/POP3StatusResponse.java  |   0
 .../geronimo/mail/transport/NullTransport.java     |   0
 .../mail/transport/nntp/NNTPConnection.java        |   0
 .../geronimo/mail/transport/nntp/NNTPReply.java    |   0
 .../mail/transport/nntp/NNTPSSLTransport.java      |   0
 .../mail/transport/nntp/NNTPTransport.java         |   0
 .../mail/transport/nntp/StringListInputStream.java |   0
 .../smtp/MalformedSMTPReplyException.java          |   0
 .../transport/smtp/SMTPAddressFailedException.java |   0
 .../smtp/SMTPAddressSucceededException.java        |   0
 .../mail/transport/smtp/SMTPConnection.java        |   0
 .../geronimo/mail/transport/smtp/SMTPMessage.java  |   0
 .../geronimo/mail/transport/smtp/SMTPReply.java    |   0
 .../mail/transport/smtp/SMTPSTransport.java        |   0
 .../transport/smtp/SMTPSendFailedException.java    |   0
 .../mail/transport/smtp/SMTPTransport.java         |   0
 .../transport/smtp/SMTPTransportException.java     |   0
 .../geronimo/mail/util/CommandFailedException.java |   0
 .../geronimo/mail/util/ConnectionException.java    |   0
 .../geronimo/mail/util/CountingOutputStream.java   |   0
 .../mail/util/InvalidCommandException.java         |   0
 .../apache/geronimo/mail/util/MIMEInputReader.java |   0
 .../geronimo/mail/util/MIMEOutputStream.java       |   0
 .../apache/geronimo/mail/util/MailConnection.java  |   0
 .../geronimo/mail/util/ProtocolProperties.java     |   0
 .../mail/util/ResponseFormatException.java         |   0
 .../geronimo/mail/util/TraceInputStream.java       |   0
 .../geronimo/mail/util/TraceOutputStream.java      |   0
 .../META-INF/javamail.default.address.map          |   0
 .../resources/META-INF/javamail.default.providers  |   0
 .../src/main/resources/META-INF/mailcap            |   0
 .../org.apache.javamail.handlers.ImageGifHandler   |   0
 .../org.apache.javamail.handlers.ImageJpegHandler  |   0
 .../org.apache.javamail.handlers.MultipartHandler  |   0
 ...g.apache.javamail.handlers.RFC822MessageHandler |   0
 .../org.apache.javamail.handlers.TextHtmlHandler   |   0
 .../org.apache.javamail.handlers.TextPlainHandler  |   0
 .../org.apache.javamail.handlers.TextXmlHandler    |   0
 .../org.apache.javamail.store.imap.IMAPSSSLStore   |   0
 .../org.apache.javamail.store.imap.IMAPStore       |   0
 .../org.apache.javamail.store.nntp.NNTPSSLStore    |   0
 .../org.apache.javamail.store.nntp.NNTPStore       |   0
 .../org.apache.javamail.store.pop3.POP3SSLStore    |   0
 .../org.apache.javamail.store.pop3.POP3Store       |   0
 ...apache.javamail.transport.nntp.NNTPSSLTransport |   0
 ...rg.apache.javamail.transport.nntp.NNTPTransport |   0
 ...apache.javamail.transport.smtp.SMTPSSLTransport |   0
 ...rg.apache.javamail.transport.smtp.SMTPTransport |   0
 .../geronimo-mail_2.1_provider/src/site/site.xml   |   0
 .../geronimo/mail/handlers/AbstractHandler.java    |   0
 .../geronimo/mail/issues/GERONIMO6480Test.java     |   0
 .../apache/geronimo/mail/issues/IssuesTest.java    |   0
 .../mail/store/imap/AuthenticationTest.java        |   0
 .../geronimo/mail/store/imap/IMAPStoreTest.java    |   0
 .../imap/connection/IMAPBodyStructureTest.java     |   0
 .../geronimo/mail/store/pop3/POP3StoreTest.java    |   0
 .../mail/testserver/AbstractProtocolTest.java      |   0
 .../geronimo/mail/testserver/ApopCmdHandler.java   |   0
 .../geronimo/mail/testserver/MailServer.java       |   0
 .../testserver/RefinedCoreCmdHandlerLoader.java    |   0
 .../mail/testserver/RefinedJMXHandlersLoader.java  |   0
 .../RefinedSmtpCoreCmdHandlerLoader.java           |   0
 .../mail/transport/smtp/SMTPTransportTest.java     |   0
 .../src/test/resources/dummykeystore.jks           | Bin
 .../test/resources/imap/multipart.bodystructure    |   0
 .../src/test/resources/messages/multipart.msg      |   0
 .../src/test/resources/messages/simple.msg         |   0
 .../src/test/resources/pdf-test.pdf                | Bin
 .../pom.xml                                        |   0
 .../src/site/apt/privacy-policy.apt                |   0
 .../src/site/markdown/index.md                     |   0
 .../src/site/site.xml                              |   0
 .../tck.adoc                                       |   0
 .../pom.xml                                        |   0
 .../src/main/java/jakarta/mail/Address.java        |   0
 .../mail/AuthenticationFailedException.java        |   0
 .../src/main/java/jakarta/mail/Authenticator.java  |   0
 .../src/main/java/jakarta/mail/BodyPart.java       |   0
 .../src/main/java/jakarta/mail/EncodingAware.java  |   0
 .../src/main/java/jakarta/mail/EventQueue.java     |   0
 .../src/main/java/jakarta/mail/FetchProfile.java   |   0
 .../src/main/java/jakarta/mail/Flags.java          |   0
 .../src/main/java/jakarta/mail/Folder.java         |   0
 .../java/jakarta/mail/FolderClosedException.java   |   0
 .../java/jakarta/mail/FolderNotFoundException.java |   0
 .../src/main/java/jakarta/mail/Header.java         |   0
 .../java/jakarta/mail/IllegalWriteException.java   |   0
 .../java/jakarta/mail/MailSessionDefinition.java   |   0
 .../java/jakarta/mail/MailSessionDefinitions.java  |   0
 .../src/main/java/jakarta/mail/Message.java        |   0
 .../src/main/java/jakarta/mail/MessageAware.java   |   0
 .../src/main/java/jakarta/mail/MessageContext.java |   0
 .../java/jakarta/mail/MessageRemovedException.java |   0
 .../main/java/jakarta/mail/MessagingException.java |   0
 .../jakarta/mail/MethodNotSupportedException.java  |   0
 .../src/main/java/jakarta/mail/Multipart.java      |   0
 .../java/jakarta/mail/MultipartDataSource.java     |   0
 .../java/jakarta/mail/NoSuchProviderException.java |   0
 .../src/main/java/jakarta/mail/Part.java           |   0
 .../java/jakarta/mail/PasswordAuthentication.java  |   0
 .../src/main/java/jakarta/mail/Provider.java       |   0
 .../src/main/java/jakarta/mail/Quota.java          |   0
 .../main/java/jakarta/mail/QuotaAwareStore.java    |   0
 .../java/jakarta/mail/ReadOnlyFolderException.java |   0
 .../java/jakarta/mail/SendFailedException.java     |   0
 .../src/main/java/jakarta/mail/Service.java        |   0
 .../src/main/java/jakarta/mail/Session.java        |   0
 .../src/main/java/jakarta/mail/Store.java          |   0
 .../java/jakarta/mail/StoreClosedException.java    |   0
 .../src/main/java/jakarta/mail/Transport.java      |   0
 .../src/main/java/jakarta/mail/UIDFolder.java      |   0
 .../src/main/java/jakarta/mail/URLName.java        |   0
 .../java/jakarta/mail/event/ConnectionAdapter.java |   0
 .../java/jakarta/mail/event/ConnectionEvent.java   |   0
 .../jakarta/mail/event/ConnectionListener.java     |   0
 .../java/jakarta/mail/event/FolderAdapter.java     |   0
 .../main/java/jakarta/mail/event/FolderEvent.java  |   0
 .../java/jakarta/mail/event/FolderListener.java    |   0
 .../main/java/jakarta/mail/event/MailEvent.java    |   0
 .../jakarta/mail/event/MessageChangedEvent.java    |   0
 .../jakarta/mail/event/MessageChangedListener.java |   0
 .../jakarta/mail/event/MessageCountAdapter.java    |   0
 .../java/jakarta/mail/event/MessageCountEvent.java |   0
 .../jakarta/mail/event/MessageCountListener.java   |   0
 .../main/java/jakarta/mail/event/StoreEvent.java   |   0
 .../java/jakarta/mail/event/StoreListener.java     |   0
 .../java/jakarta/mail/event/TransportAdapter.java  |   0
 .../java/jakarta/mail/event/TransportEvent.java    |   0
 .../java/jakarta/mail/event/TransportListener.java |   0
 .../jakarta/mail/internet/AddressException.java    |   0
 .../java/jakarta/mail/internet/AddressParser.java  |   0
 .../jakarta/mail/internet/ContentDisposition.java  |   0
 .../java/jakarta/mail/internet/ContentType.java    |   0
 .../jakarta/mail/internet/HeaderTokenizer.java     |   0
 .../jakarta/mail/internet/InternetAddress.java     |   0
 .../jakarta/mail/internet/InternetHeaders.java     |   0
 .../java/jakarta/mail/internet/MailDateFormat.java |   0
 .../java/jakarta/mail/internet/MimeBodyPart.java   |   0
 .../java/jakarta/mail/internet/MimeMessage.java    |   0
 .../java/jakarta/mail/internet/MimeMultipart.java  |   0
 .../main/java/jakarta/mail/internet/MimePart.java  |   0
 .../jakarta/mail/internet/MimePartDataSource.java  |   0
 .../java/jakarta/mail/internet/MimeUtility.java    |   0
 .../java/jakarta/mail/internet/NewsAddress.java    |   0
 .../java/jakarta/mail/internet/ParameterList.java  |   0
 .../java/jakarta/mail/internet/ParseException.java |   0
 .../mail/internet/PreencodedMimeBodyPart.java      |   0
 .../jakarta/mail/internet/SharedInputStream.java   |   0
 .../jakarta/mail/search/AddressStringTerm.java     |   0
 .../main/java/jakarta/mail/search/AddressTerm.java |   0
 .../src/main/java/jakarta/mail/search/AndTerm.java |   0
 .../main/java/jakarta/mail/search/BodyTerm.java    |   0
 .../java/jakarta/mail/search/ComparisonTerm.java   |   0
 .../main/java/jakarta/mail/search/DateTerm.java    |   0
 .../main/java/jakarta/mail/search/FlagTerm.java    |   0
 .../java/jakarta/mail/search/FromStringTerm.java   |   0
 .../main/java/jakarta/mail/search/FromTerm.java    |   0
 .../main/java/jakarta/mail/search/HeaderTerm.java  |   0
 .../jakarta/mail/search/IntegerComparisonTerm.java |   0
 .../java/jakarta/mail/search/MessageIDTerm.java    |   0
 .../jakarta/mail/search/MessageNumberTerm.java     |   0
 .../src/main/java/jakarta/mail/search/NotTerm.java |   0
 .../src/main/java/jakarta/mail/search/OrTerm.java  |   0
 .../java/jakarta/mail/search/ReceivedDateTerm.java |   0
 .../jakarta/mail/search/RecipientStringTerm.java   |   0
 .../java/jakarta/mail/search/RecipientTerm.java    |   0
 .../java/jakarta/mail/search/SearchException.java  |   0
 .../main/java/jakarta/mail/search/SearchTerm.java  |   0
 .../java/jakarta/mail/search/SentDateTerm.java     |   0
 .../main/java/jakarta/mail/search/SizeTerm.java    |   0
 .../main/java/jakarta/mail/search/StringTerm.java  |   0
 .../main/java/jakarta/mail/search/SubjectTerm.java |   0
 .../jakarta/mail/util/ByteArrayDataSource.java     |   0
 .../mail/util/SharedByteArrayInputStream.java      |   0
 .../jakarta/mail/util/SharedFileInputStream.java   |   0
 .../java/org/apache/geronimo/mail/Activator.java   |   0
 .../mail/MailProviderBundleTrackerCustomizer.java  |   0
 .../apache/geronimo/mail/MailProviderRegistry.java |   0
 .../apache/geronimo/mail/handlers/HtmlHandler.java |   0
 .../geronimo/mail/handlers/MessageHandler.java     |   0
 .../geronimo/mail/handlers/MultipartHandler.java   |   0
 .../apache/geronimo/mail/handlers/TextHandler.java |   0
 .../apache/geronimo/mail/handlers/XMLHandler.java  |   0
 .../org/apache/geronimo/mail/util/ASCIIUtil.java   |   0
 .../java/org/apache/geronimo/mail/util/Base64.java |   0
 .../geronimo/mail/util/Base64DecoderStream.java    |   0
 .../apache/geronimo/mail/util/Base64Encoder.java   |   0
 .../geronimo/mail/util/Base64EncoderStream.java    |   0
 .../org/apache/geronimo/mail/util/Encoder.java     |   0
 .../java/org/apache/geronimo/mail/util/Hex.java    |   0
 .../org/apache/geronimo/mail/util/HexEncoder.java  |   0
 .../apache/geronimo/mail/util/QuotedPrintable.java |   0
 .../mail/util/QuotedPrintableDecoderStream.java    |   0
 .../geronimo/mail/util/QuotedPrintableEncoder.java |   0
 .../mail/util/QuotedPrintableEncoderStream.java    |   0
 .../apache/geronimo/mail/util/RFC2231Encoder.java  |   0
 .../org/apache/geronimo/mail/util/SessionUtil.java |   0
 .../mail/util/StringBufferOutputStream.java        |   0
 .../apache/geronimo/mail/util/UUDecoderStream.java |   0
 .../org/apache/geronimo/mail/util/UUEncode.java    |   0
 .../org/apache/geronimo/mail/util/UUEncoder.java   |   0
 .../apache/geronimo/mail/util/UUEncoderStream.java |   0
 .../java/org/apache/geronimo/mail/util/XText.java  |   0
 .../apache/geronimo/mail/util/XTextEncoder.java    |   0
 .../main/resources/META-INF/default.address.map    |   0
 .../main/resources/META-INF/javamail.charset.map   |   0
 .../src/main/resources/META-INF/mailcap            |   0
 .../providers/org.apache.mail.handlers.HtmlHandler |   0
 .../org.apache.mail.handlers.MessageHandler        |   0
 .../org.apache.mail.handlers.MultipartHandler      |   0
 .../providers/org.apache.mail.handlers.TextHandler |   0
 .../providers/org.apache.mail.handlers.XMLHandler  |   0
 .../src/test/java/jakarta/mail/AllTests.java       |   0
 .../src/test/java/jakarta/mail/EventQueueTest.java |   0
 .../src/test/java/jakarta/mail/FlagsTest.java      |   0
 .../src/test/java/jakarta/mail/HeaderTest.java     |   0
 .../test/java/jakarta/mail/MessageContextTest.java |   0
 .../java/jakarta/mail/MessagingExceptionTest.java  |   0
 .../jakarta/mail/PasswordAuthenticationTest.java   |   0
 .../src/test/java/jakarta/mail/QuotaTest.java      |   0
 .../src/test/java/jakarta/mail/SessionTest.java    |   0
 .../src/test/java/jakarta/mail/SimpleFolder.java   |   0
 .../test/java/jakarta/mail/SimpleTextMessage.java  |   0
 .../src/test/java/jakarta/mail/TestData.java       |   0
 .../src/test/java/jakarta/mail/URLNameTest.java    |   0
 .../java/jakarta/mail/event/AllEventTests.java     |   0
 .../jakarta/mail/event/ConnectionEventTest.java    |   0
 .../java/jakarta/mail/event/FolderEventTest.java   |   0
 .../mail/event/MessageChangedEventTest.java        |   0
 .../jakarta/mail/event/MessageCountEventTest.java  |   0
 .../java/jakarta/mail/event/StoreEventTest.java    |   0
 .../jakarta/mail/event/TransportEventTest.java     |   0
 .../jakarta/mail/internet/AllInternetTests.java    |   0
 .../mail/internet/ContentDispositionTest.java      |   0
 .../jakarta/mail/internet/ContentTypeTest.java     |   0
 .../jakarta/mail/internet/HeaderTokenizerTest.java |   0
 .../jakarta/mail/internet/InternetAddressTest.java |   0
 .../jakarta/mail/internet/InternetHeadersTest.java |   0
 .../jakarta/mail/internet/MailDateFormatTest.java  |   0
 .../jakarta/mail/internet/MimeBodyPartTest.java    |   0
 .../jakarta/mail/internet/MimeMessageTest.java     |   0
 .../jakarta/mail/internet/MimeMultipartTest.java   |   0
 .../test/java/jakarta/mail/internet/MimeTest.java  |   0
 .../jakarta/mail/internet/MimeUtilityTest.java     |   0
 .../jakarta/mail/internet/NewsAddressTest.java     |   0
 .../jakarta/mail/internet/ParameterListTest.java   |   0
 .../mail/internet/PreencodedMimeBodyPartTest.java  |   0
 .../jakarta/mail/util/ByteArrayDataSourceTest.java |   0
 .../mail/util/SharedByteArrayInputStreamTest.java  |   0
 .../mail/util/SharedFileInputStreamTest.java       |   0
 .../src/test/resources/multipart_msg_empty.eml     |   0
 .../multipart_msg_missing_boundary_param.eml       |   0
 .../multipart_msg_missing_end_boundary.eml         |   0
 .../src/test/resources/multipart_msg_normal.eml    |   0
 .../multipart_msg_wrong_boundary_param.eml         |   0
 .../src/test/resources/test.dat                    |   0
 .../src/test/resources/wmtom.bin                   |   0
 360 files changed, 267 deletions(-)

diff --git a/geronimo-mail_2.1/LICENSE b/LICENSE
similarity index 100%
rename from geronimo-mail_2.1/LICENSE
rename to LICENSE
diff --git a/geronimo-mail_2.1/NOTICE b/NOTICE
similarity index 100%
rename from geronimo-mail_2.1/NOTICE
rename to NOTICE
diff --git a/geronimo-jakartamail_2.1_spec/LICENSE b/geronimo-jakartamail_2.1_spec/LICENSE
deleted file mode 100644
index 0b3778b..0000000
--- a/geronimo-jakartamail_2.1_spec/LICENSE
+++ /dev/null
@@ -1,257 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-#########################################################################
-## ADDITIONAL LICENSES                                                 ##
-#########################################################################
-
-The XMLSchema.dtd included in this project was developed by the
-W3C Consortium (http://www.w3c.org/).
-Use of the source code, thus licensed, and the resultant binary are
-subject to the terms and conditions of the following license.
-
-W3C� SOFTWARE NOTICE AND LICENSE
-Copyright � 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, Institut National de Recherche en Informatique et en Automatique,
-Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
-
-This W3C work (including software, documents, or other related items) is
-being provided by the copyright holders under the following license. By
-obtaining, using and/or copying this work, you (the licensee) agree that you
-have read, understood, and will comply with the following terms and
-conditions:
-
-Permission to use, copy, modify, and distribute this software and its
-documentation, with or without modification,  for any purpose and without
-fee or royalty is hereby granted, provided that you include the following on
-ALL copies of the software and documentation or portions thereof, including
-modifications, that you make:
-
-   1. The full text of this NOTICE in a location viewable to users of the
-         redistributed or derivative work.
-   2. Any pre-existing intellectual property disclaimers, notices, or terms
-         and conditions. If none exist, a short notice of the following form
-         (hypertext is preferred, text is permitted) should be used within
-         the body of any redistributed or derivative code: "Copyright �
-         [$date-of-software] World Wide Web Consortium, (Massachusetts Institute
-         of Technology, Institut National de Recherche en Informatique et en
-         Automatique, Keio University). All Rights Reserved.
-         http://www.w3.org/Consortium/Legal/"
-   3. Notice of any changes or modifications to the W3C files, including the
-         date changes were made. (We recommend you provide URIs to the location
-         from which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
-NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
-THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or
-publicity pertaining to the software without specific, written prior permission.
-Title to copyright in this software and any associated documentation will at all
-times remain with copyright holders.
diff --git a/geronimo-jakartamail_2.1_spec/NOTICE b/geronimo-jakartamail_2.1_spec/NOTICE
deleted file mode 100644
index c209240..0000000
--- a/geronimo-jakartamail_2.1_spec/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Geronimo
-Copyright 2003-2018 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/geronimo-mail_2.1/.travis.yml b/geronimo-mail_2.1/.travis.yml
deleted file mode 100644
index fde4d4a..0000000
--- a/geronimo-mail_2.1/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: java
-
-jdk:
-  - oraclejdk8
-  
diff --git a/geronimo-mail_2.1/.gitignore b/geronimo-mail_2.1_impl/.gitignore
similarity index 100%
rename from geronimo-mail_2.1/.gitignore
rename to geronimo-mail_2.1_impl/.gitignore
diff --git a/geronimo-mail_2.1/README.txt b/geronimo-mail_2.1_impl/README.txt
similarity index 100%
rename from geronimo-mail_2.1/README.txt
rename to geronimo-mail_2.1_impl/README.txt
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_mail/pom.xml b/geronimo-mail_2.1_impl/geronimo-mail_2.1_mail/pom.xml
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_mail/pom.xml
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_mail/pom.xml
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_mail/src/site/site.xml b/geronimo-mail_2.1_impl/geronimo-mail_2.1_mail/src/site/site.xml
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_mail/src/site/site.xml
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_mail/src/site/site.xml
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/pom.xml b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/pom.xml
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/pom.xml
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/pom.xml
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/AuthenticatorFactory.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/AuthenticatorFactory.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/AuthenticatorFactory.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/AuthenticatorFactory.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/ClientAuthenticator.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/ClientAuthenticator.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/ClientAuthenticator.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/ClientAuthenticator.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/CramMD5Authenticator.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/CramMD5Authenticator.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/CramMD5Authenticator.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/CramMD5Authenticator.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/DigestMD5Authenticator.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/DigestMD5Authenticator.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/DigestMD5Authenticator.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/DigestMD5Authenticator.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/LoginAuthenticator.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/LoginAuthenticator.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/LoginAuthenticator.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/LoginAuthenticator.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/PlainAuthenticator.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/PlainAuthenticator.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/PlainAuthenticator.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/PlainAuthenticator.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/SASLAuthenticator.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/SASLAuthenticator.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/SASLAuthenticator.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/SASLAuthenticator.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/XOAUTH2Authenticator.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/XOAUTH2Authenticator.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/XOAUTH2Authenticator.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/authentication/XOAUTH2Authenticator.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/AbstractImageHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/AbstractImageHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/AbstractImageHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/AbstractImageHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/AbstractTextHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/AbstractTextHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/AbstractTextHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/AbstractTextHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/ImageGifHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/ImageGifHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/ImageGifHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/ImageGifHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/ImageJpegHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/ImageJpegHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/ImageJpegHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/ImageJpegHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/MultipartHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/MultipartHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/MultipartHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/MultipartHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/RFC822MessageHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/RFC822MessageHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/RFC822MessageHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/RFC822MessageHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextHtmlHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextHtmlHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextHtmlHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextHtmlHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextPlainHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextPlainHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextPlainHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextPlainHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextXmlHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextXmlHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextXmlHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/handlers/TextXmlHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/ACL.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/ACL.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/ACL.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/ACL.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPAttachedMessage.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPAttachedMessage.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPAttachedMessage.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPAttachedMessage.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPFolder.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPFolder.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPFolder.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPFolder.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMessage.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMessage.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMessage.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMessage.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMimeBodyPart.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMimeBodyPart.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMimeBodyPart.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMimeBodyPart.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMultipartDataSource.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMultipartDataSource.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMultipartDataSource.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMultipartDataSource.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPNamespaceFolder.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPNamespaceFolder.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPNamespaceFolder.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPNamespaceFolder.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPRootFolder.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPRootFolder.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPRootFolder.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPRootFolder.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPSSLStore.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPSSLStore.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPSSLStore.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPSSLStore.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPStore.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPStore.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPStore.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPStore.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/Rights.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/Rights.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/Rights.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/Rights.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPACLResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPACLResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPACLResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPACLResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBody.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBody.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBody.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBody.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodySection.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodySection.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodySection.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodySection.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodyStructure.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodyStructure.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodyStructure.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodyStructure.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPCapabilityResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPCapabilityResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPCapabilityResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPCapabilityResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPCommand.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPCommand.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPCommand.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPCommand.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPConnection.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPConnection.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPConnection.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPConnection.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPConnectionPool.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPConnectionPool.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPConnectionPool.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPConnectionPool.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPContinuationResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPContinuationResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPContinuationResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPContinuationResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPDateFormat.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPDateFormat.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPDateFormat.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPDateFormat.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPEnvelope.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPEnvelope.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPEnvelope.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPEnvelope.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchBodyPart.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchBodyPart.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchBodyPart.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchBodyPart.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchDataItem.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchDataItem.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchDataItem.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchDataItem.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFetchResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFlags.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFlags.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFlags.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFlags.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFlagsResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFlagsResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFlagsResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPFlagsResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPInternalDate.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPInternalDate.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPInternalDate.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPInternalDate.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPInternetHeader.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPInternetHeader.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPInternetHeader.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPInternetHeader.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPListResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPListResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPListResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPListResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPListRightsResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPListRightsResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPListRightsResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPListRightsResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMailboxResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMailboxResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMailboxResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMailboxResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMailboxStatus.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMailboxStatus.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMailboxStatus.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMailboxStatus.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMessageSize.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMessageSize.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMessageSize.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMessageSize.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMessageText.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMessageText.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMessageText.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMessageText.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMyRightsResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMyRightsResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMyRightsResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPMyRightsResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPNamespace.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPNamespace.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPNamespace.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPNamespace.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPNamespaceResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPNamespaceResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPNamespaceResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPNamespaceResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPOkResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPOkResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPOkResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPOkResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPPermanentFlagsResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPPermanentFlagsResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPPermanentFlagsResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPPermanentFlagsResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPQuotaResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPQuotaResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPQuotaResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPQuotaResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPQuotaRootResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPQuotaRootResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPQuotaRootResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPQuotaRootResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseBuffer.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseBuffer.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseBuffer.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseBuffer.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseStream.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseStream.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseStream.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseStream.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseTokenizer.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseTokenizer.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseTokenizer.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPResponseTokenizer.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSearchDateFormat.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSearchDateFormat.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSearchDateFormat.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSearchDateFormat.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSearchResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSearchResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSearchResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSearchResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPServerStatusResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPServerStatusResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPServerStatusResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPServerStatusResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSizeResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSizeResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSizeResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPSizeResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPStatusResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPStatusResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPStatusResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPStatusResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPTaggedResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPTaggedResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPTaggedResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPTaggedResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUid.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUid.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUid.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUid.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUntaggedResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUntaggedResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUntaggedResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUntaggedResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUntaggedResponseHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUntaggedResponseHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUntaggedResponseHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/connection/IMAPUntaggedResponseHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPFolder.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPFolder.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPFolder.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPFolder.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPGroupFolder.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPGroupFolder.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPGroupFolder.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPGroupFolder.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPMessage.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPMessage.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPMessage.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPMessage.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPRootFolder.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPRootFolder.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPRootFolder.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPRootFolder.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPSSLStore.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPSSLStore.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPSSLStore.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPSSLStore.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPStore.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPStore.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPStore.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPStore.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrc.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrc.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrc.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrc.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrcFile.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrcFile.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrcFile.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrcFile.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrcGroup.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrcGroup.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrcGroup.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/NNTPNewsrcGroup.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/Range.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/Range.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/Range.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/Range.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/RangeList.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/RangeList.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/RangeList.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/newsrc/RangeList.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Constants.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Constants.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Constants.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Constants.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Folder.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Folder.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Folder.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Folder.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Message.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Message.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Message.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Message.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3RootFolder.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3RootFolder.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3RootFolder.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3RootFolder.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3SSLStore.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3SSLStore.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3SSLStore.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3SSLStore.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Store.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Store.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Store.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/POP3Store.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3Connection.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3Connection.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3Connection.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3Connection.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3ConnectionPool.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3ConnectionPool.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3ConnectionPool.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3ConnectionPool.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3ListResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3ListResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3ListResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3ListResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3Response.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3Response.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3Response.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3Response.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3StatusResponse.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3StatusResponse.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3StatusResponse.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/pop3/connection/POP3StatusResponse.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/NullTransport.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/NullTransport.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/NullTransport.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/NullTransport.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPConnection.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPConnection.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPConnection.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPConnection.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPReply.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPReply.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPReply.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPReply.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPSSLTransport.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPSSLTransport.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPSSLTransport.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPSSLTransport.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPTransport.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPTransport.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPTransport.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/NNTPTransport.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/StringListInputStream.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/StringListInputStream.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/StringListInputStream.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/nntp/StringListInputStream.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/MalformedSMTPReplyException.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/MalformedSMTPReplyException.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/MalformedSMTPReplyException.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/MalformedSMTPReplyException.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPAddressFailedException.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPAddressFailedException.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPAddressFailedException.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPAddressFailedException.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPAddressSucceededException.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPAddressSucceededException.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPAddressSucceededException.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPAddressSucceededException.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPConnection.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPConnection.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPConnection.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPConnection.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPMessage.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPMessage.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPMessage.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPMessage.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPReply.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPReply.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPReply.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPReply.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPSTransport.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPSTransport.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPSTransport.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPSTransport.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPSendFailedException.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPSendFailedException.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPSendFailedException.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPSendFailedException.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPTransport.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPTransport.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPTransport.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPTransport.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPTransportException.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPTransportException.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPTransportException.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/transport/smtp/SMTPTransportException.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/CommandFailedException.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/CommandFailedException.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/CommandFailedException.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/CommandFailedException.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ConnectionException.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ConnectionException.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ConnectionException.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ConnectionException.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/CountingOutputStream.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/CountingOutputStream.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/CountingOutputStream.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/CountingOutputStream.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/InvalidCommandException.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/InvalidCommandException.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/InvalidCommandException.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/InvalidCommandException.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MIMEInputReader.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MIMEInputReader.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MIMEInputReader.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MIMEInputReader.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MIMEOutputStream.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MIMEOutputStream.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MIMEOutputStream.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MIMEOutputStream.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MailConnection.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MailConnection.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MailConnection.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MailConnection.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ProtocolProperties.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ProtocolProperties.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ProtocolProperties.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ProtocolProperties.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ResponseFormatException.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ResponseFormatException.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ResponseFormatException.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/ResponseFormatException.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/TraceInputStream.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/TraceInputStream.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/TraceInputStream.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/TraceInputStream.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/TraceOutputStream.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/TraceOutputStream.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/TraceOutputStream.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/TraceOutputStream.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/META-INF/javamail.default.address.map b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/META-INF/javamail.default.address.map
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/META-INF/javamail.default.address.map
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/META-INF/javamail.default.address.map
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/META-INF/javamail.default.providers b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/META-INF/javamail.default.providers
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/META-INF/javamail.default.providers
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/META-INF/javamail.default.providers
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/META-INF/mailcap b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/META-INF/mailcap
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/META-INF/mailcap
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/META-INF/mailcap
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.ImageGifHandler b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.ImageGifHandler
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.ImageGifHandler
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.ImageGifHandler
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.ImageJpegHandler b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.ImageJpegHandler
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.ImageJpegHandler
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.ImageJpegHandler
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.MultipartHandler b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.MultipartHandler
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.MultipartHandler
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.MultipartHandler
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.RFC822MessageHandler b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.RFC822MessageHandler
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.RFC822MessageHandler
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.RFC822MessageHandler
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextHtmlHandler b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextHtmlHandler
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextHtmlHandler
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextHtmlHandler
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextPlainHandler b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextPlainHandler
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextPlainHandler
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextPlainHandler
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextXmlHandler b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextXmlHandler
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextXmlHandler
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.handlers.TextXmlHandler
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.imap.IMAPSSSLStore b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.imap.IMAPSSSLStore
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.imap.IMAPSSSLStore
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.imap.IMAPSSSLStore
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.imap.IMAPStore b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.imap.IMAPStore
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.imap.IMAPStore
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.imap.IMAPStore
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.nntp.NNTPSSLStore b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.nntp.NNTPSSLStore
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.nntp.NNTPSSLStore
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.nntp.NNTPSSLStore
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.nntp.NNTPStore b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.nntp.NNTPStore
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.nntp.NNTPStore
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.nntp.NNTPStore
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.pop3.POP3SSLStore b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.pop3.POP3SSLStore
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.pop3.POP3SSLStore
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.pop3.POP3SSLStore
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.pop3.POP3Store b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.pop3.POP3Store
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.pop3.POP3Store
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.store.pop3.POP3Store
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.nntp.NNTPSSLTransport b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.nntp.NNTPSSLTransport
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.nntp.NNTPSSLTransport
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.nntp.NNTPSSLTransport
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.nntp.NNTPTransport b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.nntp.NNTPTransport
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.nntp.NNTPTransport
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.nntp.NNTPTransport
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.smtp.SMTPSSLTransport b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.smtp.SMTPSSLTransport
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.smtp.SMTPSSLTransport
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.smtp.SMTPSSLTransport
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.smtp.SMTPTransport b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.smtp.SMTPTransport
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.smtp.SMTPTransport
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/resources/OSGI-INF/providers/org.apache.javamail.transport.smtp.SMTPTransport
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/site/site.xml b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/site/site.xml
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/site/site.xml
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/site/site.xml
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/handlers/AbstractHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/handlers/AbstractHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/handlers/AbstractHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/handlers/AbstractHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/issues/GERONIMO6480Test.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/issues/GERONIMO6480Test.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/issues/GERONIMO6480Test.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/issues/GERONIMO6480Test.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/issues/IssuesTest.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/issues/IssuesTest.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/issues/IssuesTest.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/issues/IssuesTest.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/AuthenticationTest.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/AuthenticationTest.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/AuthenticationTest.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/AuthenticationTest.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/IMAPStoreTest.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/IMAPStoreTest.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/IMAPStoreTest.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/IMAPStoreTest.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodyStructureTest.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodyStructureTest.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodyStructureTest.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/imap/connection/IMAPBodyStructureTest.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/pop3/POP3StoreTest.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/pop3/POP3StoreTest.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/pop3/POP3StoreTest.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/store/pop3/POP3StoreTest.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/AbstractProtocolTest.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/AbstractProtocolTest.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/AbstractProtocolTest.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/AbstractProtocolTest.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/ApopCmdHandler.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/ApopCmdHandler.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/ApopCmdHandler.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/ApopCmdHandler.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/MailServer.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/MailServer.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/MailServer.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/MailServer.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedCoreCmdHandlerLoader.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedCoreCmdHandlerLoader.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedCoreCmdHandlerLoader.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedCoreCmdHandlerLoader.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedJMXHandlersLoader.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedJMXHandlersLoader.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedJMXHandlersLoader.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedJMXHandlersLoader.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedSmtpCoreCmdHandlerLoader.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedSmtpCoreCmdHandlerLoader.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedSmtpCoreCmdHandlerLoader.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/testserver/RefinedSmtpCoreCmdHandlerLoader.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/transport/smtp/SMTPTransportTest.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/transport/smtp/SMTPTransportTest.java
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/transport/smtp/SMTPTransportTest.java
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/java/org/apache/geronimo/mail/transport/smtp/SMTPTransportTest.java
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/resources/dummykeystore.jks b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/resources/dummykeystore.jks
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/resources/dummykeystore.jks
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/resources/dummykeystore.jks
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/resources/imap/multipart.bodystructure b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/resources/imap/multipart.bodystructure
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/resources/imap/multipart.bodystructure
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/resources/imap/multipart.bodystructure
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/resources/messages/multipart.msg b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/resources/messages/multipart.msg
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/resources/messages/multipart.msg
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/resources/messages/multipart.msg
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/resources/messages/simple.msg b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/resources/messages/simple.msg
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/resources/messages/simple.msg
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/resources/messages/simple.msg
diff --git a/geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/resources/pdf-test.pdf b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/resources/pdf-test.pdf
similarity index 100%
rename from geronimo-mail_2.1/geronimo-mail_2.1_provider/src/test/resources/pdf-test.pdf
rename to geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/test/resources/pdf-test.pdf
diff --git a/geronimo-mail_2.1/pom.xml b/geronimo-mail_2.1_impl/pom.xml
similarity index 100%
rename from geronimo-mail_2.1/pom.xml
rename to geronimo-mail_2.1_impl/pom.xml
diff --git a/geronimo-mail_2.1/src/site/apt/privacy-policy.apt b/geronimo-mail_2.1_impl/src/site/apt/privacy-policy.apt
similarity index 100%
rename from geronimo-mail_2.1/src/site/apt/privacy-policy.apt
rename to geronimo-mail_2.1_impl/src/site/apt/privacy-policy.apt
diff --git a/geronimo-mail_2.1/src/site/markdown/index.md b/geronimo-mail_2.1_impl/src/site/markdown/index.md
similarity index 100%
rename from geronimo-mail_2.1/src/site/markdown/index.md
rename to geronimo-mail_2.1_impl/src/site/markdown/index.md
diff --git a/geronimo-mail_2.1/src/site/site.xml b/geronimo-mail_2.1_impl/src/site/site.xml
similarity index 100%
rename from geronimo-mail_2.1/src/site/site.xml
rename to geronimo-mail_2.1_impl/src/site/site.xml
diff --git a/geronimo-mail_2.1/tck.adoc b/geronimo-mail_2.1_impl/tck.adoc
similarity index 100%
rename from geronimo-mail_2.1/tck.adoc
rename to geronimo-mail_2.1_impl/tck.adoc
diff --git a/geronimo-jakartamail_2.1_spec/pom.xml b/geronimo-mail_2.1_spec/pom.xml
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/pom.xml
rename to geronimo-mail_2.1_spec/pom.xml
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Address.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Address.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Address.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Address.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/AuthenticationFailedException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/AuthenticationFailedException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/AuthenticationFailedException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/AuthenticationFailedException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Authenticator.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Authenticator.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Authenticator.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Authenticator.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/BodyPart.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/BodyPart.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/BodyPart.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/BodyPart.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/EncodingAware.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/EncodingAware.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/EncodingAware.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/EncodingAware.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/EventQueue.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/EventQueue.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/EventQueue.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/EventQueue.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/FetchProfile.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/FetchProfile.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/FetchProfile.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/FetchProfile.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Flags.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Flags.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Flags.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Flags.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Folder.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Folder.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Folder.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Folder.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/FolderClosedException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/FolderClosedException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/FolderClosedException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/FolderClosedException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/FolderNotFoundException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/FolderNotFoundException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/FolderNotFoundException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/FolderNotFoundException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Header.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Header.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Header.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Header.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/IllegalWriteException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/IllegalWriteException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/IllegalWriteException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/IllegalWriteException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MailSessionDefinition.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MailSessionDefinition.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MailSessionDefinition.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MailSessionDefinition.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MailSessionDefinitions.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MailSessionDefinitions.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MailSessionDefinitions.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MailSessionDefinitions.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Message.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Message.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Message.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Message.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MessageAware.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MessageAware.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MessageAware.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MessageAware.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MessageContext.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MessageContext.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MessageContext.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MessageContext.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MessageRemovedException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MessageRemovedException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MessageRemovedException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MessageRemovedException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MessagingException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MessagingException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MessagingException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MessagingException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MethodNotSupportedException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MethodNotSupportedException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MethodNotSupportedException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MethodNotSupportedException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Multipart.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Multipart.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Multipart.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Multipart.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MultipartDataSource.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MultipartDataSource.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/MultipartDataSource.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/MultipartDataSource.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/NoSuchProviderException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/NoSuchProviderException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/NoSuchProviderException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/NoSuchProviderException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Part.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Part.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Part.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Part.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/PasswordAuthentication.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/PasswordAuthentication.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/PasswordAuthentication.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/PasswordAuthentication.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Provider.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Provider.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Provider.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Provider.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Quota.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Quota.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Quota.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Quota.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/QuotaAwareStore.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/QuotaAwareStore.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/QuotaAwareStore.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/QuotaAwareStore.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/ReadOnlyFolderException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/ReadOnlyFolderException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/ReadOnlyFolderException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/ReadOnlyFolderException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/SendFailedException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/SendFailedException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/SendFailedException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/SendFailedException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Service.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Service.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Service.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Service.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Session.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Session.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Session.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Session.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Store.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Store.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Store.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Store.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/StoreClosedException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/StoreClosedException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/StoreClosedException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/StoreClosedException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Transport.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Transport.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/Transport.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/Transport.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/UIDFolder.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/UIDFolder.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/UIDFolder.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/UIDFolder.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/URLName.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/URLName.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/URLName.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/URLName.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionAdapter.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionAdapter.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionAdapter.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionAdapter.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionEvent.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionEvent.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionEvent.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionEvent.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionListener.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionListener.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionListener.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/ConnectionListener.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/FolderAdapter.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/FolderAdapter.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/FolderAdapter.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/FolderAdapter.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/FolderEvent.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/FolderEvent.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/FolderEvent.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/FolderEvent.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/FolderListener.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/FolderListener.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/FolderListener.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/FolderListener.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MailEvent.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MailEvent.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MailEvent.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MailEvent.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MessageChangedEvent.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MessageChangedEvent.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MessageChangedEvent.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MessageChangedEvent.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MessageChangedListener.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MessageChangedListener.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MessageChangedListener.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MessageChangedListener.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountAdapter.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountAdapter.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountAdapter.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountAdapter.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountEvent.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountEvent.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountEvent.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountEvent.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountListener.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountListener.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountListener.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/MessageCountListener.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/StoreEvent.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/StoreEvent.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/StoreEvent.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/StoreEvent.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/StoreListener.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/StoreListener.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/StoreListener.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/StoreListener.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/TransportAdapter.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/TransportAdapter.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/TransportAdapter.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/TransportAdapter.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/TransportEvent.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/TransportEvent.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/TransportEvent.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/TransportEvent.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/TransportListener.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/TransportListener.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/event/TransportListener.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/event/TransportListener.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/AddressException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/AddressException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/AddressException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/AddressException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/AddressParser.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/AddressParser.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/AddressParser.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/AddressParser.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/ContentDisposition.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/ContentDisposition.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/ContentDisposition.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/ContentDisposition.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/ContentType.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/ContentType.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/ContentType.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/ContentType.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/HeaderTokenizer.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/HeaderTokenizer.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/HeaderTokenizer.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/HeaderTokenizer.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/InternetAddress.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/InternetAddress.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/InternetAddress.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/InternetAddress.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/InternetHeaders.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/InternetHeaders.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/InternetHeaders.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/InternetHeaders.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MailDateFormat.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MailDateFormat.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MailDateFormat.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MailDateFormat.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimeBodyPart.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimeBodyPart.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimeBodyPart.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimeBodyPart.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimeMessage.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimeMessage.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimeMessage.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimeMessage.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimeMultipart.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimeMultipart.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimeMultipart.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimeMultipart.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimePart.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimePart.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimePart.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimePart.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimePartDataSource.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimePartDataSource.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimePartDataSource.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimePartDataSource.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimeUtility.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimeUtility.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/MimeUtility.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/MimeUtility.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/NewsAddress.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/NewsAddress.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/NewsAddress.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/NewsAddress.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/ParameterList.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/ParameterList.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/ParameterList.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/ParameterList.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/ParseException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/ParseException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/ParseException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/ParseException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/PreencodedMimeBodyPart.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/PreencodedMimeBodyPart.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/PreencodedMimeBodyPart.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/PreencodedMimeBodyPart.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/SharedInputStream.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/SharedInputStream.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/internet/SharedInputStream.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/internet/SharedInputStream.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/AddressStringTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/AddressStringTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/AddressStringTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/AddressStringTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/AddressTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/AddressTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/AddressTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/AddressTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/AndTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/AndTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/AndTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/AndTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/BodyTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/BodyTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/BodyTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/BodyTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/ComparisonTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/ComparisonTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/ComparisonTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/ComparisonTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/DateTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/DateTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/DateTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/DateTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/FlagTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/FlagTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/FlagTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/FlagTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/FromStringTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/FromStringTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/FromStringTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/FromStringTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/FromTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/FromTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/FromTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/FromTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/HeaderTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/HeaderTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/HeaderTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/HeaderTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/IntegerComparisonTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/IntegerComparisonTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/IntegerComparisonTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/IntegerComparisonTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/MessageIDTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/MessageIDTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/MessageIDTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/MessageIDTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/MessageNumberTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/MessageNumberTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/MessageNumberTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/MessageNumberTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/NotTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/NotTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/NotTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/NotTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/OrTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/OrTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/OrTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/OrTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/ReceivedDateTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/ReceivedDateTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/ReceivedDateTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/ReceivedDateTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/RecipientStringTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/RecipientStringTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/RecipientStringTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/RecipientStringTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/RecipientTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/RecipientTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/RecipientTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/RecipientTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/SearchException.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/SearchException.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/SearchException.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/SearchException.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/SearchTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/SearchTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/SearchTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/SearchTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/SentDateTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/SentDateTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/SentDateTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/SentDateTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/SizeTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/SizeTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/SizeTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/SizeTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/StringTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/StringTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/StringTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/StringTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/SubjectTerm.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/SubjectTerm.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/search/SubjectTerm.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/search/SubjectTerm.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/util/ByteArrayDataSource.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/util/ByteArrayDataSource.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/util/ByteArrayDataSource.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/util/ByteArrayDataSource.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/util/SharedByteArrayInputStream.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/util/SharedByteArrayInputStream.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/util/SharedByteArrayInputStream.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/util/SharedByteArrayInputStream.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/util/SharedFileInputStream.java b/geronimo-mail_2.1_spec/src/main/java/jakarta/mail/util/SharedFileInputStream.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/jakarta/mail/util/SharedFileInputStream.java
rename to geronimo-mail_2.1_spec/src/main/java/jakarta/mail/util/SharedFileInputStream.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/Activator.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/Activator.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/Activator.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/Activator.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/MailProviderBundleTrackerCustomizer.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/MailProviderBundleTrackerCustomizer.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/MailProviderBundleTrackerCustomizer.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/MailProviderBundleTrackerCustomizer.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/MailProviderRegistry.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/MailProviderRegistry.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/MailProviderRegistry.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/MailProviderRegistry.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/HtmlHandler.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/HtmlHandler.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/HtmlHandler.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/HtmlHandler.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/MessageHandler.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/MessageHandler.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/MessageHandler.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/MessageHandler.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/MultipartHandler.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/MultipartHandler.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/MultipartHandler.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/MultipartHandler.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/TextHandler.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/TextHandler.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/TextHandler.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/TextHandler.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/XMLHandler.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/XMLHandler.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/XMLHandler.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/handlers/XMLHandler.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/ASCIIUtil.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/ASCIIUtil.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/ASCIIUtil.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/ASCIIUtil.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64DecoderStream.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64DecoderStream.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64DecoderStream.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64DecoderStream.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64Encoder.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64Encoder.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64Encoder.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64Encoder.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64EncoderStream.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64EncoderStream.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64EncoderStream.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Base64EncoderStream.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Encoder.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Encoder.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Encoder.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Encoder.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Hex.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Hex.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Hex.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/Hex.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/HexEncoder.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/HexEncoder.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/HexEncoder.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/HexEncoder.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintable.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintable.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintable.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintable.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableDecoderStream.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableDecoderStream.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableDecoderStream.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableDecoderStream.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableEncoder.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableEncoder.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableEncoder.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableEncoder.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableEncoderStream.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableEncoderStream.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableEncoderStream.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/QuotedPrintableEncoderStream.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/RFC2231Encoder.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/RFC2231Encoder.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/RFC2231Encoder.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/RFC2231Encoder.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/SessionUtil.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/SessionUtil.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/SessionUtil.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/SessionUtil.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/StringBufferOutputStream.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/StringBufferOutputStream.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/StringBufferOutputStream.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/StringBufferOutputStream.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUDecoderStream.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUDecoderStream.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUDecoderStream.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUDecoderStream.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncode.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncode.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncode.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncode.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncoder.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncoder.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncoder.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncoder.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncoderStream.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncoderStream.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncoderStream.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/UUEncoderStream.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/XText.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/XText.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/XText.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/XText.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/XTextEncoder.java b/geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/XTextEncoder.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/XTextEncoder.java
rename to geronimo-mail_2.1_spec/src/main/java/org/apache/geronimo/mail/util/XTextEncoder.java
diff --git a/geronimo-jakartamail_2.1_spec/src/main/resources/META-INF/default.address.map b/geronimo-mail_2.1_spec/src/main/resources/META-INF/default.address.map
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/resources/META-INF/default.address.map
rename to geronimo-mail_2.1_spec/src/main/resources/META-INF/default.address.map
diff --git a/geronimo-jakartamail_2.1_spec/src/main/resources/META-INF/javamail.charset.map b/geronimo-mail_2.1_spec/src/main/resources/META-INF/javamail.charset.map
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/resources/META-INF/javamail.charset.map
rename to geronimo-mail_2.1_spec/src/main/resources/META-INF/javamail.charset.map
diff --git a/geronimo-jakartamail_2.1_spec/src/main/resources/META-INF/mailcap b/geronimo-mail_2.1_spec/src/main/resources/META-INF/mailcap
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/resources/META-INF/mailcap
rename to geronimo-mail_2.1_spec/src/main/resources/META-INF/mailcap
diff --git a/geronimo-jakartamail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.HtmlHandler b/geronimo-mail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.HtmlHandler
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.HtmlHandler
rename to geronimo-mail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.HtmlHandler
diff --git a/geronimo-jakartamail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.MessageHandler b/geronimo-mail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.MessageHandler
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.MessageHandler
rename to geronimo-mail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.MessageHandler
diff --git a/geronimo-jakartamail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.MultipartHandler b/geronimo-mail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.MultipartHandler
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.MultipartHandler
rename to geronimo-mail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.MultipartHandler
diff --git a/geronimo-jakartamail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.TextHandler b/geronimo-mail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.TextHandler
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.TextHandler
rename to geronimo-mail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.TextHandler
diff --git a/geronimo-jakartamail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.XMLHandler b/geronimo-mail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.XMLHandler
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.XMLHandler
rename to geronimo-mail_2.1_spec/src/main/resources/OSGI-INF/providers/org.apache.mail.handlers.XMLHandler
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/AllTests.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/AllTests.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/AllTests.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/AllTests.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/EventQueueTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/EventQueueTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/EventQueueTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/EventQueueTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/FlagsTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/FlagsTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/FlagsTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/FlagsTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/HeaderTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/HeaderTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/HeaderTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/HeaderTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/MessageContextTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/MessageContextTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/MessageContextTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/MessageContextTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/MessagingExceptionTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/MessagingExceptionTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/MessagingExceptionTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/MessagingExceptionTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/PasswordAuthenticationTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/PasswordAuthenticationTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/PasswordAuthenticationTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/PasswordAuthenticationTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/QuotaTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/QuotaTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/QuotaTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/QuotaTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/SessionTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/SessionTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/SessionTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/SessionTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/SimpleFolder.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/SimpleFolder.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/SimpleFolder.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/SimpleFolder.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/SimpleTextMessage.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/SimpleTextMessage.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/SimpleTextMessage.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/SimpleTextMessage.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/TestData.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/TestData.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/TestData.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/TestData.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/URLNameTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/URLNameTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/URLNameTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/URLNameTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/AllEventTests.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/AllEventTests.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/AllEventTests.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/AllEventTests.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/ConnectionEventTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/ConnectionEventTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/ConnectionEventTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/ConnectionEventTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/FolderEventTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/FolderEventTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/FolderEventTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/FolderEventTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/MessageChangedEventTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/MessageChangedEventTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/MessageChangedEventTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/MessageChangedEventTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/MessageCountEventTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/MessageCountEventTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/MessageCountEventTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/MessageCountEventTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/StoreEventTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/StoreEventTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/StoreEventTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/StoreEventTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/TransportEventTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/TransportEventTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/event/TransportEventTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/event/TransportEventTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/AllInternetTests.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/AllInternetTests.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/AllInternetTests.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/AllInternetTests.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/ContentDispositionTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/ContentDispositionTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/ContentDispositionTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/ContentDispositionTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/ContentTypeTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/ContentTypeTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/ContentTypeTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/ContentTypeTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/HeaderTokenizerTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/HeaderTokenizerTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/HeaderTokenizerTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/HeaderTokenizerTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/InternetAddressTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/InternetAddressTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/InternetAddressTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/InternetAddressTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/InternetHeadersTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/InternetHeadersTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/InternetHeadersTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/InternetHeadersTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MailDateFormatTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MailDateFormatTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MailDateFormatTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MailDateFormatTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MimeBodyPartTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MimeBodyPartTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MimeBodyPartTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MimeBodyPartTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MimeMessageTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MimeMessageTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MimeMessageTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MimeMessageTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MimeMultipartTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MimeMultipartTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MimeMultipartTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MimeMultipartTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MimeTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MimeTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MimeTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MimeTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MimeUtilityTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MimeUtilityTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/MimeUtilityTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/MimeUtilityTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/NewsAddressTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/NewsAddressTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/NewsAddressTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/NewsAddressTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/ParameterListTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/ParameterListTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/ParameterListTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/ParameterListTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/PreencodedMimeBodyPartTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/PreencodedMimeBodyPartTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/internet/PreencodedMimeBodyPartTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/internet/PreencodedMimeBodyPartTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/util/ByteArrayDataSourceTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/util/ByteArrayDataSourceTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/util/ByteArrayDataSourceTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/util/ByteArrayDataSourceTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/util/SharedByteArrayInputStreamTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/util/SharedByteArrayInputStreamTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/util/SharedByteArrayInputStreamTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/util/SharedByteArrayInputStreamTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/util/SharedFileInputStreamTest.java b/geronimo-mail_2.1_spec/src/test/java/jakarta/mail/util/SharedFileInputStreamTest.java
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/java/jakarta/mail/util/SharedFileInputStreamTest.java
rename to geronimo-mail_2.1_spec/src/test/java/jakarta/mail/util/SharedFileInputStreamTest.java
diff --git a/geronimo-jakartamail_2.1_spec/src/test/resources/multipart_msg_empty.eml b/geronimo-mail_2.1_spec/src/test/resources/multipart_msg_empty.eml
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/resources/multipart_msg_empty.eml
rename to geronimo-mail_2.1_spec/src/test/resources/multipart_msg_empty.eml
diff --git a/geronimo-jakartamail_2.1_spec/src/test/resources/multipart_msg_missing_boundary_param.eml b/geronimo-mail_2.1_spec/src/test/resources/multipart_msg_missing_boundary_param.eml
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/resources/multipart_msg_missing_boundary_param.eml
rename to geronimo-mail_2.1_spec/src/test/resources/multipart_msg_missing_boundary_param.eml
diff --git a/geronimo-jakartamail_2.1_spec/src/test/resources/multipart_msg_missing_end_boundary.eml b/geronimo-mail_2.1_spec/src/test/resources/multipart_msg_missing_end_boundary.eml
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/resources/multipart_msg_missing_end_boundary.eml
rename to geronimo-mail_2.1_spec/src/test/resources/multipart_msg_missing_end_boundary.eml
diff --git a/geronimo-jakartamail_2.1_spec/src/test/resources/multipart_msg_normal.eml b/geronimo-mail_2.1_spec/src/test/resources/multipart_msg_normal.eml
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/resources/multipart_msg_normal.eml
rename to geronimo-mail_2.1_spec/src/test/resources/multipart_msg_normal.eml
diff --git a/geronimo-jakartamail_2.1_spec/src/test/resources/multipart_msg_wrong_boundary_param.eml b/geronimo-mail_2.1_spec/src/test/resources/multipart_msg_wrong_boundary_param.eml
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/resources/multipart_msg_wrong_boundary_param.eml
rename to geronimo-mail_2.1_spec/src/test/resources/multipart_msg_wrong_boundary_param.eml
diff --git a/geronimo-jakartamail_2.1_spec/src/test/resources/test.dat b/geronimo-mail_2.1_spec/src/test/resources/test.dat
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/resources/test.dat
rename to geronimo-mail_2.1_spec/src/test/resources/test.dat
diff --git a/geronimo-jakartamail_2.1_spec/src/test/resources/wmtom.bin b/geronimo-mail_2.1_spec/src/test/resources/wmtom.bin
similarity index 100%
rename from geronimo-jakartamail_2.1_spec/src/test/resources/wmtom.bin
rename to geronimo-mail_2.1_spec/src/test/resources/wmtom.bin