JAMES-1738 Guice serve should use imported Onami code

apache · Oct 5, 2016 · e8ef39c · e8ef39c
1 parent 7de2a01
commit e8ef39c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml
@@ -225,6 +225,10 @@
                     <groupId>${project.groupId}</groupId>
                     <artifactId>james-server-queue-activemq</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>james-server-onami</artifactId>
+                </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>
                     <artifactId>james-server-webadmin</artifactId>
@@ -254,10 +258,6 @@
                     <artifactId>rest-assured</artifactId>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
-                    <groupId>org.apache.onami.lifecycle</groupId>
-                    <artifactId>org.apache.onami.lifecycle.jsr250</artifactId>
-                </dependency>
                 <dependency>
                     <groupId>org.assertj</groupId>
                     <artifactId>assertj-core</artifactId>

diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
@@ -27,12 +27,12 @@
 import org.apache.james.modules.CommonServicesModule;
 import org.apache.james.modules.MailetProcessingModule;
 import org.apache.james.modules.ProtocolsModule;
+import org.apache.james.onami.lifecycle.Stager;
 import org.apache.james.utils.ConfigurationsPerformer;
 import org.apache.james.utils.ExtendedServerProbe;
 import org.apache.james.utils.GuiceServerProbe;
 import org.apache.james.webadmin.Port;
 import org.apache.james.webadmin.WebAdminServer;
-import org.apache.onami.lifecycle.core.Stager;
 
 import com.google.common.collect.Iterables;
 import com.google.inject.Guice;

diff --git a/...ainer/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java b/...ainer/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java
@@ -32,8 +32,8 @@
 import org.apache.james.modules.server.AsyncTasksExecutorModule;
 import org.apache.james.modules.server.ConfigurationProviderModule;
 import org.apache.james.modules.server.DNSServiceModule;
+import org.apache.james.onami.lifecycle.PreDestroyModule;
 import org.apache.james.utils.GuiceServerProbe;
-import org.apache.onami.lifecycle.jsr250.PreDestroyModule;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;

diff --git a/server/pom.xml b/server/pom.xml
@@ -224,6 +224,11 @@
                 <artifactId>james-server-guice-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>james-server-onami</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.james</groupId>
                 <artifactId>james-server-guice-common</artifactId>
@@ -1390,11 +1395,6 @@
                 <artifactId>asyncretry</artifactId>
                 <version>0.0.7</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.onami.lifecycle</groupId>
-                <artifactId>org.apache.onami.lifecycle.jsr250</artifactId>
-                <version>0.2.0-SNAPSHOT</version>
-            </dependency>
 
             <!-- Apache Felix Karaf integration -->
             <dependency>