james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From btell...@apache.org
Subject [2/7] james-project git commit: JAMES-2441 Remove other profiles disabling tests
Date Wed, 04 Jul 2018 02:37:29 GMT
JAMES-2441 Remove other profiles disabling tests


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4b18ba75
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4b18ba75
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4b18ba75

Branch: refs/heads/master
Commit: 4b18ba75ec2865cbcb856a508fd209806a67c893
Parents: 8992243
Author: benwa <btellier@linagora.com>
Authored: Wed Jun 27 11:36:07 2018 +0700
Committer: benwa <btellier@linagora.com>
Committed: Wed Jul 4 09:31:24 2018 +0700

----------------------------------------------------------------------
 .../init/configuration/ClusterConfiguration.java   |  1 +
 mpt/impl/imap-mailbox/pom.xml                      | 17 -----------------
 mpt/impl/managesieve/core/pom.xml                  | 15 ---------------
 server/container/guice/cassandra-guice/pom.xml     | 13 -------------
 .../mailbox/ElasticSearchConfiguration.java        |  4 ++--
 .../org/apache/james/FixingGhostMailboxTest.java   | 16 +++++-----------
 server/container/guice/jpa-common-guice/pom.xml    | 13 -------------
 7 files changed, 8 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/4b18ba75/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
index 4b15a5f..a4731d8 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
@@ -176,6 +176,7 @@ public class ClusterConfiguration {
     }
 
     public static ClusterConfiguration from(PropertiesConfiguration configuration) {
+        configuration.setListDelimiter(',');
         return ClusterConfiguration.builder()
             .hosts(listCassandraServers(configuration))
             .keyspace(Optional.ofNullable(configuration.getString(CASSANDRA_KEYSPACE, null)))

http://git-wip-us.apache.org/repos/asf/james-project/blob/4b18ba75/mpt/impl/imap-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/pom.xml b/mpt/impl/imap-mailbox/pom.xml
index c2f9119..b8b6c83 100644
--- a/mpt/impl/imap-mailbox/pom.xml
+++ b/mpt/impl/imap-mailbox/pom.xml
@@ -111,21 +111,4 @@
         </dependencies>
     </dependencyManagement>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <excludes>
-                            <exclude>**/suite/*.java</exclude>
-                            <exclude>**/suite/**/*.java</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4b18ba75/mpt/impl/managesieve/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/core/pom.xml b/mpt/impl/managesieve/core/pom.xml
index 9773cd1..fb089de 100644
--- a/mpt/impl/managesieve/core/pom.xml
+++ b/mpt/impl/managesieve/core/pom.xml
@@ -61,19 +61,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/suite/*.java</exclude>
-                        <exclude>**/suite/**/*.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4b18ba75/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 9ec854d..2ed3a87 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -289,19 +289,6 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/suite/*.java</exclude>
-                        <exclude>**/suite/**/*.java</exclude>
-                    </excludes>
-                    <includes>
-                        <include>${cassandra.includes}</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4b18ba75/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchConfiguration.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchConfiguration.java
b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchConfiguration.java
index b4966ff..d8589fa 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchConfiguration.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/ElasticSearchConfiguration.java
@@ -227,8 +227,8 @@ public class ElasticSearchConfiguration {
             .writeAliasQuotaRatioName(computeQuotaSearchWriteAlias(configuration))
             .nbShards(Optional.ofNullable(configuration.getInteger(ELASTICSEARCH_NB_SHARDS,
null)))
             .nbReplica(Optional.ofNullable(configuration.getInteger(ELASTICSEARCH_NB_REPLICA,
null)))
-            .minDelay(Optional.ofNullable(configuration.getInteger(ELASTICSEARCH_RETRY_CONNECTION_MAX_RETRIES,
null)))
-            .maxRetries(Optional.ofNullable(configuration.getInteger(ELASTICSEARCH_RETRY_CONNECTION_MIN_DELAY,
null)))
+            .minDelay(Optional.ofNullable(configuration.getInteger(ELASTICSEARCH_RETRY_CONNECTION_MIN_DELAY,
null)))
+            .maxRetries(Optional.ofNullable(configuration.getInteger(ELASTICSEARCH_RETRY_CONNECTION_MAX_RETRIES,
null)))
             .indexAttachment(provideIndexAttachments(configuration))
             .build();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/4b18ba75/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
index b640d44..3b10005 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
@@ -41,13 +41,10 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.james.backends.cassandra.ContainerLifecycleConfiguration;
-import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.mailbox.MessageManager.AppendCommand;
 import org.apache.james.mailbox.cassandra.mail.task.MailboxMergingTask;
-import org.apache.james.mailbox.cassandra.mail.utils.MailboxBaseTupleUtil;
-import org.apache.james.mailbox.cassandra.modules.CassandraMailboxModule;
-import org.apache.james.mailbox.cassandra.table.CassandraMailboxPathTable;
+import org.apache.james.mailbox.cassandra.table.CassandraMailboxPathV2Table;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.ComposedMessageId;
 import org.apache.james.mailbox.model.MailboxACL;
@@ -110,8 +107,6 @@ public class FixingGhostMailboxTest {
     private MailboxProbeImpl mailboxProbe;
     private ACLProbe aclProbe;
     private Session session;
-    private CassandraTypesProvider cassandraTypesProvider;
-    private MailboxBaseTupleUtil mailboxBaseTupleUtil;
     private ComposedMessageId message1;
     private MailboxId aliceGhostInboxId;
     private MailboxPath aliceInboxPath;
@@ -155,8 +150,6 @@ public class FixingGhostMailboxTest {
             .withPort(cassandra.getMappedPort(9042))
             .build()
             .connect(jmapServer.getProbe(CassandraProbe.class).getKeyspace());
-        cassandraTypesProvider = new CassandraTypesProvider(new CassandraMailboxModule(),
session);
-        mailboxBaseTupleUtil = new MailboxBaseTupleUtil(cassandraTypesProvider);
 
         simulateGhostMailboxBug();
     }
@@ -171,9 +164,10 @@ public class FixingGhostMailboxTest {
         rule.await();
 
         // Simulate ghost mailbox bug
-        session.execute(delete().from(CassandraMailboxPathTable.TABLE_NAME)
-            .where(eq(CassandraMailboxPathTable.NAMESPACE_AND_USER, mailboxBaseTupleUtil.createMailboxBaseUDT(MailboxConstants.USER_NAMESPACE,
alice)))
-            .and(eq(CassandraMailboxPathTable.MAILBOX_NAME, MailboxConstants.INBOX)));
+        session.execute(delete().from(CassandraMailboxPathV2Table.TABLE_NAME)
+            .where(eq(CassandraMailboxPathV2Table.NAMESPACE, MailboxConstants.USER_NAMESPACE))
+            .and(eq(CassandraMailboxPathV2Table.USER, alice))
+            .and(eq(CassandraMailboxPathV2Table.MAILBOX_NAME, MailboxConstants.INBOX)));
 
         // trigger provisioning
         given()

http://git-wip-us.apache.org/repos/asf/james-project/blob/4b18ba75/server/container/guice/jpa-common-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-common-guice/pom.xml b/server/container/guice/jpa-common-guice/pom.xml
index 237b795..5dea390 100644
--- a/server/container/guice/jpa-common-guice/pom.xml
+++ b/server/container/guice/jpa-common-guice/pom.xml
@@ -60,19 +60,6 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/suite/*.java</exclude>
-                        <exclude>**/suite/**/*.java</exclude>
-                    </excludes>
-                    <includes>
-                        <include>${jpa.includes}</include>
-                    </includes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message