This is an automated email from the ASF dual-hosted git repository. aduprat pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 1155f53813e44b59e89095835f43ae42310dbdcc Merge: 6fb06d5 9dd2923 Author: Antoine Duprat <adup...@linagora.com> AuthorDate: Fri Apr 19 09:42:44 2019 +0200 Merge remote-tracking branch 'btellier/JAMES-2709' pom.xml | 17 +++ .../james/blob/export/api/FileExtension.java | 9 +- .../james/blob/export/api/FileExtensionTest.java | 40 +++++-- server/container/cli-integration/pom.xml | 6 + server/container/guice/blob-export-guice/pom.xml | 11 ++ .../apache/james/modules/BlobExportImplChoice.java | 3 +- .../james/modules/BlobExportMechanismModule.java | 8 +- .../modules/LinshareBlobExportMechanismModule.java | 47 ++++---- .../modules/BlobExportMechanismModuleTest.java | 11 +- .../james/modules/LinshareGuiceExtension.java | 58 ++++++++++ server/container/guice/memory-guice/pom.xml | 23 ++++ .../LinshareBlobExportMechanismProvidingTest.java | 38 +++--- .../memory-jmap-integration-testing/pom.xml | 6 + .../main/java/org/apache/james/utils/FakeSmtp.java | 23 ++-- third-party/linshare/pom.xml | 33 ++++++ .../linshare/LinshareBlobExportMechanism.java | 82 +++++++++++++ .../james/linshare/LinshareConfiguration.java | 17 ++- .../james/linshare/client/ReceivedShare.java | 2 +- .../apache/james/linshare/client/ShareRequest.java | 39 +++++-- .../java/org/apache/james/linshare/Linshare.java | 27 ++++- .../linshare/LinshareBlobExportMechanismTest.java | 127 +++++++++++++++++++++ .../james/linshare/LinshareConfigurationTest.java | 58 ++++++++-- .../apache/james/linshare/LinshareExtension.java | 22 ++-- .../james/linshare/client/LinshareAPITest.java | 46 +++++++- .../james/linshare/client/ShareRequestTest.java | 20 +++- .../src/test/resources/backend/conf/id_rsa | 27 ----- .../{ssl/id_rsa => backend/conf/id_rsa.pri} | 0 .../linshare/src/test/resources/smtp/Dockerfile | 3 - .../src/test/resources/smtp/conf/smtpd.conf | 14 --- third-party/linshare/src/test/resources/ssl/ca.pem | 28 ----- .../linshare/src/test/resources/ssl/id_rsa.pub | 1 - .../linshare/src/test/resources/ssl/linshare.key | 28 ----- .../linshare/src/test/resources/ssl/linshare.pem | 97 ---------------- third-party/spamassassin/pom.xml | 3 + 34 files changed, 659 insertions(+), 315 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org