You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2021/05/11 07:19:37 UTC
[james-project] branch smtp-conf-fix updated (bf921b2 -> 3183c1e)
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a change to branch smtp-conf-fix
in repository https://gitbox.apache.org/repos/asf/james-project.git.
discard bf921b2 JAMES-3579 adjust smtpserver.xml files in James code to adapt to the new conf behavior
discard cc57ead JAMES-3579 reject verifyIdentity param to true when authRequired is false in SMTP server configuration
discard b52c53a JAMES-3579 No need to assign authRequired twice
add 8c850d4 JAMES-3573 Allow specifying DC in Cassandra configuration
add 69ab5ea JAMES-1858 Docker: expose volumes used for persistence with volumes
add 62a2f5c JAMES-3567 S3: explicitly specify version for netty-codec-http
add 7f9e962 JAMES-3567 Distributed server should not rely on ActiveMQ
add 4c1e94d JAMES-3261 Maven is not required to run binary
add 5c627cc JAMES-3261 Add logback to the memory server command line
add f030dad JAMES-3261 ZIP packaging for the distributed server
add 8f37129 JAMES-3261 ZIP packaging for the cassandra guice server
add ee8769f JAMES-3261 Drop LDAP containers for Cassandra-Guice and the distributed server
add 0870b70 JAMES-3261 ZIP packaging for JPA Guice server
add 0ecad37 JAMES-3261 ZIP packaging for JPA SMTP Guice server
add 599303f JAMES-3261 Docker images should reuse the ZIPs
add 2e05490 JAMES-3261 ZIP packaging for the CLI
add 5e45ecf JAMES-3261 Link to sample configuration directories within the ZIPs
add 31e49a0 JAMES-3571 MimeMessageWrapper getSize was incorrect for empty messages
add c690e60 [UPGRADE] Adopt Apache Tika 1.26
add 0344fe8 JAMES-2330: Give ability to override AbstractConfigurableAsyncServer.buildSSLContext
add 71ecf36 [DOCUMENTATION] Update document - Manage James via the Command Line
add f9f3b22 JAMES-3467 Avoid loading all domains for auto-detection when auto-detection is off
add 793d39f JAMES-3467 Domain cache should include auto-detection
add f93cdfc JAMES-3467 Domain cache should be refreshed periodically under read load
add b8577d3 JAMES-2813 Add a missing log upon Migration
add 20ca538 JAMES-3575 Make message deletion slightly more reactive
add da19351 JAMES-3575 MessageIdManager::delete should be reactive
add 0763ff05 JAMES-3575 MessageIdMapper::setFlags can easily be reactive
add d464711 JAMES-3575 Rewrite StoreMessageIdManager::setFlags in a more reactive way
add 42fc513 JAMES-3575 Reactive single flag update for JMAP RFC-8621
add bde8a85 JAMES-3575 Reactive single message move for JMAP RFC-8621
add eb9bd9c JAMES-3575 [REFACTORING] Flatten EmailSubmissionSet for/yield
add c2ca11b JAMES-3575 Reactify EmailSubmission/set
add d7ab05c [REFACTORING] Remove deprecatedmethod in ReactorElasticSearchClient
add f66e853 JAMES-3078 Continuation Token signing was done on the Netty event loop thread
add a531c05 JAMES-3491 JMAP webSocket can be used to mix responses and state changes
add 5f5d4e5 JAMES-3574 Add a unit test for the LMTP protocol
add d47f0e9 JAMES-3574 Create a LMTP handler chain for executing the mailet container
add 071ffa9 JAMES-3574 Document LMTP default behaviour and mailetcontainer execution
add 075aea6 JAMES-3579 No need to assign authRequired twice
add d389ebf JAMES-3579 reject verifyIdentity param to true when authRequired is false in SMTP server configuration
add 3183c1e JAMES-3579 adjust smtpserver.xml files in James code to adapt to the new conf behavior
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (bf921b2)
\
N -- N -- N refs/heads/smtp-conf-fix (3183c1e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
CHANGELOG.md | 5 +
README.adoc | 4 +-
.../backends/cassandra/init/ClusterFactory.java | 2 +
.../init/configuration/ClusterConfiguration.java | 36 ++++-
.../backends/cassandra/migration/Migration.java | 4 +
.../configuration/ClusterConfigurationTest.java} | 42 ++---
.../backends/es/v7/ReactorElasticSearchClient.java | 5 -
dockerfiles/compilation/java-11/compile.sh | 27 +---
dockerfiles/run/docker-compose.yml | 2 +-
dockerfiles/run/guice/cassandra-ldap/Dockerfile | 43 -----
.../destination/conf/batchsizes.properties | 10 --
.../destination/conf/blob.properties | 62 --------
.../destination/conf/cassandra.properties | 39 -----
.../conf/deletedMessageVault.properties | 4 -
.../cassandra-ldap/destination/conf/dnsservice.xml | 27 ----
.../cassandra-ldap/destination/conf/domainlist.xml | 27 ----
.../destination/conf/elasticsearch.properties | 84 ----------
.../destination/conf/extensions.properties | 10 --
.../destination/conf/healthcheck.properties | 30 ----
.../cassandra-ldap/destination/conf/imapserver.xml | 61 --------
.../destination/conf/jmap.properties | 18 ---
.../cassandra-ldap/destination/conf/jmx.properties | 26 ----
.../cassandra-ldap/destination/conf/jwt_publickey | 9 --
.../guice/cassandra-ldap/destination/conf/keystore | Bin 2224 -> 0 bytes
.../cassandra-ldap/destination/conf/listeners.xml | 42 -----
.../cassandra-ldap/destination/conf/lmtpserver.xml | 43 -----
.../cassandra-ldap/destination/conf/logback.xml | 42 -----
.../destination/conf/mailetcontainer.xml | 156 -------------------
.../destination/conf/managesieveserver.xml | 65 --------
.../cassandra-ldap/destination/conf/pop3server.xml | 43 -----
.../destination/conf/recipientrewritetable.xml | 28 ----
.../cassandra-ldap/destination/conf/smime.p12 | Bin 4141 -> 0 bytes
.../cassandra-ldap/destination/conf/smtpserver.xml | 107 -------------
.../destination/conf/tika.properties | 23 ---
.../destination/conf/usersrepository.xml | 29 ----
.../destination/conf/webadmin.properties | 54 -------
.../destination/extensions-jars/README.md | 5 -
.../cassandra-ldap/destination/glowroot/admin.json | 5 -
.../destination/glowroot/plugins/blobstore.json | 26 ----
.../destination/glowroot/plugins/imap.json | 19 ---
.../destination/glowroot/plugins/jmap.json | 19 ---
.../glowroot/plugins/mailboxListener.json | 19 ---
.../destination/glowroot/plugins/smtp.json | 19 ---
.../destination/glowroot/plugins/spooler.json | 45 ------
.../destination/glowroot/plugins/task.json | 19 ---
.../guice/cassandra-ldap/destination/run_james.sh | 5 -
.../run/guice/cassandra-rabbitmq-ldap/Dockerfile | 43 -----
.../destination/conf/batchsizes.properties | 10 --
.../destination/conf/blob.properties | 100 ------------
.../destination/conf/cassandra.properties | 49 ------
.../conf/deletedMessageVault.properties | 4 -
.../destination/conf/dnsservice.xml | 27 ----
.../destination/conf/domainlist.xml | 27 ----
.../destination/conf/elasticsearch.properties | 83 ----------
.../destination/conf/extensions.properties | 10 --
.../destination/conf/healthcheck.properties | 30 ----
.../destination/conf/imapserver.xml | 61 --------
.../destination/conf/jmap.properties | 18 ---
.../destination/conf/jmx.properties | 26 ----
.../destination/conf/jwt_publickey | 9 --
.../destination/conf/listeners.xml | 43 -----
.../destination/conf/lmtpserver.xml | 43 -----
.../destination/conf/logback.xml | 42 -----
.../destination/conf/mailetcontainer.xml | 156 -------------------
.../destination/conf/managesieveserver.xml | 65 --------
.../destination/conf/pop3server.xml | 43 -----
.../destination/conf/rabbitmq.properties | 63 --------
.../destination/conf/recipientrewritetable.xml | 28 ----
.../destination/conf/smtpserver.xml | 107 -------------
.../destination/conf/tika.properties | 23 ---
.../destination/conf/usersrepository.xml | 29 ----
.../destination/conf/webadmin.properties | 54 -------
.../destination/extensions-jars/README.md | 5 -
.../destination/glowroot/admin.json | 5 -
.../destination/glowroot/plugins/blobstore.json | 26 ----
.../destination/glowroot/plugins/imap.json | 19 ---
.../destination/glowroot/plugins/jmap.json | 19 ---
.../glowroot/plugins/mailboxListener.json | 19 ---
.../destination/glowroot/plugins/smtp.json | 19 ---
.../destination/glowroot/plugins/spooler.json | 45 ------
.../destination/glowroot/plugins/task.json | 19 ---
.../destination/run_james.sh | 5 -
.../run/guice/cassandra-rabbitmq/Dockerfile | 9 +-
.../destination/conf/dnsservice.xml | 27 ----
.../destination/conf/jmx.properties | 26 ----
.../destination/conf/smtpserver.xml | 107 -------------
.../cassandra-rabbitmq/destination/run_james.sh | 6 +-
dockerfiles/run/guice/cassandra/Dockerfile | 11 +-
.../run/guice/cassandra/destination/run_james.sh | 6 +-
dockerfiles/run/guice/jpa-smtp/Dockerfile | 13 +-
.../guice/jpa-smtp/destination/conf/domainlist.xml | 26 ----
.../destination/conf/james-database.properties | 46 ------
.../jpa-smtp/destination/conf/mailetcontainer.xml | 116 --------------
.../destination/conf/mailrepositorystore.xml | 37 -----
.../destination/conf/recipientrewritetable.xml | 29 ----
.../jpa-smtp/destination/conf/usersrepository.xml | 29 ----
.../run/guice/jpa-smtp/destination/run_james.sh | 8 +-
dockerfiles/run/guice/jpa/Dockerfile | 13 +-
dockerfiles/run/guice/jpa/destination/run_james.sh | 7 +-
dockerfiles/run/guice/memory/Dockerfile | 5 +-
.../pages/distributed/configure/cassandra.adoc | 6 +
.../servers/pages/distributed/configure/smtp.adoc | 24 ++-
.../org/apache/james/mailbox/MessageIdManager.java | 12 +-
.../cassandra/mail/CassandraMessageIdMapper.java | 16 +-
.../mail/CassandraMessageIdMapperTest.java | 3 +-
.../inmemory/mail/InMemoryMessageIdMapper.java | 9 +-
.../james/vault/DeletedMessageVaultHookTest.java | 6 +-
.../james/mailbox/store/StoreMessageIdManager.java | 162 ++++++++++---------
.../james/mailbox/store/mail/MessageIdMapper.java | 6 +-
.../store/AbstractCombinationManagerTest.java | 6 +-
.../AbstractMessageIdManagerSideEffectTest.java | 7 +-
.../store/AbstractMessageIdManagerStorageTest.java | 2 +-
.../store/mail/model/MessageIdMapperTest.java | 57 +++----
server/blob/blob-s3/pom.xml | 10 ++
server/container/cli/README | 5 -
server/container/cli/README.adoc | 8 +
server/container/cli/pom.xml | 18 +++
server/container/cli/src/assemble/app.xml | 71 +++++++++
.../src/assemble/license-for-binary.txt | 0
.../james/server/core/MimeMessageWrapper.java | 2 +-
.../james/server/core/MimeMessageWrapperTest.java | 55 ++++++-
server/container/guice/cassandra-guice/README.adoc | 46 ++++++
server/container/guice/cassandra-guice/README.md | 4 -
server/container/guice/cassandra-guice/pom.xml | 18 +++
.../sample-configuration}/batchsizes.properties | 0
.../sample-configuration}/blob.properties | 0
.../sample-configuration}/cassandra.properties | 0
.../deletedMessageVault.properties | 0
.../sample-configuration}/dnsservice.xml | 0
.../sample-configuration}/domainlist.xml | 0
.../sample-configuration}/elasticsearch.properties | 0
.../sample-configuration}/extensions.properties | 0
.../sample-configuration}/healthcheck.properties | 0
.../sample-configuration}/imapserver.xml | 0
.../sample-configuration}/jmap.properties | 0
.../sample-configuration}/jmx.properties | 0
.../sample-configuration}/jwt_publickey | 0
.../sample-configuration}/listeners.xml | 0
.../sample-configuration}/lmtpserver.xml | 0
.../sample-configuration}/logback.xml | 0
.../sample-configuration}/mailetcontainer.xml | 0
.../sample-configuration}/mailrepositorystore.xml | 0
.../sample-configuration}/managesieveserver.xml | 0
.../sample-configuration}/pop3server.xml | 0
.../recipientrewritetable.xml | 0
.../sample-configuration}/smtpserver.xml | 0
.../sample-configuration}/tika.properties | 0
.../sample-configuration}/usersrepository.xml | 14 ++
.../sample-configuration}/webadmin.properties | 0
.../guice/cassandra-guice/src/assemble/app.xml | 86 ++++++++++
.../src/assemble/extensions-jars.txt | 0
.../src/assemble/license-for-binary.txt | 0
.../test/java/org/apache/james/ESReporterTest.java | 3 +-
.../guice/cassandra-rabbitmq-guice/README.adoc | 46 ++++++
.../guice/cassandra-rabbitmq-guice/pom.xml | 119 +++++++++++++-
.../sample-configuration}/batchsizes.properties | 0
.../sample-configuration}/blob.properties | 0
.../sample-configuration}/cassandra.properties | 0
.../deletedMessageVault.properties | 0
.../sample-configuration}/dnsservice.xml | 0
.../sample-configuration}/domainlist.xml | 0
.../sample-configuration}/elasticsearch.properties | 0
.../sample-configuration}/extensions.properties | 0
.../sample-configuration}/healthcheck.properties | 0
.../sample-configuration}/imapserver.xml | 0
.../sample-configuration}/jmap.properties | 0
.../sample-configuration}/jmx.properties | 0
.../sample-configuration}/jwt_publickey | 0
.../sample-configuration}/listeners.xml | 0
.../sample-configuration}/lmtpserver.xml | 0
.../sample-configuration}/logback.xml | 0
.../sample-configuration}/mailetcontainer.xml | 0
.../sample-configuration}/mailrepositorystore.xml | 0
.../sample-configuration}/managesieveserver.xml | 0
.../sample-configuration}/pop3server.xml | 0
.../sample-configuration}/rabbitmq.properties | 0
.../recipientrewritetable.xml | 0
.../sample-configuration}/smtpserver.xml | 0
.../sample-configuration}/tika.properties | 0
.../sample-configuration}/usersrepository.xml | 13 ++
.../sample-configuration}/webadmin.properties | 0
.../cassandra-rabbitmq-guice/src/assemble/app.xml | 86 ++++++++++
.../src/assemble/extensions-jars.txt | 0
.../src/assemble/license-for-binary.txt | 0
.../james/CassandraRabbitMQJamesServerMain.java | 139 +++++++++++++++--
server/container/guice/jpa-guice/README.adoc | 31 ++++
server/container/guice/jpa-guice/README.md | 4 -
server/container/guice/jpa-guice/pom.xml | 18 +++
.../jpa-guice/sample-configuration}/dnsservice.xml | 0
.../jpa-guice/sample-configuration}/domainlist.xml | 0
.../sample-configuration}/extensions.properties | 0
.../sample-configuration}/healthcheck.properties | 0
.../jpa-guice/sample-configuration}/imapserver.xml | 0
.../james-database.properties | 0
.../jpa-guice/sample-configuration}/jmx.properties | 0
.../jpa-guice/sample-configuration}/jwt_publickey | 0
.../jpa-guice/sample-configuration}/listeners.xml | 0
.../jpa-guice/sample-configuration}/lmtpserver.xml | 0
.../jpa-guice/sample-configuration}/logback.xml | 0
.../sample-configuration}/mailetcontainer.xml | 0
.../sample-configuration}/mailrepositorystore.xml | 0
.../sample-configuration}/managesieveserver.xml | 0
.../jpa-guice/sample-configuration}/pop3server.xml | 0
.../recipientrewritetable.xml | 0
.../jpa-guice/sample-configuration}/smtpserver.xml | 0
.../sample-configuration}/usersrepository.xml | 0
.../sample-configuration}/webadmin.properties | 0
.../container/guice/jpa-guice/src/assemble/app.xml | 86 ++++++++++
.../src/assemble/extensions-jars.txt | 0
.../src/assemble/license-for-binary.txt | 0
server/container/guice/jpa-smtp/README.adoc | 33 ++++
server/container/guice/jpa-smtp/README.md | 4 -
server/container/guice/jpa-smtp/pom.xml | 18 +++
.../jpa-smtp/sample-configuration/dnsservice.xml | 2 +
.../jpa-smtp/sample-configuration/domainlist.xml | 7 +-
.../sample-configuration}/extensions.properties | 0
.../sample-configuration}/healthcheck.properties | 0
.../sample-configuration/james-database.properties | 2 +-
.../jpa-smtp/sample-configuration/jmx.properties | 6 +-
.../jpa-smtp/sample-configuration}/logback.xml | 0
.../sample-configuration/mailetcontainer.xml | 14 +-
.../sample-configuration/mailrepositorystore.xml | 3 +
.../sample-configuration/recipientrewritetable.xml | 2 +
.../jpa-smtp/sample-configuration/smtpserver.xml | 14 +-
.../sample-configuration/usersrepository.xml | 4 +-
.../container/guice/jpa-smtp/src/assemble/app.xml | 86 ++++++++++
.../src/assemble/extensions-jars.txt | 0
.../src/assemble/license-for-binary.txt | 0
server/container/guice/memory-guice/README.adoc | 7 +-
.../domainlist/cassandra/CacheDomainListTest.java | 28 +++-
.../james/domainlist/lib/AbstractDomainList.java | 16 +-
.../impl/JamesMailetContextTest.java | 4 +-
.../SetMessagesOutboxFlagUpdateTest.java | 9 ++
.../methods/SetMessagesDestructionProcessor.java | 7 +-
.../james/jmap/http/AuthenticationRoutes.java | 15 +-
.../jmap/rfc8621/contract/WebSocketContract.scala | 95 ++++++-----
.../jmap/method/EmailSetDeletePerformer.scala | 2 +-
.../jmap/method/EmailSetUpdatePerformer.scala | 9 +-
.../jmap/method/EmailSubmissionSetMethod.scala | 86 +++++-----
.../apache/james/jmap/routes/WebSocketRoutes.scala | 37 ++---
server/protocols/protocols-imap4/pom.xml | 6 +
.../james/imapserver/netty/IMAPServerTest.java | 26 +---
.../lib/netty/AbstractConfigurableAsyncServer.java | 15 +-
.../james/protocols/lib/mock/ConfigLoader.java | 53 +++----
server/protocols/protocols-lmtp/pom.xml | 58 +++++++
.../MailetContainerCmdHandlerLoader.java | 84 ++++++++++
.../james/lmtpserver/MailetContainerHandler.java | 59 +++++++
.../james/lmtpserver/NoopJamesMessageHook.java} | 22 +--
.../apache/james/lmtpserver/LmtpServerTest.java | 173 +++++++++++++++++++++
.../lmtpserver/MailetContainerHandlerTest.java | 156 +++++++++++++++++++
.../protocols-lmtp/src/test/resources/lmtp.xml | 27 ++--
.../src/test/resources/lmtpmailet.xml | 27 ++--
.../java/org/apache/james/queue/api/MailQueue.java | 2 +
.../james/queue/file/FileCacheableMailQueue.java | 6 +
.../james/queue/jms/JMSCacheableMailQueue.java | 6 +
.../james/queue/memory/MemoryMailQueueFactory.java | 6 +
.../org/apache/james/queue/rabbitmq/Enqueuer.java | 7 +-
.../james/queue/rabbitmq/RabbitMQMailQueue.java | 15 +-
.../java/org/apache/james/util/docker/Images.java | 2 +-
src/site/xdoc/server/config-cassandra.xml | 5 +
src/site/xdoc/server/config-smtp-lmtp.xml | 24 +++
261 files changed, 2206 insertions(+), 3566 deletions(-)
copy backends-common/cassandra/src/{main/java/org/apache/james/backends/cassandra/migration/Migration.java => test/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfigurationTest.java} (60%)
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/Dockerfile
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/batchsizes.properties
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/blob.properties
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/cassandra.properties
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/deletedMessageVault.properties
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/dnsservice.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/domainlist.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/extensions.properties
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/healthcheck.properties
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/imapserver.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/jmap.properties
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/jmx.properties
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/jwt_publickey
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/keystore
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/listeners.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/lmtpserver.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/logback.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/managesieveserver.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/pop3server.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/recipientrewritetable.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/smime.p12
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/smtpserver.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/tika.properties
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/usersrepository.xml
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/conf/webadmin.properties
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/extensions-jars/README.md
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/glowroot/admin.json
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/blobstore.json
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/imap.json
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/jmap.json
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/mailboxListener.json
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/smtp.json
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/spooler.json
delete mode 100644 dockerfiles/run/guice/cassandra-ldap/destination/glowroot/plugins/task.json
delete mode 100755 dockerfiles/run/guice/cassandra-ldap/destination/run_james.sh
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/batchsizes.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/blob.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/cassandra.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/deletedMessageVault.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/dnsservice.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/domainlist.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/extensions.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/healthcheck.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/imapserver.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jmap.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jmx.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/jwt_publickey
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/listeners.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/lmtpserver.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/logback.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailetcontainer.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/managesieveserver.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/pop3server.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/rabbitmq.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/recipientrewritetable.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/smtpserver.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/tika.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/usersrepository.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/webadmin.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/extensions-jars/README.md
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/admin.json
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/blobstore.json
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/imap.json
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/jmap.json
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/mailboxListener.json
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/smtp.json
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/spooler.json
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/glowroot/plugins/task.json
delete mode 100755 dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/run_james.sh
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/dnsservice.xml
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/jmx.properties
delete mode 100644 dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/smtpserver.xml
delete mode 100644 dockerfiles/run/guice/jpa-smtp/destination/conf/domainlist.xml
delete mode 100644 dockerfiles/run/guice/jpa-smtp/destination/conf/james-database.properties
delete mode 100644 dockerfiles/run/guice/jpa-smtp/destination/conf/mailetcontainer.xml
delete mode 100644 dockerfiles/run/guice/jpa-smtp/destination/conf/mailrepositorystore.xml
delete mode 100644 dockerfiles/run/guice/jpa-smtp/destination/conf/recipientrewritetable.xml
delete mode 100644 dockerfiles/run/guice/jpa-smtp/destination/conf/usersrepository.xml
delete mode 100644 server/container/cli/README
create mode 100644 server/container/cli/README.adoc
create mode 100644 server/container/cli/src/assemble/app.xml
copy server/container/{guice/memory-guice => cli}/src/assemble/license-for-binary.txt (100%)
create mode 100644 server/container/guice/cassandra-guice/README.adoc
delete mode 100644 server/container/guice/cassandra-guice/README.md
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/batchsizes.properties (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/blob.properties (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/cassandra.properties (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/deletedMessageVault.properties (100%)
rename {dockerfiles/run/guice/jpa-smtp/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/dnsservice.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/domainlist.xml (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/elasticsearch.properties (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/extensions.properties (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/healthcheck.properties (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/imapserver.xml (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/jmap.properties (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/jmx.properties (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/jwt_publickey (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/listeners.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/lmtpserver.xml (100%)
rename {dockerfiles/run/guice/jpa-smtp/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/logback.xml (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/mailetcontainer.xml (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/mailrepositorystore.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/managesieveserver.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/pop3server.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/recipientrewritetable.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/smtpserver.xml (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/tika.properties (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/usersrepository.xml (72%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-guice/sample-configuration}/webadmin.properties (100%)
create mode 100644 server/container/guice/cassandra-guice/src/assemble/app.xml
copy server/container/guice/{memory-guice => cassandra-guice}/src/assemble/extensions-jars.txt (100%)
copy server/container/guice/{memory-guice => cassandra-guice}/src/assemble/license-for-binary.txt (100%)
create mode 100644 server/container/guice/cassandra-rabbitmq-guice/README.adoc
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/batchsizes.properties (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/blob.properties (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/cassandra.properties (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/deletedMessageVault.properties (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/dnsservice.xml (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/domainlist.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/elasticsearch.properties (100%)
rename {dockerfiles/run/guice/jpa-smtp/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/extensions.properties (100%)
rename {dockerfiles/run/guice/jpa-smtp/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/healthcheck.properties (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/imapserver.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/jmap.properties (100%)
rename {dockerfiles/run/guice/jpa-smtp/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/jmx.properties (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/jwt_publickey (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/listeners.xml (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/lmtpserver.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/logback.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/mailetcontainer.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/mailrepositorystore.xml (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/managesieveserver.xml (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/pop3server.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/rabbitmq.properties (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/recipientrewritetable.xml (100%)
rename {dockerfiles/run/guice/jpa-smtp/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/smtpserver.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/tika.properties (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/usersrepository.xml (72%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/cassandra-rabbitmq-guice/sample-configuration}/webadmin.properties (100%)
create mode 100644 server/container/guice/cassandra-rabbitmq-guice/src/assemble/app.xml
copy server/container/guice/{memory-guice => cassandra-rabbitmq-guice}/src/assemble/extensions-jars.txt (100%)
copy server/container/guice/{memory-guice => cassandra-rabbitmq-guice}/src/assemble/license-for-binary.txt (100%)
create mode 100644 server/container/guice/jpa-guice/README.adoc
delete mode 100644 server/container/guice/jpa-guice/README.md
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/jpa-guice/sample-configuration}/dnsservice.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/jpa-guice/sample-configuration}/domainlist.xml (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/jpa-guice/sample-configuration}/extensions.properties (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/jpa-guice/sample-configuration}/healthcheck.properties (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/jpa-guice/sample-configuration}/imapserver.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/jpa-guice/sample-configuration}/james-database.properties (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/jpa-guice/sample-configuration}/jmx.properties (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/jpa-guice/sample-configuration}/jwt_publickey (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/jpa-guice/sample-configuration}/listeners.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/jpa-guice/sample-configuration}/lmtpserver.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/jpa-guice/sample-configuration}/logback.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/jpa-guice/sample-configuration}/mailetcontainer.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/jpa-guice/sample-configuration}/mailrepositorystore.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/jpa-guice/sample-configuration}/managesieveserver.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/jpa-guice/sample-configuration}/pop3server.xml (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/jpa-guice/sample-configuration}/recipientrewritetable.xml (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/jpa-guice/sample-configuration}/smtpserver.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/jpa-guice/sample-configuration}/usersrepository.xml (100%)
rename {dockerfiles/run/guice/jpa/destination/conf => server/container/guice/jpa-guice/sample-configuration}/webadmin.properties (100%)
create mode 100644 server/container/guice/jpa-guice/src/assemble/app.xml
copy server/container/guice/{memory-guice => jpa-guice}/src/assemble/extensions-jars.txt (100%)
copy server/container/guice/{memory-guice => jpa-guice}/src/assemble/license-for-binary.txt (100%)
create mode 100644 server/container/guice/jpa-smtp/README.adoc
delete mode 100644 server/container/guice/jpa-smtp/README.md
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/jpa-smtp/sample-configuration}/extensions.properties (100%)
rename {dockerfiles/run/guice/cassandra-rabbitmq/destination/conf => server/container/guice/jpa-smtp/sample-configuration}/healthcheck.properties (100%)
rename {dockerfiles/run/guice/cassandra/destination/conf => server/container/guice/jpa-smtp/sample-configuration}/logback.xml (100%)
create mode 100644 server/container/guice/jpa-smtp/src/assemble/app.xml
copy server/container/guice/{memory-guice => jpa-smtp}/src/assemble/extensions-jars.txt (100%)
copy server/container/guice/{memory-guice => jpa-smtp}/src/assemble/license-for-binary.txt (100%)
copy backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/Migration.java => server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/ConfigLoader.java (53%)
create mode 100644 server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/MailetContainerCmdHandlerLoader.java
create mode 100644 server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/MailetContainerHandler.java
copy server/{testing/src/main/java/org/apache/james/util/docker/Images.java => protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/NoopJamesMessageHook.java} (67%)
create mode 100644 server/protocols/protocols-lmtp/src/test/java/org/apache/james/lmtpserver/LmtpServerTest.java
create mode 100644 server/protocols/protocols-lmtp/src/test/java/org/apache/james/lmtpserver/MailetContainerHandlerTest.java
rename dockerfiles/run/guice/cassandra-ldap/destination/conf/mailrepositorystore.xml => server/protocols/protocols-lmtp/src/test/resources/lmtp.xml (61%)
rename dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/mailrepositorystore.xml => server/protocols/protocols-lmtp/src/test/resources/lmtpmailet.xml (57%)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org