This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 90d154a5e25acde2b8bbfd2f55a30f2bca6bb11d Author: Benoit Tellier <[email protected]> AuthorDate: Thu Jun 10 21:51:45 2021 +0700 JAMES-3596 Rename server/container/guice/jguice-common to remove redundant suffix --- server/container/guice/{guice-common => common}/pom.xml | 0 .../src/main/java/org/apache/james/CleanupTasksPerformer.java | 0 .../src/main/java/org/apache/james/GuiceJamesServer.java | 0 .../src/main/java/org/apache/james/GuiceLifecycleHealthCheck.java | 0 .../src/main/java/org/apache/james/IsStartedProbe.java | 0 .../src/main/java/org/apache/james/JamesServerMain.java | 0 .../src/main/java/org/apache/james/PeriodicalHealthChecks.java | 0 .../main/java/org/apache/james/PeriodicalHealthChecksConfiguration.java | 0 .../src/main/java/org/apache/james/StartUpChecksPerformer.java | 0 .../src/main/java/org/apache/james/modules/CleanupTaskModule.java | 0 .../src/main/java/org/apache/james/modules/ClockModule.java | 0 .../src/main/java/org/apache/james/modules/CommonServicesModule.java | 0 .../src/main/java/org/apache/james/modules/IsStartedProbeModule.java | 0 .../src/main/java/org/apache/james/modules/MailetProcessingModule.java | 0 .../src/main/java/org/apache/james/modules/MimeMessageModule.java | 0 .../java/org/apache/james/modules/PeriodicalHealthChecksModule.java | 0 .../src/main/java/org/apache/james/modules/StartUpChecksModule.java | 0 .../src/main/java/org/apache/james/modules/StartablesModule.java | 0 .../java/org/apache/james/modules/protocols/ProtocolHandlerModule.java | 0 .../src/main/java/org/apache/james/modules/server/DNSServiceModule.java | 0 .../modules/server/DefaultProcessorsConfigurationProviderModule.java | 0 .../java/org/apache/james/modules/server/DropWizardMetricsModule.java | 0 .../java/org/apache/james/modules/server/GuiceMailRepositoryLoader.java | 0 .../src/main/java/org/apache/james/modules/server/HostnameModule.java | 0 .../main/java/org/apache/james/modules/server/LoggingMetricsModule.java | 0 .../java/org/apache/james/modules/server/MailStoreRepositoryModule.java | 0 .../org/apache/james/modules/server/RawPostDequeueDecoratorModule.java | 0 .../main/java/org/apache/james/modules/server/TaskManagerModule.java | 0 .../java/org/apache/james/modules/server/TaskSerializationModule.java | 0 .../src/main/java/org/apache/james/utils/DataProbeImpl.java | 0 .../src/main/java/org/apache/james/utils/GuiceProbeProvider.java | 0 .../main/java/org/apache/james/utils/GuiceProtocolHandlerLoader.java | 0 .../src/main/java/org/apache/james/utils/InitializationOperations.java | 0 .../src/main/java/org/apache/james/utils/MailRepositoryProbeImpl.java | 0 .../src/main/java/org/apache/james/utils/MailboxManagerDefinition.java | 0 .../src/main/java/org/apache/james/utils/Startables.java | 0 .../src/test/java/org/apache/james/AggregateGuiceModuleTestRule.java | 0 .../src/test/java/org/apache/james/AggregateJunitExtension.java | 0 .../src/test/java/org/apache/james/FakePropertiesProvider.java | 0 .../src/test/java/org/apache/james/GuiceModuleTestExtension.java | 0 .../src/test/java/org/apache/james/GuiceModuleTestRule.java | 0 .../src/test/java/org/apache/james/JamesServerBuilder.java | 0 .../src/test/java/org/apache/james/JamesServerContract.java | 0 .../src/test/java/org/apache/james/JamesServerExtension.java | 0 .../src/test/java/org/apache/james/MailsShouldBeWellReceived.java | 0 .../java/org/apache/james/PeriodicalHealthChecksConfigurationTest.java | 0 .../src/test/java/org/apache/james/PeriodicalHealthChecksTest.java | 0 .../src/test/java/org/apache/james/RegistrableExtension.java | 0 .../src/test/java/org/apache/james/StartUpChecksPerformerTest.java | 0 .../src/test/java/org/apache/james/TempFilesystemTestRule.java | 0 .../test/java/org/apache/james/TemporaryFolderRegistrableExtension.java | 0 .../java/org/apache/james/modules/InitializationOperationsTest.java | 0 .../src/test/java/org/apache/james/utils/ConfigurablesTest.java | 0 .../src/test/java/org/apache/james/utils/FailingPropertiesProvider.java | 0 .../test/java/org/apache/james/utils/FileConfigurationProviderTest.java | 0 .../src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java | 0 .../src/test/resources/eml/mail-containing-unicode-characters.eml | 0 .../guice/{guice-common => common}/src/test/resources/test.properties | 0 .../guice/{guice-common => common}/src/test/resources/test.xml | 0 server/container/guice/pom.xml | 2 +- 60 files changed, 1 insertion(+), 1 deletion(-) diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/common/pom.xml similarity index 100% rename from server/container/guice/guice-common/pom.xml rename to server/container/guice/common/pom.xml diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/CleanupTasksPerformer.java b/server/container/guice/common/src/main/java/org/apache/james/CleanupTasksPerformer.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/CleanupTasksPerformer.java rename to server/container/guice/common/src/main/java/org/apache/james/CleanupTasksPerformer.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java b/server/container/guice/common/src/main/java/org/apache/james/GuiceJamesServer.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java rename to server/container/guice/common/src/main/java/org/apache/james/GuiceJamesServer.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceLifecycleHealthCheck.java b/server/container/guice/common/src/main/java/org/apache/james/GuiceLifecycleHealthCheck.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/GuiceLifecycleHealthCheck.java rename to server/container/guice/common/src/main/java/org/apache/james/GuiceLifecycleHealthCheck.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/IsStartedProbe.java b/server/container/guice/common/src/main/java/org/apache/james/IsStartedProbe.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/IsStartedProbe.java rename to server/container/guice/common/src/main/java/org/apache/james/IsStartedProbe.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/JamesServerMain.java b/server/container/guice/common/src/main/java/org/apache/james/JamesServerMain.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/JamesServerMain.java rename to server/container/guice/common/src/main/java/org/apache/james/JamesServerMain.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecks.java b/server/container/guice/common/src/main/java/org/apache/james/PeriodicalHealthChecks.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecks.java rename to server/container/guice/common/src/main/java/org/apache/james/PeriodicalHealthChecks.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecksConfiguration.java b/server/container/guice/common/src/main/java/org/apache/james/PeriodicalHealthChecksConfiguration.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecksConfiguration.java rename to server/container/guice/common/src/main/java/org/apache/james/PeriodicalHealthChecksConfiguration.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/StartUpChecksPerformer.java b/server/container/guice/common/src/main/java/org/apache/james/StartUpChecksPerformer.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/StartUpChecksPerformer.java rename to server/container/guice/common/src/main/java/org/apache/james/StartUpChecksPerformer.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CleanupTaskModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/CleanupTaskModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/CleanupTaskModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/CleanupTaskModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/ClockModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/ClockModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/ClockModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/ClockModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/CommonServicesModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/CommonServicesModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/IsStartedProbeModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/IsStartedProbeModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/IsStartedProbeModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/IsStartedProbeModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/MailetProcessingModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/MailetProcessingModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MimeMessageModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/MimeMessageModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/MimeMessageModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/MimeMessageModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/PeriodicalHealthChecksModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/PeriodicalHealthChecksModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/PeriodicalHealthChecksModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/PeriodicalHealthChecksModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/StartUpChecksModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/StartUpChecksModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/StartUpChecksModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/StartUpChecksModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/StartablesModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/StartablesModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/StartablesModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/StartablesModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/protocols/ProtocolHandlerModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/protocols/ProtocolHandlerModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/protocols/ProtocolHandlerModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/protocols/ProtocolHandlerModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DefaultProcessorsConfigurationProviderModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/DefaultProcessorsConfigurationProviderModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DefaultProcessorsConfigurationProviderModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/server/DefaultProcessorsConfigurationProviderModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/server/DropWizardMetricsModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/GuiceMailRepositoryLoader.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/GuiceMailRepositoryLoader.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/GuiceMailRepositoryLoader.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/server/GuiceMailRepositoryLoader.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/HostnameModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/HostnameModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/HostnameModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/server/HostnameModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/LoggingMetricsModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/LoggingMetricsModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/LoggingMetricsModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/server/LoggingMetricsModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/RawPostDequeueDecoratorModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/RawPostDequeueDecoratorModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/RawPostDequeueDecoratorModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/server/RawPostDequeueDecoratorModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/TaskManagerModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/TaskManagerModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/TaskManagerModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/server/TaskManagerModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/TaskSerializationModule.java b/server/container/guice/common/src/main/java/org/apache/james/modules/server/TaskSerializationModule.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/TaskSerializationModule.java rename to server/container/guice/common/src/main/java/org/apache/james/modules/server/TaskSerializationModule.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java b/server/container/guice/common/src/main/java/org/apache/james/utils/DataProbeImpl.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/utils/DataProbeImpl.java rename to server/container/guice/common/src/main/java/org/apache/james/utils/DataProbeImpl.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java b/server/container/guice/common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java rename to server/container/guice/common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProtocolHandlerLoader.java b/server/container/guice/common/src/main/java/org/apache/james/utils/GuiceProtocolHandlerLoader.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProtocolHandlerLoader.java rename to server/container/guice/common/src/main/java/org/apache/james/utils/GuiceProtocolHandlerLoader.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/InitializationOperations.java b/server/container/guice/common/src/main/java/org/apache/james/utils/InitializationOperations.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/utils/InitializationOperations.java rename to server/container/guice/common/src/main/java/org/apache/james/utils/InitializationOperations.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/MailRepositoryProbeImpl.java b/server/container/guice/common/src/main/java/org/apache/james/utils/MailRepositoryProbeImpl.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/utils/MailRepositoryProbeImpl.java rename to server/container/guice/common/src/main/java/org/apache/james/utils/MailRepositoryProbeImpl.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/MailboxManagerDefinition.java b/server/container/guice/common/src/main/java/org/apache/james/utils/MailboxManagerDefinition.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/utils/MailboxManagerDefinition.java rename to server/container/guice/common/src/main/java/org/apache/james/utils/MailboxManagerDefinition.java diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/Startables.java b/server/container/guice/common/src/main/java/org/apache/james/utils/Startables.java similarity index 100% rename from server/container/guice/guice-common/src/main/java/org/apache/james/utils/Startables.java rename to server/container/guice/common/src/main/java/org/apache/james/utils/Startables.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/AggregateGuiceModuleTestRule.java b/server/container/guice/common/src/test/java/org/apache/james/AggregateGuiceModuleTestRule.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/AggregateGuiceModuleTestRule.java rename to server/container/guice/common/src/test/java/org/apache/james/AggregateGuiceModuleTestRule.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/AggregateJunitExtension.java b/server/container/guice/common/src/test/java/org/apache/james/AggregateJunitExtension.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/AggregateJunitExtension.java rename to server/container/guice/common/src/test/java/org/apache/james/AggregateJunitExtension.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/FakePropertiesProvider.java b/server/container/guice/common/src/test/java/org/apache/james/FakePropertiesProvider.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/FakePropertiesProvider.java rename to server/container/guice/common/src/test/java/org/apache/james/FakePropertiesProvider.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/GuiceModuleTestExtension.java b/server/container/guice/common/src/test/java/org/apache/james/GuiceModuleTestExtension.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/GuiceModuleTestExtension.java rename to server/container/guice/common/src/test/java/org/apache/james/GuiceModuleTestExtension.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/GuiceModuleTestRule.java b/server/container/guice/common/src/test/java/org/apache/james/GuiceModuleTestRule.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/GuiceModuleTestRule.java rename to server/container/guice/common/src/test/java/org/apache/james/GuiceModuleTestRule.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerBuilder.java b/server/container/guice/common/src/test/java/org/apache/james/JamesServerBuilder.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerBuilder.java rename to server/container/guice/common/src/test/java/org/apache/james/JamesServerBuilder.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerContract.java b/server/container/guice/common/src/test/java/org/apache/james/JamesServerContract.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerContract.java rename to server/container/guice/common/src/test/java/org/apache/james/JamesServerContract.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerExtension.java b/server/container/guice/common/src/test/java/org/apache/james/JamesServerExtension.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/JamesServerExtension.java rename to server/container/guice/common/src/test/java/org/apache/james/JamesServerExtension.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/MailsShouldBeWellReceived.java b/server/container/guice/common/src/test/java/org/apache/james/MailsShouldBeWellReceived.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/MailsShouldBeWellReceived.java rename to server/container/guice/common/src/test/java/org/apache/james/MailsShouldBeWellReceived.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksConfigurationTest.java b/server/container/guice/common/src/test/java/org/apache/james/PeriodicalHealthChecksConfigurationTest.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksConfigurationTest.java rename to server/container/guice/common/src/test/java/org/apache/james/PeriodicalHealthChecksConfigurationTest.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java b/server/container/guice/common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java rename to server/container/guice/common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/RegistrableExtension.java b/server/container/guice/common/src/test/java/org/apache/james/RegistrableExtension.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/RegistrableExtension.java rename to server/container/guice/common/src/test/java/org/apache/james/RegistrableExtension.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/StartUpChecksPerformerTest.java b/server/container/guice/common/src/test/java/org/apache/james/StartUpChecksPerformerTest.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/StartUpChecksPerformerTest.java rename to server/container/guice/common/src/test/java/org/apache/james/StartUpChecksPerformerTest.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/TempFilesystemTestRule.java b/server/container/guice/common/src/test/java/org/apache/james/TempFilesystemTestRule.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/TempFilesystemTestRule.java rename to server/container/guice/common/src/test/java/org/apache/james/TempFilesystemTestRule.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/TemporaryFolderRegistrableExtension.java b/server/container/guice/common/src/test/java/org/apache/james/TemporaryFolderRegistrableExtension.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/TemporaryFolderRegistrableExtension.java rename to server/container/guice/common/src/test/java/org/apache/james/TemporaryFolderRegistrableExtension.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/modules/InitializationOperationsTest.java b/server/container/guice/common/src/test/java/org/apache/james/modules/InitializationOperationsTest.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/modules/InitializationOperationsTest.java rename to server/container/guice/common/src/test/java/org/apache/james/modules/InitializationOperationsTest.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/ConfigurablesTest.java b/server/container/guice/common/src/test/java/org/apache/james/utils/ConfigurablesTest.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/utils/ConfigurablesTest.java rename to server/container/guice/common/src/test/java/org/apache/james/utils/ConfigurablesTest.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FailingPropertiesProvider.java b/server/container/guice/common/src/test/java/org/apache/james/utils/FailingPropertiesProvider.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/utils/FailingPropertiesProvider.java rename to server/container/guice/common/src/test/java/org/apache/james/utils/FailingPropertiesProvider.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java b/server/container/guice/common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java rename to server/container/guice/common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java b/server/container/guice/common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java similarity index 100% rename from server/container/guice/guice-common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java rename to server/container/guice/common/src/test/java/org/apache/james/utils/GuiceProbeProviderTest.java diff --git a/server/container/guice/guice-common/src/test/resources/eml/mail-containing-unicode-characters.eml b/server/container/guice/common/src/test/resources/eml/mail-containing-unicode-characters.eml similarity index 100% rename from server/container/guice/guice-common/src/test/resources/eml/mail-containing-unicode-characters.eml rename to server/container/guice/common/src/test/resources/eml/mail-containing-unicode-characters.eml diff --git a/server/container/guice/guice-common/src/test/resources/test.properties b/server/container/guice/common/src/test/resources/test.properties similarity index 100% rename from server/container/guice/guice-common/src/test/resources/test.properties rename to server/container/guice/common/src/test/resources/test.properties diff --git a/server/container/guice/guice-common/src/test/resources/test.xml b/server/container/guice/common/src/test/resources/test.xml similarity index 100% rename from server/container/guice/guice-common/src/test/resources/test.xml rename to server/container/guice/common/src/test/resources/test.xml diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index d1787dd..64375a5 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -38,13 +38,13 @@ <module>blob/memory</module> <module>blob/s3</module> <module>cassandra</module> + <module>common</module> <module>configuration</module> <module>data-cassandra</module> <module>data-ldap</module> <module>distributed</module> <module>elasticsearch</module> <module>es-metric-reporter</module> - <module>guice-common</module> <module>guice-utils</module> <module>jmx</module> <module>jpa-common</module> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
