JAMES-1738 Guice serve should use imported Onami code
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e8ef39ca Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e8ef39ca Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e8ef39ca Branch: refs/heads/master Commit: e8ef39ca99f40d99eba206d16f2215e786b8bc8c Parents: 7de2a01 Author: Benoit Tellier <[email protected]> Authored: Wed Oct 5 11:50:08 2016 +0200 Committer: Benoit Tellier <[email protected]> Committed: Wed Oct 5 14:57:39 2016 +0200 ---------------------------------------------------------------------- server/container/guice/guice-common/pom.xml | 8 ++++---- .../src/main/java/org/apache/james/GuiceJamesServer.java | 2 +- .../org/apache/james/modules/CommonServicesModule.java | 2 +- server/pom.xml | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/e8ef39ca/server/container/guice/guice-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml index 72b7188..37d27a8 100644 --- a/server/container/guice/guice-common/pom.xml +++ b/server/container/guice/guice-common/pom.xml @@ -226,6 +226,10 @@ <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> </dependency> @@ -255,10 +259,6 @@ <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> <version>${assertj-3.version}</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/e8ef39ca/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java ---------------------------------------------------------------------- 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 index d3ed9f3..39411b0 100644 --- 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.jmap.JMAPServer; 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; http://git-wip-us.apache.org/repos/asf/james-project/blob/e8ef39ca/server/container/guice/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/CommonServicesModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java index c91eb6f..e79ed7f 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java @@ -32,8 +32,8 @@ import org.apache.james.filesystem.api.JamesDirectoriesProvider; 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; http://git-wip-us.apache.org/repos/asf/james-project/blob/e8ef39ca/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 648f5bc..c087d0c 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -226,6 +226,11 @@ </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> <version>${project.version}</version> <type>test-jar</type> @@ -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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
