#183: step one of reintegrating all GIT modules into the main repo

bbottema · Feb 3, 2019 · c4b9a8a · c4b9a8a
1 parent ae8e8c8
commit c4b9a8a
Show file tree

Hide file tree

Showing 97 changed files with 1 addition and 1 deletion.
diff --git a/.gitignore → modules/simple-java-mail/.gitignore b/.gitignore → modules/simple-java-mail/.gitignore
diff --git a/LICENSE-2.0.txt → modules/simple-java-mail/LICENSE-2.0.txt b/LICENSE-2.0.txt → modules/simple-java-mail/LICENSE-2.0.txt
diff --git a/NOTICE.txt → modules/simple-java-mail/NOTICE.txt b/NOTICE.txt → modules/simple-java-mail/NOTICE.txt
diff --git a/README.md → modules/simple-java-mail/README.md b/README.md → modules/simple-java-mail/README.md
diff --git a/RELEASE.txt → modules/simple-java-mail/RELEASE.txt b/RELEASE.txt → modules/simple-java-mail/RELEASE.txt
diff --git a/how to release.txt → modules/simple-java-mail/how to release.txt b/how to release.txt → modules/simple-java-mail/how to release.txt
diff --git a/pom.xml → modules/simple-java-mail/pom.xml b/pom.xml → modules/simple-java-mail/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
         <version>6.0.0.beta-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../../..</relativePath>
     </parent>
 
     <artifactId>simple-java-mail</artifactId>

