This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3a202febbf4b8f6d65d16003c08ccb299d86126d
Author: LanKhuat <khuatdang...@gmail.com>
AuthorDate: Tue Mar 10 16:29:49 2020 +0700
JAMES-3072 Add MailboxesExportRoutes module
---
.../org/apache/james/CassandraJamesServerMain.java | 4 ++--
.../org/apache/james/MemoryJamesServerMain.java | 4 ++--
.../modules/server/MailboxesBackupModule.java | 10 ----------
...odule.java => MailboxesExportRoutesModule.java} | 22 ++--------------------
4 files changed, 6 insertions(+), 34 deletions(-)
diff --git
a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
index 297cdbd..9bc756c 100644
---
a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
+++
b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServerMain.java
@@ -60,7 +60,7 @@ import org.apache.james.modules.server.JmapTasksModule;
import org.apache.james.modules.server.MailQueueRoutesModule;
import org.apache.james.modules.server.MailRepositoriesRoutesModule;
import org.apache.james.modules.server.MailboxRoutesModule;
-import org.apache.james.modules.server.MailboxesBackupModule;
+import org.apache.james.modules.server.MailboxesExportRoutesModule;
import org.apache.james.modules.server.MessagesRoutesModule;
import org.apache.james.modules.server.ReIndexingModule;
import org.apache.james.modules.server.SieveRoutesModule;
@@ -87,7 +87,7 @@ public class CassandraJamesServerMain implements
JamesServerMain {
new DLPRoutesModule(),
new InconsistencySolvingRoutesModule(),
new JmapTasksModule(),
- new MailboxesBackupModule(),
+ new MailboxesExportRoutesModule(),
new MailboxRoutesModule(),
new MailQueueRoutesModule(),
new MailRepositoriesRoutesModule(),
diff --git
a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
index 5e8c919..be8595a 100644
---
a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
+++
b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
@@ -46,7 +46,7 @@ import org.apache.james.modules.server.JmapTasksModule;
import org.apache.james.modules.server.MailQueueRoutesModule;
import org.apache.james.modules.server.MailRepositoriesRoutesModule;
import org.apache.james.modules.server.MailboxRoutesModule;
-import org.apache.james.modules.server.MailboxesBackupModule;
+import org.apache.james.modules.server.MailboxesExportRoutesModule;
import org.apache.james.modules.server.MemoryMailQueueModule;
import org.apache.james.modules.server.RawPostDequeueDecoratorModule;
import org.apache.james.modules.server.SieveRoutesModule;
@@ -70,7 +70,7 @@ public class MemoryJamesServerMain implements JamesServerMain
{
new DataRoutesModules(),
new DeletedMessageVaultRoutesModule(),
new DLPRoutesModule(),
- new MailboxesBackupModule(),
+ new MailboxesExportRoutesModule(),
new MailboxRoutesModule(),
new MailQueueRoutesModule(),
new MailRepositoriesRoutesModule(),
diff --git
a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesBackupModule.java
b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesBackupModule.java
index 7eb120a..bfa21dc 100644
---
a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesBackupModule.java
+++
b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesBackupModule.java
@@ -27,15 +27,9 @@ import org.apache.james.mailbox.backup.MailboxBackup;
import org.apache.james.mailbox.backup.ZipMailArchiveRestorer;
import org.apache.james.mailbox.backup.zip.ZipArchivesLoader;
import org.apache.james.mailbox.backup.zip.Zipper;
-import org.apache.james.webadmin.routes.UserMailboxesRoutes;
-import org.apache.james.webadmin.service.ExportService;
-import org.apache.james.webadmin.service.MailboxesExportRequestToTask;
-import org.apache.james.webadmin.tasks.TaskFromRequestRegistry;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
-import com.google.inject.multibindings.Multibinder;
-import com.google.inject.name.Names;
public class MailboxesBackupModule extends AbstractModule {
@@ -52,9 +46,5 @@ public class MailboxesBackupModule extends AbstractModule {
bind(DefaultMailboxBackup.class).in(Scopes.SINGLETON);
bind(MailboxBackup.class).to(DefaultMailboxBackup.class);
-
- bind(ExportService.class).in(Scopes.SINGLETON);
- Multibinder.newSetBinder(binder(),
TaskFromRequestRegistry.TaskRegistration.class,
Names.named(UserMailboxesRoutes.USER_MAILBOXES_OPERATIONS_INJECTION_KEY))
- .addBinding().to(MailboxesExportRequestToTask.class);
}
}
diff --git
a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesBackupModule.java
b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesExportRoutesModule.java
similarity index 66%
copy from
server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesBackupModule.java
copy to
server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesExportRoutesModule.java
index 7eb120a..4e09cdb 100644
---
a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesBackupModule.java
+++
b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/MailboxesExportRoutesModule.java
@@ -19,14 +19,6 @@
package org.apache.james.modules.server;
-import org.apache.james.mailbox.backup.ArchiveService;
-import org.apache.james.mailbox.backup.DefaultMailboxBackup;
-import org.apache.james.mailbox.backup.MailArchiveRestorer;
-import org.apache.james.mailbox.backup.MailArchivesLoader;
-import org.apache.james.mailbox.backup.MailboxBackup;
-import org.apache.james.mailbox.backup.ZipMailArchiveRestorer;
-import org.apache.james.mailbox.backup.zip.ZipArchivesLoader;
-import org.apache.james.mailbox.backup.zip.Zipper;
import org.apache.james.webadmin.routes.UserMailboxesRoutes;
import org.apache.james.webadmin.service.ExportService;
import org.apache.james.webadmin.service.MailboxesExportRequestToTask;
@@ -37,21 +29,11 @@ import com.google.inject.Scopes;
import com.google.inject.multibindings.Multibinder;
import com.google.inject.name.Names;
-public class MailboxesBackupModule extends AbstractModule {
+public class MailboxesExportRoutesModule extends AbstractModule {
@Override
protected void configure() {
- bind(Zipper.class).in(Scopes.SINGLETON);
- bind(ArchiveService.class).to(Zipper.class);
-
- bind(ZipMailArchiveRestorer.class).in(Scopes.SINGLETON);
- bind(MailArchiveRestorer.class).to(ZipMailArchiveRestorer.class);
-
- bind(ZipArchivesLoader.class).in(Scopes.SINGLETON);
- bind(MailArchivesLoader.class).to(ZipArchivesLoader.class);
-
- bind(DefaultMailboxBackup.class).in(Scopes.SINGLETON);
- bind(MailboxBackup.class).to(DefaultMailboxBackup.class);
+ install(new MailboxesBackupModule());
bind(ExportService.class).in(Scopes.SINGLETON);
Multibinder.newSetBinder(binder(),
TaskFromRequestRegistry.TaskRegistration.class,
Names.named(UserMailboxesRoutes.USER_MAILBOXES_OPERATIONS_INJECTION_KEY))
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
