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 2019/10/14 03:29:17 UTC
[james-project] 02/04: JAMES-2915 Solve minor issue in server/app
configuration
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 2e97883007a8236e2a11d9aa5633648df1e7e872
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Oct 8 16:58:49 2019 +0700
JAMES-2915 Solve minor issue in server/app configuration
A miss configuration prevented James to start by default
---
.../mailbox/lucene/search/LuceneMessageSearchIndex.java | 2 +-
server/app/src/main/resources/mailetcontainer.xml | 2 +-
.../org/apache/james/app/spring/JamesAppSpringMainTest.java | 2 --
.../org/apache/james/app/spring/JamesSpringContextTest.java | 13 ++-----------
4 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
index 87dcdd3..5f76b0c 100644
--- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
+++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
@@ -138,7 +138,7 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
private static final Logger LOGGER = LoggerFactory.getLogger(LuceneMessageSearchIndex.class);
private static final Date MAX_DATE;
private static final Date MIN_DATE;
- private static final org.apache.james.mailbox.events.Group GROUP = new LuceneMessageSearchIndexGroup();
+ public static final org.apache.james.mailbox.events.Group GROUP = new LuceneMessageSearchIndexGroup();
static {
Calendar cal = Calendar.getInstance();
diff --git a/server/app/src/main/resources/mailetcontainer.xml b/server/app/src/main/resources/mailetcontainer.xml
index 5f08bab..bb98c7c 100644
--- a/server/app/src/main/resources/mailetcontainer.xml
+++ b/server/app/src/main/resources/mailetcontainer.xml
@@ -57,7 +57,7 @@
<mailet match="RelayLimit=30" class="Null"/>
<mailet matcher="All" class="WithPriority">
- <value>8</value>
+ <priority>8</priority>
</mailet>
<mailet matcher="HasPriority=8" class="Null"/>
diff --git a/server/app/src/test/java/org/apache/james/app/spring/JamesAppSpringMainTest.java b/server/app/src/test/java/org/apache/james/app/spring/JamesAppSpringMainTest.java
index 5e0e11f..411e66e 100644
--- a/server/app/src/test/java/org/apache/james/app/spring/JamesAppSpringMainTest.java
+++ b/server/app/src/test/java/org/apache/james/app/spring/JamesAppSpringMainTest.java
@@ -18,12 +18,10 @@
****************************************************************/
package org.apache.james.app.spring;
-import org.junit.Ignore;
import org.junit.Test;
public class JamesAppSpringMainTest {
- @Ignore("JAMES-2915 James default configuration in server/app fails")
@Test
public void testServer() throws Exception {
JamesAppSpringMain.main(null);
diff --git a/server/app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java b/server/app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java
index 9480061..b5ab749 100644
--- a/server/app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java
+++ b/server/app/src/test/java/org/apache/james/app/spring/JamesSpringContextTest.java
@@ -22,22 +22,14 @@ package org.apache.james.app.spring;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.container.spring.context.JamesServerApplicationContext;
-import org.apache.james.mailbox.events.Group;
import org.apache.james.mailbox.events.InVMEventBus;
+import org.apache.james.mailbox.lucene.search.LuceneMessageSearchIndex;
import org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater;
-import org.assertj.core.api.Condition;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class JamesSpringContextTest {
- private static final Condition<Group> QUOTA_UPDATER_LISTENER = new Condition<Group>() {
- @Override
- public boolean matches(Group group) {
- return ListeningCurrentQuotaUpdater.GROUP.equals(group);
- }
- };
- private static final int ONCE = 1;
private JamesServerApplicationContext context;
@Before
@@ -58,7 +50,6 @@ public class JamesSpringContextTest {
InVMEventBus eventBus = context.getBean(InVMEventBus.class);
assertThat(eventBus.registeredGroups())
- .areExactly(ONCE, QUOTA_UPDATER_LISTENER);
+ .containsExactlyInAnyOrder(ListeningCurrentQuotaUpdater.GROUP, LuceneMessageSearchIndex.GROUP);
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org