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 849e63c6a3d9b5af9ee7f1dd08ca0509492d2ed1 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Jun 10 14:41:19 2021 +0700 JAMES-3596 Move Distributed app LDAP tests in server/apps folder --- pom.xml | 8 ++++++- server/apps/cassandra-app-ldap-tests/pom.xml | 2 +- .../distributed-ldap-tests}/pom.xml | 25 ++++++++++++++++----- .../CassandraRabbitMQLdapJmapJamesServerTest.java | 0 .../src/test/resources/dnsservice.xml | 0 .../src/test/resources/domainlist.xml | 0 .../src/test/resources/fakemailrepositorystore.xml | 0 .../src/test/resources/imapserver.xml | 0 .../src/test/resources/keystore | Bin .../src/test/resources/lmtpserver.xml | 0 .../src/test/resources/mailetcontainer.xml | 0 .../src/test/resources/mailrepositorystore.xml | 0 .../src/test/resources/managesieveserver.xml | 0 .../src/test/resources/pop3server.xml | 0 .../src/test/resources/smtpserver.xml | 0 server/container/guice/pom.xml | 8 ------- server/pom.xml | 1 + 17 files changed, 28 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index cff6211..e8a926b 100644 --- a/pom.xml +++ b/pom.xml @@ -1280,11 +1280,17 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-ldap-guice</artifactId> + <artifactId>james-server-cassandra-app-ldap-tests</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-cassandra-app-ldap-tests</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-cli</artifactId> <version>${project.version}</version> </dependency> diff --git a/server/apps/cassandra-app-ldap-tests/pom.xml b/server/apps/cassandra-app-ldap-tests/pom.xml index 997b67c..713b1cc 100644 --- a/server/apps/cassandra-app-ldap-tests/pom.xml +++ b/server/apps/cassandra-app-ldap-tests/pom.xml @@ -28,7 +28,7 @@ <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>james-server-cassandra-app-ldap-tessts</artifactId> + <artifactId>james-server-cassandra-app-ldap-tests</artifactId> <packaging>jar</packaging> <name>Apache James :: Server :: Cassandra App :: LDAP tests</name> diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml b/server/apps/distributed-ldap-tests/pom.xml similarity index 84% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml rename to server/apps/distributed-ldap-tests/pom.xml index 939d3f0..dd3e0c0 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml +++ b/server/apps/distributed-ldap-tests/pom.xml @@ -21,15 +21,28 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.james</groupId> - <artifactId>james-server-guice</artifactId> + <artifactId>james-server</artifactId> <version>3.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> - <artifactId>james-server-cassandra-rabbitmq-ldap-guice</artifactId> + <artifactId>james-server-distributed-ldap-tests</artifactId> + + <name>Apache James :: Server :: Distributed :: LDAP tests</name> + <description>Tests for the distributed servers backed by LDAP user authentication</description> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> - <name>Apache James :: Server :: Cassandra/Ldap with RabbitMQ - guice injection</name> - <description>An advanced email server - Cassandra/Ldap backend and RabbitMQ messaging with guice injection</description> <dependencies> <dependency> <groupId>${james.groupId}</groupId> @@ -69,7 +82,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-ldap-guice</artifactId> + <artifactId>james-server-cassandra-app-ldap-tests</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java b/server/apps/distributed-ldap-tests/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java rename to server/apps/distributed-ldap-tests/src/test/java/org/apache/james/CassandraRabbitMQLdapJmapJamesServerTest.java diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/dnsservice.xml b/server/apps/distributed-ldap-tests/src/test/resources/dnsservice.xml similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/dnsservice.xml rename to server/apps/distributed-ldap-tests/src/test/resources/dnsservice.xml diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/domainlist.xml b/server/apps/distributed-ldap-tests/src/test/resources/domainlist.xml similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/domainlist.xml rename to server/apps/distributed-ldap-tests/src/test/resources/domainlist.xml diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/fakemailrepositorystore.xml b/server/apps/distributed-ldap-tests/src/test/resources/fakemailrepositorystore.xml similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/fakemailrepositorystore.xml rename to server/apps/distributed-ldap-tests/src/test/resources/fakemailrepositorystore.xml diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/imapserver.xml b/server/apps/distributed-ldap-tests/src/test/resources/imapserver.xml similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/imapserver.xml rename to server/apps/distributed-ldap-tests/src/test/resources/imapserver.xml diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/keystore b/server/apps/distributed-ldap-tests/src/test/resources/keystore similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/keystore rename to server/apps/distributed-ldap-tests/src/test/resources/keystore diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/lmtpserver.xml b/server/apps/distributed-ldap-tests/src/test/resources/lmtpserver.xml similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/lmtpserver.xml rename to server/apps/distributed-ldap-tests/src/test/resources/lmtpserver.xml diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailetcontainer.xml b/server/apps/distributed-ldap-tests/src/test/resources/mailetcontainer.xml similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailetcontainer.xml rename to server/apps/distributed-ldap-tests/src/test/resources/mailetcontainer.xml diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailrepositorystore.xml b/server/apps/distributed-ldap-tests/src/test/resources/mailrepositorystore.xml similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/mailrepositorystore.xml rename to server/apps/distributed-ldap-tests/src/test/resources/mailrepositorystore.xml diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/managesieveserver.xml b/server/apps/distributed-ldap-tests/src/test/resources/managesieveserver.xml similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/managesieveserver.xml rename to server/apps/distributed-ldap-tests/src/test/resources/managesieveserver.xml diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/pop3server.xml b/server/apps/distributed-ldap-tests/src/test/resources/pop3server.xml similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/pop3server.xml rename to server/apps/distributed-ldap-tests/src/test/resources/pop3server.xml diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/smtpserver.xml b/server/apps/distributed-ldap-tests/src/test/resources/smtpserver.xml similarity index 100% rename from server/container/guice/cassandra-rabbitmq-ldap-guice/src/test/resources/smtpserver.xml rename to server/apps/distributed-ldap-tests/src/test/resources/smtpserver.xml diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index b028a6d..e42fed7 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -38,7 +38,6 @@ <module>blob/memory</module> <module>blob/s3</module> <module>cassandra</module> - <module>cassandra-rabbitmq-ldap-guice</module> <module>configuration</module> <module>data-cassandra</module> <module>data-ldap</module> @@ -93,13 +92,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-ldap-guice</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-cassandra</artifactId> <version>${project.version}</version> </dependency> diff --git a/server/pom.xml b/server/pom.xml index 2f8e4f0..5295431 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -43,6 +43,7 @@ <module>apps/cli</module> <module>apps/cli-integration-tests</module> <module>apps/distributed-app</module> + <module>apps/distributed-ldap-tests</module> <module>apps/spring-app</module> <module>apps/webadmin-cli</module> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
