You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/06/30 03:24:58 UTC
[1/5] james-project git commit: JAMES-2073 EmbeddedCassandra should
launch Cassandra on random port
Repository: james-project
Updated Branches:
refs/heads/master cec7d2936 -> 45282dfde
JAMES-2073 EmbeddedCassandra should launch Cassandra on random port
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b750bbd5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b750bbd5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b750bbd5
Branch: refs/heads/master
Commit: b750bbd5c98c4759c71f70a4248c584b0c64592a
Parents: 2bf39da
Author: Antoine Duprat <ad...@linagora.com>
Authored: Tue Jun 27 14:50:41 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Fri Jun 30 10:15:45 2017 +0700
----------------------------------------------------------------------
.../backends/cassandra/CassandraCluster.java | 19 ++++++++++---------
.../backends/cassandra/EmbeddedCassandra.java | 11 ++++++++---
2 files changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b750bbd5/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
index 4511d32..40f6fbe 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
@@ -18,10 +18,11 @@
****************************************************************/
package org.apache.james.backends.cassandra;
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.Session;
-import com.datastax.driver.core.exceptions.NoHostAvailableException;
-import com.google.common.base.Throwables;
+import java.util.Optional;
+
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.CassandraTableManager;
import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
@@ -30,13 +31,13 @@ import org.apache.james.backends.cassandra.init.ClusterWithKeyspaceCreatedFactor
import org.apache.james.backends.cassandra.init.SessionWithInitializedTablesFactory;
import org.apache.james.backends.cassandra.utils.FunctionRunnerWithRetry;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import java.util.Optional;
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.exceptions.NoHostAvailableException;
+import com.google.common.base.Throwables;
public final class CassandraCluster implements AutoCloseable {
private static final String CLUSTER_IP = "localhost";
- private static final int CLUSTER_PORT_TEST = 9142;
private static final String KEYSPACE_NAME = "apache_james";
private static final int REPLICATION_FACTOR = 1;
@@ -58,7 +59,7 @@ public final class CassandraCluster implements AutoCloseable {
try {
cluster = ClusterBuilder.builder()
.host(CLUSTER_IP)
- .port(CLUSTER_PORT_TEST)
+ .port(embeddedCassandra.getPort())
.build();
session = new FunctionRunnerWithRetry(MAX_RETRY).executeAndRetrieveObject(CassandraCluster.this::tryInitializeSession);
typesProvider = new CassandraTypesProvider(module, session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/b750bbd5/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/EmbeddedCassandra.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/EmbeddedCassandra.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/EmbeddedCassandra.java
index 156bc73..ab0a331 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/EmbeddedCassandra.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/EmbeddedCassandra.java
@@ -29,6 +29,7 @@ import com.google.common.base.Throwables;
public class EmbeddedCassandra {
+ private int port;
public static EmbeddedCassandra createStartServer() {
return new EmbeddedCassandra();
@@ -36,10 +37,14 @@ public class EmbeddedCassandra {
private EmbeddedCassandra() {
try {
- EmbeddedCassandraServerHelper.startEmbeddedCassandra(TimeUnit.SECONDS.toMillis(20));
- } catch (ConfigurationException | TTransportException | IOException | InterruptedException e) {
+ EmbeddedCassandraServerHelper.startEmbeddedCassandra(EmbeddedCassandraServerHelper.CASSANDRA_RNDPORT_YML_FILE, TimeUnit.SECONDS.toMillis(20));
+ port = EmbeddedCassandraServerHelper.getNativeTransportPort();
+ } catch (ConfigurationException | TTransportException | IOException e) {
Throwables.propagate(e);
}
}
-
+
+ public int getPort() {
+ return port;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[5/5] james-project git commit: pom
Posted by bt...@apache.org.
pom
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/45282dfd
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/45282dfd
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/45282dfd
Branch: refs/heads/master
Commit: 45282dfde2ea877f0df132be3faa037a93708c06
Parents: b750bbd
Author: benwa <bt...@linagora.com>
Authored: Fri Jun 30 10:18:25 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jun 30 10:18:25 2017 +0700
----------------------------------------------------------------------
mailbox/tika/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/45282dfd/mailbox/tika/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index 18a2a2c..37fa418 100644
--- a/mailbox/tika/pom.xml
+++ b/mailbox/tika/pom.xml
@@ -209,7 +209,6 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <scope>test</scope>
<version>1.3.1</version>
<scope>test</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/5] james-project git commit: JAMES-2070 Make LDAP integration
tests pass and remove unneeded code
Posted by bt...@apache.org.
JAMES-2070 Make LDAP integration tests pass and remove unneeded 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/eca1bbf1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/eca1bbf1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/eca1bbf1
Branch: refs/heads/master
Commit: eca1bbf13477f0a4a1624af2235879a3ce785c07
Parents: cec7d29
Author: benwa <bt...@linagora.com>
Authored: Mon Jun 26 18:17:40 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jun 30 10:15:45 2017 +0700
----------------------------------------------------------------------
backends-common/elasticsearch/pom.xml | 3 ++-
mailbox/elasticsearch/pom.xml | 5 ++++
mailbox/pom.xml | 5 ++++
mailbox/tika/pom.xml | 4 +++-
mpt/pom.xml | 2 +-
.../org/apache/james/DockerCassandraRule.java | 7 +++---
.../apache/james/DockerElasticSearchRule.java | 24 --------------------
.../util/streams/SwarmGenericContainer.java | 11 ++-------
.../james/user/ldap/LdapGenericContainer.java | 4 ++--
server/pom.xml | 2 +-
.../cassandra-jmap-integration-testing/pom.xml | 5 ++++
.../memory-jmap-integration-testing/pom.xml | 5 ++++
12 files changed, 34 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/backends-common/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml
index 0f2962d..0dd2f46 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/pom.xml
@@ -178,7 +178,8 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.1.7</version>
+ <version>1.3.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/mailbox/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml
index 7288499..6c527af 100644
--- a/mailbox/elasticsearch/pom.xml
+++ b/mailbox/elasticsearch/pom.xml
@@ -280,6 +280,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 11c4341..07246d5 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -633,6 +633,11 @@
<artifactId>assertj-guava</artifactId>
<version>1.3.1</version>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <version>1.3.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/mailbox/tika/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index 6091434..18a2a2c 100644
--- a/mailbox/tika/pom.xml
+++ b/mailbox/tika/pom.xml
@@ -209,7 +209,9 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.1.7</version>
+ <scope>test</scope>
+ <version>1.3.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 9c778ab..5562035 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -496,7 +496,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.1.7</version>
+ <version>1.3.1</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
index 31c6685..1d13b79 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
@@ -25,10 +25,9 @@ import org.apache.james.modules.mailbox.CassandraSessionConfiguration;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
-import org.testcontainers.shaded.com.github.dockerjava.api.model.ExposedPort;
-import org.testcontainers.shaded.com.github.dockerjava.api.model.Ports;
-import org.testcontainers.shaded.com.github.dockerjava.api.model.Ports.Binding;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Ports;
import com.google.inject.Module;
@@ -36,7 +35,7 @@ public class DockerCassandraRule implements GuiceModuleTestRule {
private static final int CASSANDRA_PORT = 9042;
- private static boolean isBindingToEveryThing(Binding binding) {
+ private static boolean isBindingToEveryThing(Ports.Binding binding) {
String bindingIp = binding.getHostIp();
return bindingIp == null || bindingIp.equals("0.0.0.0");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
index 1102238..8c713bd 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerElasticSearchRule.java
@@ -19,15 +19,11 @@
package org.apache.james;
-import java.util.Arrays;
-
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.james.modules.mailbox.ElasticSearchConfiguration;
import org.apache.james.util.streams.SwarmGenericContainer;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
-import org.testcontainers.shaded.com.github.dockerjava.api.model.ExposedPort;
-import org.testcontainers.shaded.com.github.dockerjava.api.model.Ports.Binding;
import com.google.inject.Module;
@@ -37,11 +33,6 @@ public class DockerElasticSearchRule implements GuiceModuleTestRule {
private static final int ELASTIC_SEARCH_PORT = 9300;
public static final int ELASTIC_SEARCH_HTTP_PORT = 9200;
- private static boolean isBindingToEveryThing(Binding binding) {
- String bindingIp = binding.getHostIp();
- return bindingIp == null || bindingIp.equals("0.0.0.0");
- }
-
public PropertiesConfiguration getElasticSearchConfigurationForDocker() {
PropertiesConfiguration configuration = new PropertiesConfiguration();
@@ -82,21 +73,6 @@ public class DockerElasticSearchRule implements GuiceModuleTestRule {
return elasticSearchContainer.getIp();
}
- public int getBindingPort() {
- Binding[] bindings = elasticSearchContainer
- .getContainerInfo()
- .getNetworkSettings()
- .getPorts()
- .getBindings()
- .get(ExposedPort.tcp(ELASTIC_SEARCH_PORT));
-
- return Integer.valueOf(
- Arrays.stream(bindings)
- .filter(DockerElasticSearchRule::isBindingToEveryThing)
- .map(binding -> binding.getHostPortSpec())
- .findFirst().get());
- }
-
public SwarmGenericContainer getElasticSearchContainer() {
return elasticSearchContainer;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/server/container/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java b/server/container/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java
index 9174772..2622ea8 100644
--- a/server/container/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java
+++ b/server/container/util-java8/src/test/java/org/apache/james/util/streams/SwarmGenericContainer.java
@@ -31,8 +31,8 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.WaitStrategy;
import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.shaded.com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
import com.google.common.base.Strings;
public class SwarmGenericContainer implements TestRule {
@@ -105,14 +105,6 @@ public class SwarmGenericContainer implements TestRule {
container.stop();
}
- public String getContainerIpAddress() {
- return container.getContainerIpAddress();
- }
-
- public Integer getMappedPort(int originalPort) {
- return container.getMappedPort(originalPort);
- }
-
@SuppressWarnings("deprecation")
public String getIp() {
return getContainerInfo().getNetworkSettings().getIpAddress();
@@ -121,6 +113,7 @@ public class SwarmGenericContainer implements TestRule {
public InspectContainerResponse getContainerInfo() {
return container.getContainerInfo();
}
+
@Override
public Statement apply(Statement statement, Description description) {
return container.apply(statement, description);
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/LdapGenericContainer.java
----------------------------------------------------------------------
diff --git a/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/LdapGenericContainer.java b/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/LdapGenericContainer.java
index 3344eaa..811289e 100644
--- a/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/LdapGenericContainer.java
+++ b/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/LdapGenericContainer.java
@@ -85,8 +85,8 @@ public class LdapGenericContainer extends ExternalResource {
public String getLdapHost() {
return "ldap://" +
- container.getContainerIpAddress() +
+ container.getIp() +
":" +
- container.getMappedPort(LdapGenericContainer.DEFAULT_LDAP_PORT);
+ LdapGenericContainer.DEFAULT_LDAP_PORT;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index fd63040..4e52dae 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -182,7 +182,7 @@
<assertj-1.version>1.7.1</assertj-1.version>
<assertj-1-guava.version>1.3.1</assertj-1-guava.version>
<assertj-3.version>3.3.0</assertj-3.version>
- <testcontainers-version>1.1.7</testcontainers-version>
+ <testcontainers-version>1.3.1</testcontainers-version>
<guavate.version>1.0.0</guavate.version>
<metrics.version>3.2.1</metrics.version>
<joda.version>2.9.4</joda.version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
index 50d0d06..0b18e08 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
@@ -265,6 +265,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/james-project/blob/eca1bbf1/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
index 01f69da..f438d54 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
@@ -234,6 +234,11 @@
<artifactId>java-hamcrest</artifactId>
</dependency>
<dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.6</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/5] james-project git commit: JAMES-2070 LDAP users repository
should survive restarts
Posted by bt...@apache.org.
JAMES-2070 LDAP users repository should survive restarts
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/67629712
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/67629712
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/67629712
Branch: refs/heads/master
Commit: 67629712e3780a3dcaecd43882b4de6a879cf336
Parents: eca1bbf
Author: benwa <bt...@linagora.com>
Authored: Tue Jun 27 10:33:28 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jun 30 10:15:45 2017 +0700
----------------------------------------------------------------------
.../util/retry/naming/RetryingContext.java | 4 +++-
.../ldap/ReadOnlyUsersLDAPRepositoryTest.java | 22 ++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/67629712/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
index f355209..e67d366 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
@@ -30,6 +30,7 @@ import javax.naming.NameClassPair;
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
import javax.naming.ServiceUnavailableException;
import org.apache.james.util.retry.api.ExceptionRetryingProxy;
@@ -48,7 +49,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
static public final Class<?>[] DEFAULT_EXCEPTION_CLASSES = new Class<?>[] {
CommunicationException.class,
- ServiceUnavailableException.class };
+ ServiceUnavailableException.class,
+ NoInitialContextException.class };
private Context _delegate = null;
private RetrySchedule _schedule = null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/67629712/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java b/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
index 17b7ad8..cfc810d 100644
--- a/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
+++ b/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
@@ -46,6 +46,10 @@ public class ReadOnlyUsersLDAPRepositoryTest {
@Before
public void setup() throws Exception {
+ startLdapContainer();
+ }
+
+ private void startLdapContainer() {
ldapContainer = LdapGenericContainer.builder()
.domain(DOMAIN)
.password(ADMIN_PASSWORD)
@@ -121,6 +125,7 @@ public class ReadOnlyUsersLDAPRepositoryTest {
startUsersRepository(ldapRepositoryConfiguration());
assertThat(ldapRepository.test(UNKNOWN, PASSWORD)).isFalse();
}
+
@Test
public void knownUserShouldBeAbleToLogInWhenPasswordIsCorrectWithVirtualHosting() throws Exception {
startUsersRepository(ldapRepositoryConfigurationWithVirtualHosting());
@@ -128,6 +133,23 @@ public class ReadOnlyUsersLDAPRepositoryTest {
}
@Test
+ public void testShouldStillWorksAfterRestartingLDAP() throws Exception {
+ startUsersRepository(ldapRepositoryConfigurationWithVirtualHosting());
+ ldapRepository.test(JAMES_USER_MAIL, PASSWORD);
+
+ ldapContainer.stop();
+ try {
+ ldapRepository.test(JAMES_USER_MAIL, PASSWORD);
+ } catch (Exception e) {
+ LOGGER.info("This exception is expected as we shut down the LDAP and forced its use", e);
+ }
+ startLdapContainer();
+
+ assertThat(ldapRepository.test(JAMES_USER_MAIL, PASSWORD)).isTrue();
+ }
+
+
+ @Test
public void knownUserShouldNotBeAbleToLogInWhenPasswordIsNotCorrectWithVirtualHosting() throws Exception {
startUsersRepository(ldapRepositoryConfigurationWithVirtualHosting());
assertThat(ldapRepository.test(JAMES_USER, BAD_PASSWORD)).isFalse();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/5] james-project git commit: JAMES-2070 Fix tests container disk
space parsing issue
Posted by bt...@apache.org.
JAMES-2070 Fix tests container disk space parsing issue
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2bf39dad
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2bf39dad
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2bf39dad
Branch: refs/heads/master
Commit: 2bf39dad0f43ceaec73bb37139e6d6ef7f2bf1f2
Parents: 6762971
Author: benwa <bt...@linagora.com>
Authored: Tue Jun 27 17:32:55 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jun 30 10:15:45 2017 +0700
----------------------------------------------------------------------
.../util-java8/src/test/resources/testcontainers.properties | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bf39dad/server/container/util-java8/src/test/resources/testcontainers.properties
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/test/resources/testcontainers.properties b/server/container/util-java8/src/test/resources/testcontainers.properties
new file mode 100644
index 0000000..ec999c5
--- /dev/null
+++ b/server/container/util-java8/src/test/resources/testcontainers.properties
@@ -0,0 +1,4 @@
+# Checks are disable due to space parsing error
+# We should remove this file when upgrading to upcoming 1.4.0 version of testscontainer
+# See
+checks.disable=true
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org