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 847d17c5a743c0304f8901c8ac99c3dd65ab4ced
Author: Jean Helou <[email protected]>
AuthorDate: Thu Nov 5 10:42:31 2020 +0100

    JAMES-1902 Moves activemq mailqueue guice binding
---
 server/container/guice/pom.xml                             | 14 ++++++++------
 server/container/guice/{ => queue}/activemq/pom.xml        |  2 +-
 .../apache/james/modules/activemq/ActiveMQQueueModule.java |  0
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index 392a3fe..aeb364f 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -33,7 +33,7 @@
     <name>Apache James :: Server :: Guice</name>
 
     <modules>
-        <module>activemq</module>
+
         <module>blob-api-guice</module>
         <module>blob-export-guice</module>
         <module>blob-memory-guice</module>
@@ -76,6 +76,7 @@
         <module>protocols/webadmin-rabbitmq-mailqueue</module>
         <module>protocols/webadmin-swagger</module>
         <module>protocols/webadmin-mail-over-web</module>
+        <module>queue/activemq</module>
         <module>rabbitmq</module>
         <module>testing</module>
         <module>sieve-file</module>
@@ -98,6 +99,11 @@
             </dependency>
             <dependency>
                 <groupId>${james.groupId}</groupId>
+                <artifactId>james-server-guice-activemq</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${james.groupId}</groupId>
                 <artifactId>james-server-guice-configuration</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -157,11 +163,7 @@
                 <artifactId>james-server-guice-pop</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${james.groupId}</groupId>
-                <artifactId>james-server-guice-activemq</artifactId>
-                <version>${project.version}</version>
-            </dependency>
+
             <dependency>
                 <groupId>${james.groupId}</groupId>
                 <artifactId>james-server-guice-rabbitmq</artifactId>
diff --git a/server/container/guice/activemq/pom.xml 
b/server/container/guice/queue/activemq/pom.xml
similarity index 97%
rename from server/container/guice/activemq/pom.xml
rename to server/container/guice/queue/activemq/pom.xml
index efabaaa..2268141 100644
--- a/server/container/guice/activemq/pom.xml
+++ b/server/container/guice/queue/activemq/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
         <version>3.6.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>james-server-guice-activemq</artifactId>
diff --git 
a/server/container/guice/activemq/src/main/java/org/apache/james/modules/activemq/ActiveMQQueueModule.java
 
b/server/container/guice/queue/activemq/src/main/java/org/apache/james/modules/activemq/ActiveMQQueueModule.java
similarity index 100%
rename from 
server/container/guice/activemq/src/main/java/org/apache/james/modules/activemq/ActiveMQQueueModule.java
rename to 
server/container/guice/queue/activemq/src/main/java/org/apache/james/modules/activemq/ActiveMQQueueModule.java


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to