You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/06/12 00:07:37 UTC

[james-project] 17/19: JAMES-3596 Rename server/container/guice/guice-utils to remove redundant suffix

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 87a6f38367c474bc8d10e175c13ab6b35cde2ab3
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Jun 10 21:52:39 2021 +0700

    JAMES-3596 Rename server/container/guice/guice-utils to remove redundant suffix
---
 server/container/guice/pom.xml                                          | 2 +-
 server/container/guice/{guice-utils => utils}/pom.xml                   | 0
 .../src/main/java/org/apache/james/utils/ClassName.java                 | 0
 .../src/main/java/org/apache/james/utils/ExtendedClassLoader.java       | 0
 .../src/main/java/org/apache/james/utils/ExtensionConfiguration.java    | 0
 .../src/main/java/org/apache/james/utils/ExtensionModule.java           | 0
 .../src/main/java/org/apache/james/utils/FullyQualifiedClassName.java   | 0
 .../src/main/java/org/apache/james/utils/GuiceGenericLoader.java        | 0
 .../src/main/java/org/apache/james/utils/NamingScheme.java              | 0
 .../src/main/java/org/apache/james/utils/PackageName.java               | 0
 .../src/test/java/org/apache/james/utils/ClassNameTest.java             | 0
 .../test/java/org/apache/james/utils/ExtensionConfigurationTest.java    | 0
 .../test/java/org/apache/james/utils/FullyQualifiedClassNameTest.java   | 0
 .../src/test/java/org/apache/james/utils/NamingSchemeTest.java          | 0
 .../src/test/java/org/apache/james/utils/PackageNameTest.java           | 0
 .../src/test/resources/extensions-empty.properties                      | 0
 .../src/test/resources/extensions-none.properties                       | 0
 .../{guice-utils => utils}/src/test/resources/extensions-one.properties | 0
 .../{guice-utils => utils}/src/test/resources/extensions-two.properties | 0
 19 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index 64375a5..cb03867 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -45,7 +45,6 @@
         <module>distributed</module>
         <module>elasticsearch</module>
         <module>es-metric-reporter</module>
-        <module>guice-utils</module>
         <module>jmx</module>
         <module>jpa-common</module>
         <module>jpa-smtp-common</module>
@@ -79,6 +78,7 @@
         <module>sieve-file</module>
         <module>sieve-jpa</module>
         <module>testing</module>
+        <module>utils</module>
     </modules>
 
     <dependencyManagement>
