JAMES-1693 Guice compilation for specific backends should be activated by specific profiles
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/583b48f5 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/583b48f5 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/583b48f5 Branch: refs/heads/master Commit: 583b48f5312f6638e4bedab9d4773c9bba1fbee7 Parents: 517a4cf Author: Benoit Tellier <btell...@linagora.com> Authored: Tue Mar 8 16:24:35 2016 +0700 Committer: Matthieu Baechler <matthieu.baech...@linagora.com> Committed: Wed Mar 23 17:07:13 2016 +0100 ---------------------------------------------------------------------- server/container/guice/cassandra-guice/pom.xml | 4 +- server/container/guice/guice-common/pom.xml | 4 +- server/container/guice/memory-guice/pom.xml | 4 +- server/container/guice/pom.xml | 57 +++++++++++++++++++++ server/pom.xml | 4 +- 5 files changed, 64 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/583b48f5/server/container/guice/cassandra-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index d2b642d..31d62da 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -24,9 +24,9 @@ <parent> <groupId>org.apache.james</groupId> - <artifactId>james-server</artifactId> + <artifactId>james-server-guice</artifactId> <version>3.0.0-beta5-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>james-server-cassandra-guice</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/583b48f5/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 291aa47..ed86fb0 100644 --- a/server/container/guice/guice-common/pom.xml +++ b/server/container/guice/guice-common/pom.xml @@ -3,10 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <artifactId>james-server</artifactId> + <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> <version>3.0.0-beta5-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/james-project/blob/583b48f5/server/container/guice/memory-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml index 83aec4a..393d866 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/container/guice/memory-guice/pom.xml @@ -24,9 +24,9 @@ <parent> <groupId>org.apache.james</groupId> - <artifactId>james-server</artifactId> + <artifactId>james-server-guice</artifactId> <version>3.0.0-beta5-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>james-server-memory-guice</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/583b48f5/server/container/guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml new file mode 100644 index 0000000..8c695e8 --- /dev/null +++ b/server/container/guice/pom.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>james-server</artifactId> + <groupId>org.apache.james</groupId> + <version>3.0.0-beta5-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <artifactId>james-server-guice</artifactId> + <name>Apache James :: Server :: Guice</name> + <packaging>pom</packaging> + + <modules> + <module>guice-common</module> + </modules> + + <profiles> + <profile> + <id>cassandra</id> + <modules> + <module>cassandra-guice</module> + </modules> + </profile> + <profile> + <id>inmemory</id> + <modules> + <module>memory-guice</module> + </modules> + </profile> + </profiles> +</project> + http://git-wip-us.apache.org/repos/asf/james-project/blob/583b48f5/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 910d58f..ae05069 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -58,9 +58,7 @@ <module>karaf/features</module> <module>karaf/integration</module> - <module>container/guice/cassandra-guice</module> - <module>container/guice/memory-guice</module> - <module>container/guice/guice-common</module> + <module>container/guice</module> <module>container/cli</module> <module>container/core</module> <module>container/filesystem-api</module> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