diff --git a/src/assembly/standalone-cli-descriptor.xml → ...rc/assembly/standalone-cli-descriptor.xml b/src/assembly/standalone-cli-descriptor.xml → ...rc/assembly/standalone-cli-descriptor.xml
diff --git a/...rg/simplejavamail/cli/SimpleJavaMail.java → ...rg/simplejavamail/cli/SimpleJavaMail.java b/...rg/simplejavamail/cli/SimpleJavaMail.java → ...rg/simplejavamail/cli/SimpleJavaMail.java
diff --git a/...plejavamail/converter/EmailConverter.java → ...plejavamail/converter/EmailConverter.java b/...plejavamail/converter/EmailConverter.java → ...plejavamail/converter/EmailConverter.java
diff --git a/...il/converter/EmailConverterException.java → ...il/converter/EmailConverterException.java b/...il/converter/EmailConverterException.java → ...il/converter/EmailConverterException.java
diff --git a/...ternal/mimemessage/MimeMessageHelper.java → ...ternal/mimemessage/MimeMessageHelper.java b/...ternal/mimemessage/MimeMessageHelper.java → ...ternal/mimemessage/MimeMessageHelper.java
diff --git a/...imemessage/MimeMessageParseException.java → ...imemessage/MimeMessageParseException.java b/...imemessage/MimeMessageParseException.java → ...imemessage/MimeMessageParseException.java
diff --git a/...ternal/mimemessage/MimeMessageParser.java → ...ternal/mimemessage/MimeMessageParser.java b/...ternal/mimemessage/MimeMessageParser.java → ...ternal/mimemessage/MimeMessageParser.java
diff --git a/...rnal/mimemessage/MimeMessageProducer.java → ...rnal/mimemessage/MimeMessageProducer.java b/...rnal/mimemessage/MimeMessageProducer.java → ...rnal/mimemessage/MimeMessageProducer.java
diff --git a/...ssage/MimeMessageProducerAlternative.java → ...ssage/MimeMessageProducerAlternative.java b/...ssage/MimeMessageProducerAlternative.java → ...ssage/MimeMessageProducerAlternative.java
diff --git a/...imemessage/MimeMessageProducerHelper.java → ...imemessage/MimeMessageProducerHelper.java b/...imemessage/MimeMessageProducerHelper.java → ...imemessage/MimeMessageProducerHelper.java
diff --git a/...mimemessage/MimeMessageProducerMixed.java → ...mimemessage/MimeMessageProducerMixed.java b/...mimemessage/MimeMessageProducerMixed.java → ...mimemessage/MimeMessageProducerMixed.java
diff --git a/.../MimeMessageProducerMixedAlternative.java → .../MimeMessageProducerMixedAlternative.java b/.../MimeMessageProducerMixedAlternative.java → .../MimeMessageProducerMixedAlternative.java
diff --git a/...sage/MimeMessageProducerMixedRelated.java → ...sage/MimeMessageProducerMixedRelated.java b/...sage/MimeMessageProducerMixedRelated.java → ...sage/MimeMessageProducerMixedRelated.java
diff --git a/...ssageProducerMixedRelatedAlternative.java → ...ssageProducerMixedRelatedAlternative.java b/...ssageProducerMixedRelatedAlternative.java → ...ssageProducerMixedRelatedAlternative.java
diff --git a/...memessage/MimeMessageProducerRelated.java → ...memessage/MimeMessageProducerRelated.java b/...memessage/MimeMessageProducerRelated.java → ...memessage/MimeMessageProducerRelated.java
diff --git a/...imeMessageProducerRelatedAlternative.java → ...imeMessageProducerRelatedAlternative.java b/...imeMessageProducerRelatedAlternative.java → ...imeMessageProducerRelatedAlternative.java
diff --git a/...imemessage/MimeMessageProducerSimple.java → ...imemessage/MimeMessageProducerSimple.java b/...imemessage/MimeMessageProducerSimple.java → ...imemessage/MimeMessageProducerSimple.java
diff --git a/...internal/mimemessage/NamedDataSource.java → ...internal/mimemessage/NamedDataSource.java b/...internal/mimemessage/NamedDataSource.java → ...internal/mimemessage/NamedDataSource.java
diff --git a/...rg/simplejavamail/email/EmailBuilder.java → ...rg/simplejavamail/email/EmailBuilder.java b/...rg/simplejavamail/email/EmailBuilder.java → ...rg/simplejavamail/email/EmailBuilder.java
diff --git a/...vamail/email/internal/EmailException.java → ...vamail/email/internal/EmailException.java b/...vamail/email/internal/EmailException.java → ...vamail/email/internal/EmailException.java
diff --git a/.../internal/EmailPopulatingBuilderImpl.java → .../internal/EmailPopulatingBuilderImpl.java b/.../internal/EmailPopulatingBuilderImpl.java → .../internal/EmailPopulatingBuilderImpl.java
diff --git a/...il/internal/EmailStartingBuilderImpl.java → ...il/internal/EmailStartingBuilderImpl.java b/...il/internal/EmailStartingBuilderImpl.java → ...il/internal/EmailStartingBuilderImpl.java
diff --git a/...vamail/internal/modules/ModuleLoader.java → ...vamail/internal/modules/ModuleLoader.java b/...vamail/internal/modules/ModuleLoader.java → ...vamail/internal/modules/ModuleLoader.java
diff --git a/...ternal/modules/ModuleLoaderException.java → ...ternal/modules/ModuleLoaderException.java b/...ternal/modules/ModuleLoaderException.java → ...ternal/modules/ModuleLoaderException.java
diff --git a/.../simplejavamail/mailer/MailerBuilder.java → .../simplejavamail/mailer/MailerBuilder.java b/.../simplejavamail/mailer/MailerBuilder.java → .../simplejavamail/mailer/MailerBuilder.java
diff --git a/...mail/mailer/internal/MailerException.java → ...mail/mailer/internal/MailerException.java b/...mail/mailer/internal/MailerException.java → ...mail/mailer/internal/MailerException.java
diff --git a/...nternal/MailerFromSessionBuilderImpl.java → ...nternal/MailerFromSessionBuilderImpl.java b/...nternal/MailerFromSessionBuilderImpl.java → ...nternal/MailerFromSessionBuilderImpl.java
diff --git a/...er/internal/MailerGenericBuilderImpl.java → ...er/internal/MailerGenericBuilderImpl.java b/...er/internal/MailerGenericBuilderImpl.java → ...er/internal/MailerGenericBuilderImpl.java
diff --git a/...ejavamail/mailer/internal/MailerImpl.java → ...ejavamail/mailer/internal/MailerImpl.java b/...ejavamail/mailer/internal/MailerImpl.java → ...ejavamail/mailer/internal/MailerImpl.java
diff --git a/...er/internal/MailerRegularBuilderImpl.java → ...er/internal/MailerRegularBuilderImpl.java b/...er/internal/MailerRegularBuilderImpl.java → ...er/internal/MailerRegularBuilderImpl.java
diff --git a/...ailer/internal/OperationalConfigImpl.java → ...ailer/internal/OperationalConfigImpl.java b/...ailer/internal/OperationalConfigImpl.java → ...ailer/internal/OperationalConfigImpl.java
diff --git a/...mail/mailer/internal/ProxyConfigImpl.java → ...mail/mailer/internal/ProxyConfigImpl.java b/...mail/mailer/internal/ProxyConfigImpl.java → ...mail/mailer/internal/ProxyConfigImpl.java
diff --git a/...ail/mailer/internal/ServerConfigImpl.java → ...ail/mailer/internal/ServerConfigImpl.java b/...ail/mailer/internal/ServerConfigImpl.java → ...ail/mailer/internal/ServerConfigImpl.java
diff --git a/...rnal/mailsender/AsyncOperationHelper.java → ...rnal/mailsender/AsyncOperationHelper.java b/...rnal/mailsender/AsyncOperationHelper.java → ...rnal/mailsender/AsyncOperationHelper.java
diff --git a/...nternal/mailsender/AsyncResponseImpl.java → ...nternal/mailsender/AsyncResponseImpl.java b/...nternal/mailsender/AsyncResponseImpl.java → ...nternal/mailsender/AsyncResponseImpl.java
diff --git a/...ernal/mailsender/MailSenderException.java → ...ernal/mailsender/MailSenderException.java b/...ernal/mailsender/MailSenderException.java → ...ernal/mailsender/MailSenderException.java
diff --git a/...r/internal/mailsender/MailSenderImpl.java → ...r/internal/mailsender/MailSenderImpl.java b/...r/internal/mailsender/MailSenderImpl.java → ...r/internal/mailsender/MailSenderImpl.java
diff --git a/...nal/socks/AuthenticatingSocks5Bridge.java → ...nal/socks/AuthenticatingSocks5Bridge.java b/...nal/socks/AuthenticatingSocks5Bridge.java → ...nal/socks/AuthenticatingSocks5Bridge.java
diff --git a/...iler/internal/socks/SocksProxyConfig.java → ...iler/internal/socks/SocksProxyConfig.java b/...iler/internal/socks/SocksProxyConfig.java → ...iler/internal/socks/SocksProxyConfig.java
diff --git a/...r/internal/socks/common/Socks5Bridge.java → ...r/internal/socks/common/Socks5Bridge.java b/...r/internal/socks/common/Socks5Bridge.java → ...r/internal/socks/common/Socks5Bridge.java
diff --git a/...internal/socks/common/SocksException.java → ...internal/socks/common/SocksException.java b/...internal/socks/common/SocksException.java → ...internal/socks/common/SocksException.java
diff --git a/...rnal/socks/socks5client/KeyStoreInfo.java → ...rnal/socks/socks5client/KeyStoreInfo.java b/...rnal/socks/socks5client/KeyStoreInfo.java → ...rnal/socks/socks5client/KeyStoreInfo.java
diff --git a/.../socks/socks5client/ProxyCredentials.java → .../socks/socks5client/ProxyCredentials.java b/.../socks/socks5client/ProxyCredentials.java → .../socks/socks5client/ProxyCredentials.java
diff --git a/.../socks/socks5client/SSLConfiguration.java → .../socks/socks5client/SSLConfiguration.java b/.../socks/socks5client/SSLConfiguration.java → .../socks/socks5client/SSLConfiguration.java
diff --git a/...nternal/socks/socks5client/SSLSocks5.java → ...nternal/socks/socks5client/SSLSocks5.java b/...nternal/socks/socks5client/SSLSocks5.java → ...nternal/socks/socks5client/SSLSocks5.java
diff --git a/...r/internal/socks/socks5client/Socks5.java → ...r/internal/socks/socks5client/Socks5.java b/...r/internal/socks/socks5client/Socks5.java → ...r/internal/socks/socks5client/Socks5.java
diff --git a/...cks5client/SocksAuthenticationHelper.java → ...cks5client/SocksAuthenticationHelper.java b/...cks5client/SocksAuthenticationHelper.java → ...cks5client/SocksAuthenticationHelper.java
diff --git a/...ocks/socks5client/SocksCommandSender.java → ...ocks/socks5client/SocksCommandSender.java b/...ocks/socks5client/SocksCommandSender.java → ...ocks/socks5client/SocksCommandSender.java
diff --git a/...ernal/socks/socks5client/SocksSocket.java → ...ernal/socks/socks5client/SocksSocket.java b/...ernal/socks/socks5client/SocksSocket.java → ...ernal/socks/socks5client/SocksSocket.java
diff --git a/...s/socks5server/AnonymousSocks5Server.java → ...s/socks5server/AnonymousSocks5Server.java b/...s/socks5server/AnonymousSocks5Server.java → ...s/socks5server/AnonymousSocks5Server.java
diff --git a/...nal/socks/socks5server/Socks5Handler.java → ...nal/socks/socks5server/Socks5Handler.java b/...nal/socks/socks5server/Socks5Handler.java → ...nal/socks/socks5server/Socks5Handler.java
diff --git a/...rnal/socks/socks5server/SocksSession.java → ...rnal/socks/socks5server/SocksSession.java b/...rnal/socks/socks5server/SocksSession.java → ...rnal/socks/socks5server/SocksSession.java
diff --git a/...nal/socks/socks5server/io/SocketPipe.java → ...nal/socks/socks5server/io/SocketPipe.java b/...nal/socks/socks5server/io/SocketPipe.java → ...nal/socks/socks5server/io/SocketPipe.java
diff --git a/...nal/socks/socks5server/io/StreamPipe.java → ...nal/socks/socks5server/io/StreamPipe.java b/...nal/socks/socks5server/io/StreamPipe.java → ...nal/socks/socks5server/io/StreamPipe.java
diff --git a/...l/socks/socks5server/msg/AddressType.java → ...l/socks/socks5server/msg/AddressType.java b/...l/socks/socks5server/msg/AddressType.java → ...l/socks/socks5server/msg/AddressType.java
diff --git a/...ocks/socks5server/msg/CommandMessage.java → ...ocks/socks5server/msg/CommandMessage.java b/...ocks/socks5server/msg/CommandMessage.java → ...ocks/socks5server/msg/CommandMessage.java
diff --git a/...ks5server/msg/CommandResponseMessage.java → ...ks5server/msg/CommandResponseMessage.java b/...ks5server/msg/CommandResponseMessage.java → ...ks5server/msg/CommandResponseMessage.java
diff --git a/...ks5server/msg/MethodSelectionMessage.java → ...ks5server/msg/MethodSelectionMessage.java b/...ks5server/msg/MethodSelectionMessage.java → ...ks5server/msg/MethodSelectionMessage.java
diff --git a/...l/socks/socks5server/msg/ServerReply.java → ...l/socks/socks5server/msg/ServerReply.java b/...l/socks/socks5server/msg/ServerReply.java → ...l/socks/socks5server/msg/ServerReply.java
diff --git a/...server/msg/SocksServerReplyException.java → ...server/msg/SocksServerReplyException.java b/...server/msg/SocksServerReplyException.java → ...server/msg/SocksServerReplyException.java
diff --git a/...al/socks/socks5server/msg/StreamUtil.java → ...al/socks/socks5server/msg/StreamUtil.java b/...al/socks/socks5server/msg/StreamUtil.java → ...al/socks/socks5server/msg/StreamUtil.java
diff --git a/src/main/resources/log4j2.xml → ...e-java-mail/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml → ...e-java-mail/src/main/resources/log4j2.xml
diff --git a/src/test/java/demo/EmailTypesDemoApp.java → ...src/test/java/demo/EmailTypesDemoApp.java b/src/test/java/demo/EmailTypesDemoApp.java → ...src/test/java/demo/EmailTypesDemoApp.java
diff --git a/src/test/java/demo/FullEmailDemoApp.java → .../src/test/java/demo/FullEmailDemoApp.java b/src/test/java/demo/FullEmailDemoApp.java → .../src/test/java/demo/FullEmailDemoApp.java
diff --git a/src/test/java/demo/TestConnectionDemo.java → ...rc/test/java/demo/TestConnectionDemo.java b/src/test/java/demo/TestConnectionDemo.java → ...rc/test/java/demo/TestConnectionDemo.java
diff --git a/...mplejavamail/config/ConfigLoaderTest.java → ...mplejavamail/config/ConfigLoaderTest.java b/...mplejavamail/config/ConfigLoaderTest.java → ...mplejavamail/config/ConfigLoaderTest.java
diff --git a/...al/mimemessage/MimeMessageHelperTest.java → ...al/mimemessage/MimeMessageHelperTest.java b/...al/mimemessage/MimeMessageHelperTest.java → ...al/mimemessage/MimeMessageHelperTest.java
diff --git a/...rnal/mimemessage/NamedDataSourceTest.java → ...rnal/mimemessage/NamedDataSourceTest.java b/...rnal/mimemessage/NamedDataSourceTest.java → ...rnal/mimemessage/NamedDataSourceTest.java
diff --git a/...simplejavamail/email/EmailConfigTest.java → ...simplejavamail/email/EmailConfigTest.java b/...simplejavamail/email/EmailConfigTest.java → ...simplejavamail/email/EmailConfigTest.java
diff --git a/...ernal/EmailPopulatingBuilderImplTest.java → ...ernal/EmailPopulatingBuilderImplTest.java b/...ernal/EmailPopulatingBuilderImplTest.java → ...ernal/EmailPopulatingBuilderImplTest.java
diff --git a/...derUsingDefaultsFromPropertyFileTest.java → ...derUsingDefaultsFromPropertyFileTest.java b/...derUsingDefaultsFromPropertyFileTest.java → ...derUsingDefaultsFromPropertyFileTest.java
diff --git a/...ejavamail/internal/util/MiscUtilTest.java → ...ejavamail/internal/util/MiscUtilTest.java b/...ejavamail/internal/util/MiscUtilTest.java → ...ejavamail/internal/util/MiscUtilTest.java
diff --git a/...avamail/internal/util/StringUtilTest.java → ...avamail/internal/util/StringUtilTest.java b/...avamail/internal/util/StringUtilTest.java → ...avamail/internal/util/StringUtilTest.java
diff --git a/...simplejavamail/mailer/MailerLiveTest.java → ...simplejavamail/mailer/MailerLiveTest.java b/...simplejavamail/mailer/MailerLiveTest.java → ...simplejavamail/mailer/MailerLiveTest.java
diff --git a/...org/simplejavamail/mailer/MailerTest.java → ...org/simplejavamail/mailer/MailerTest.java b/...org/simplejavamail/mailer/MailerTest.java → ...org/simplejavamail/mailer/MailerTest.java
diff --git a/...nternal/MailerBuilderProxyConfigTest.java → ...nternal/MailerBuilderProxyConfigTest.java b/...nternal/MailerBuilderProxyConfigTest.java → ...nternal/MailerBuilderProxyConfigTest.java
diff --git a/...ail/mailer/internal/ServerConfigTest.java → ...ail/mailer/internal/ServerConfigTest.java b/...ail/mailer/internal/ServerConfigTest.java → ...ail/mailer/internal/ServerConfigTest.java
diff --git a/...r/internal/mailsender/MailSenderTest.java → ...r/internal/mailsender/MailSenderTest.java b/...r/internal/mailsender/MailSenderTest.java → ...r/internal/mailsender/MailSenderTest.java
diff --git a/...g/simplejavamail/util/TestDataHelper.java → ...g/simplejavamail/util/TestDataHelper.java b/...g/simplejavamail/util/TestDataHelper.java → ...g/simplejavamail/util/TestDataHelper.java
diff --git a/src/test/java/testutil/CalendarHelper.java → ...rc/test/java/testutil/CalendarHelper.java b/src/test/java/testutil/CalendarHelper.java → ...rc/test/java/testutil/CalendarHelper.java
diff --git a/src/test/java/testutil/EmailHelper.java → ...l/src/test/java/testutil/EmailHelper.java b/src/test/java/testutil/EmailHelper.java → ...l/src/test/java/testutil/EmailHelper.java
diff --git a/...va/testutil/testrules/SmtpServerRule.java → ...va/testutil/testrules/SmtpServerRule.java b/...va/testutil/testrules/SmtpServerRule.java → ...va/testutil/testrules/SmtpServerRule.java
diff --git a/...testutil/testrules/SmtpServerSupport.java → ...testutil/testrules/SmtpServerSupport.java b/...testutil/testrules/SmtpServerSupport.java → ...testutil/testrules/SmtpServerSupport.java
diff --git a/...va/testutil/testrules/TestSmtpServer.java → ...va/testutil/testrules/TestSmtpServer.java b/...va/testutil/testrules/TestSmtpServer.java → ...va/testutil/testrules/TestSmtpServer.java
diff --git a/src/test/resources/ignore.properties → ...mail/src/test/resources/ignore.properties b/src/test/resources/ignore.properties → ...mail/src/test/resources/ignore.properties
diff --git a/src/test/resources/log4j2.xml → ...e-java-mail/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml → ...e-java-mail/src/test/resources/log4j2.xml
diff --git a/src/test/resources/malformed.properties → ...l/src/test/resources/malformed.properties b/src/test/resources/malformed.properties → ...l/src/test/resources/malformed.properties
diff --git a/src/test/resources/simplejavamail.properties → .../test/resources/simplejavamail.properties b/src/test/resources/simplejavamail.properties → .../test/resources/simplejavamail.properties
diff --git a/...yto and attachment and embedded image.msg → ...yto and attachment and embedded image.msg b/...yto and attachment and embedded image.msg → ...yto and attachment and embedded image.msg
diff --git a/test.cmd → modules/simple-java-mail/test.cmd b/test.cmd → modules/simple-java-mail/test.cmd