Merge remote-tracking branch 'btellier/JAMES-2096-new-new'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ea9cfe53 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ea9cfe53 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ea9cfe53 Branch: refs/heads/master Commit: ea9cfe537d03927b06f93e6c67e40eca01192ec1 Parents: f635520 74fcb6a Author: Antoine Duprat <[email protected]> Authored: Thu Jul 27 08:53:30 2017 +0200 Committer: Antoine Duprat <[email protected]> Committed: Thu Jul 27 08:53:30 2017 +0200 ---------------------------------------------------------------------- .../versions/CassandraSchemaVersionManager.java | 2 +- .../cassandra/mail/CassandraMessageDAO.java | 107 +++++++- .../cassandra/mail/CassandraMessageDAOV2.java | 56 +++- .../cassandra/mail/migration/Migration.java | 43 +++ .../mail/migration/V1ToV2Migration.java | 30 ++- .../mail/migration/V1ToV2MigrationTest.java | 46 ++++ server/container/guice/cassandra-guice/pom.xml | 4 + .../apache/james/CassandraJamesServerMain.java | 4 +- server/container/guice/pom.xml | 6 + .../guice/protocols/webadmin-cassandra/pom.xml | 202 ++++++++++++++ .../modules/server/CassandraRoutesModule.java | 57 ++++ server/pom.xml | 6 + .../WebAdminServerIntegrationTest.java | 67 +++++ .../webadmin/webadmin-cassandra/pom.xml | 251 ++++++++++++++++++ .../webadmin/dto/CassandraVersionRequest.java | 40 +++ .../webadmin/dto/CassandraVersionResponse.java | 35 +++ .../routes/CassandraMigrationRoutes.java | 105 ++++++++ .../service/CassandraMigrationService.java | 98 +++++++ .../webadmin/service/MigrationException.java | 26 ++ .../james/webadmin/dto/VersionRequestTest.java | 67 +++++ .../routes/CassandraMigrationRoutesTest.java | 201 ++++++++++++++ .../service/CassandraMigrationServiceTest.java | 261 +++++++++++++++++++ server/protocols/webadmin/webadmin-core/pom.xml | 4 + .../james/webadmin/utils/JsonTransformer.java | 2 + src/site/markdown/server/manage-webadmin.md | 95 ++++++- src/site/xdoc/server/config-cassandra.xml | 16 ++ 26 files changed, 1818 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