diff --git a/server/container/guice/guice-utils/pom.xml b/server/container/guice/utils/pom.xml
similarity index 100%
rename from server/container/guice/guice-utils/pom.xml
rename to server/container/guice/utils/pom.xml
diff --git a/server/container/guice/guice-utils/src/main/java/org/apache/james/utils/ClassName.java b/server/container/guice/utils/src/main/java/org/apache/james/utils/ClassName.java
similarity index 100%
rename from server/container/guice/guice-utils/src/main/java/org/apache/james/utils/ClassName.java
rename to server/container/guice/utils/src/main/java/org/apache/james/utils/ClassName.java
diff --git a/server/container/guice/guice-utils/src/main/java/org/apache/james/utils/ExtendedClassLoader.java b/server/container/guice/utils/src/main/java/org/apache/james/utils/ExtendedClassLoader.java
similarity index 100%
rename from server/container/guice/guice-utils/src/main/java/org/apache/james/utils/ExtendedClassLoader.java
rename to server/container/guice/utils/src/main/java/org/apache/james/utils/ExtendedClassLoader.java
diff --git a/server/container/guice/guice-utils/src/main/java/org/apache/james/utils/ExtensionConfiguration.java b/server/container/guice/utils/src/main/java/org/apache/james/utils/ExtensionConfiguration.java
similarity index 100%
rename from server/container/guice/guice-utils/src/main/java/org/apache/james/utils/ExtensionConfiguration.java
rename to server/container/guice/utils/src/main/java/org/apache/james/utils/ExtensionConfiguration.java
diff --git a/server/container/guice/guice-utils/src/main/java/org/apache/james/utils/ExtensionModule.java b/server/container/guice/utils/src/main/java/org/apache/james/utils/ExtensionModule.java
similarity index 100%
rename from server/container/guice/guice-utils/src/main/java/org/apache/james/utils/ExtensionModule.java
rename to server/container/guice/utils/src/main/java/org/apache/james/utils/ExtensionModule.java
diff --git a/server/container/guice/guice-utils/src/main/java/org/apache/james/utils/FullyQualifiedClassName.java b/server/container/guice/utils/src/main/java/org/apache/james/utils/FullyQualifiedClassName.java
similarity index 100%
rename from server/container/guice/guice-utils/src/main/java/org/apache/james/utils/FullyQualifiedClassName.java
rename to server/container/guice/utils/src/main/java/org/apache/james/utils/FullyQualifiedClassName.java
diff --git a/server/container/guice/guice-utils/src/main/java/org/apache/james/utils/GuiceGenericLoader.java b/server/container/guice/utils/src/main/java/org/apache/james/utils/GuiceGenericLoader.java
similarity index 100%
rename from server/container/guice/guice-utils/src/main/java/org/apache/james/utils/GuiceGenericLoader.java
rename to server/container/guice/utils/src/main/java/org/apache/james/utils/GuiceGenericLoader.java
diff --git a/server/container/guice/guice-utils/src/main/java/org/apache/james/utils/NamingScheme.java b/server/container/guice/utils/src/main/java/org/apache/james/utils/NamingScheme.java
similarity index 100%
rename from server/container/guice/guice-utils/src/main/java/org/apache/james/utils/NamingScheme.java
rename to server/container/guice/utils/src/main/java/org/apache/james/utils/NamingScheme.java
diff --git a/server/container/guice/guice-utils/src/main/java/org/apache/james/utils/PackageName.java b/server/container/guice/utils/src/main/java/org/apache/james/utils/PackageName.java
similarity index 100%
rename from server/container/guice/guice-utils/src/main/java/org/apache/james/utils/PackageName.java
rename to server/container/guice/utils/src/main/java/org/apache/james/utils/PackageName.java
diff --git a/server/container/guice/guice-utils/src/test/java/org/apache/james/utils/ClassNameTest.java b/server/container/guice/utils/src/test/java/org/apache/james/utils/ClassNameTest.java
similarity index 100%
rename from server/container/guice/guice-utils/src/test/java/org/apache/james/utils/ClassNameTest.java
rename to server/container/guice/utils/src/test/java/org/apache/james/utils/ClassNameTest.java
diff --git a/server/container/guice/guice-utils/src/test/java/org/apache/james/utils/ExtensionConfigurationTest.java b/server/container/guice/utils/src/test/java/org/apache/james/utils/ExtensionConfigurationTest.java
similarity index 100%
rename from server/container/guice/guice-utils/src/test/java/org/apache/james/utils/ExtensionConfigurationTest.java
rename to server/container/guice/utils/src/test/java/org/apache/james/utils/ExtensionConfigurationTest.java
diff --git a/server/container/guice/guice-utils/src/test/java/org/apache/james/utils/FullyQualifiedClassNameTest.java b/server/container/guice/utils/src/test/java/org/apache/james/utils/FullyQualifiedClassNameTest.java
similarity index 100%
rename from server/container/guice/guice-utils/src/test/java/org/apache/james/utils/FullyQualifiedClassNameTest.java
rename to server/container/guice/utils/src/test/java/org/apache/james/utils/FullyQualifiedClassNameTest.java
diff --git a/server/container/guice/guice-utils/src/test/java/org/apache/james/utils/NamingSchemeTest.java b/server/container/guice/utils/src/test/java/org/apache/james/utils/NamingSchemeTest.java
similarity index 100%
rename from server/container/guice/guice-utils/src/test/java/org/apache/james/utils/NamingSchemeTest.java
rename to server/container/guice/utils/src/test/java/org/apache/james/utils/NamingSchemeTest.java
diff --git a/server/container/guice/guice-utils/src/test/java/org/apache/james/utils/PackageNameTest.java b/server/container/guice/utils/src/test/java/org/apache/james/utils/PackageNameTest.java
similarity index 100%
rename from server/container/guice/guice-utils/src/test/java/org/apache/james/utils/PackageNameTest.java
rename to server/container/guice/utils/src/test/java/org/apache/james/utils/PackageNameTest.java
diff --git a/server/container/guice/guice-utils/src/test/resources/extensions-empty.properties b/server/container/guice/utils/src/test/resources/extensions-empty.properties
similarity index 100%
rename from server/container/guice/guice-utils/src/test/resources/extensions-empty.properties
rename to server/container/guice/utils/src/test/resources/extensions-empty.properties
diff --git a/server/container/guice/guice-utils/src/test/resources/extensions-none.properties b/server/container/guice/utils/src/test/resources/extensions-none.properties
similarity index 100%
rename from server/container/guice/guice-utils/src/test/resources/extensions-none.properties
rename to server/container/guice/utils/src/test/resources/extensions-none.properties
diff --git a/server/container/guice/guice-utils/src/test/resources/extensions-one.properties b/server/container/guice/utils/src/test/resources/extensions-one.properties
similarity index 100%
rename from server/container/guice/guice-utils/src/test/resources/extensions-one.properties
rename to server/container/guice/utils/src/test/resources/extensions-one.properties
diff --git a/server/container/guice/guice-utils/src/test/resources/extensions-two.properties b/server/container/guice/utils/src/test/resources/extensions-two.properties
similarity index 100%
rename from server/container/guice/guice-utils/src/test/resources/extensions-two.properties
rename to server/container/guice/utils/src/test/resources/extensions-two.properties

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org