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 2018/06/21 02:32:38 UTC
[1/4] james-project git commit: Fix Eclipse warning
Repository: james-project
Updated Branches:
refs/heads/master 536f3caab -> d926a617a
Fix Eclipse warning
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/83a72655
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/83a72655
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/83a72655
Branch: refs/heads/master
Commit: 83a7265507640b8231a8b8dfb02944039c2d56eb
Parents: 5ccba9a
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Tue Jun 19 15:46:23 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Thu Jun 21 09:30:42 2018 +0700
----------------------------------------------------------------------
.../apache/james/mailbox/store/ImmutableMailboxMessage.java | 7 -------
.../org/apache/james/mailbox/store/StoreMailboxManager.java | 2 +-
.../james/mailbox/store/ImmutableMailboxMessageTest.java | 2 +-
3 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/83a72655/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java
index dcc1e96..a373cfc 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ImmutableMailboxMessage.java
@@ -29,7 +29,6 @@ import javax.mail.Flags;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.NotImplementedException;
-import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.ComposedMessageId;
@@ -47,12 +46,6 @@ public class ImmutableMailboxMessage implements MailboxMessage {
public static class Factory {
- private final MailboxManager mailboxManager;
-
- public Factory(MailboxManager mailboxManager) {
- this.mailboxManager = mailboxManager;
- }
-
public ImmutableMailboxMessage from(MailboxId mailboxId, MailboxMessage message) throws MailboxException {
try {
return new ImmutableMailboxMessage(message.getMessageId(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/83a72655/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
index 3746257..da20bea 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
@@ -156,7 +156,7 @@ public class StoreMailboxManager implements MailboxManager {
this.messageIdFactory = messageIdFactory;
this.delegatingListener = delegatingListener;
this.dispatcher = mailboxEventDispatcher;
- this.immutableMailboxMessageFactory = new ImmutableMailboxMessage.Factory(this);
+ this.immutableMailboxMessageFactory = new ImmutableMailboxMessage.Factory();
this.storeRightManager = storeRightManager;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/83a72655/mailbox/store/src/test/java/org/apache/james/mailbox/store/ImmutableMailboxMessageTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/ImmutableMailboxMessageTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/ImmutableMailboxMessageTest.java
index 8a48b14..87fd38c 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/ImmutableMailboxMessageTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/ImmutableMailboxMessageTest.java
@@ -52,7 +52,7 @@ public class ImmutableMailboxMessageTest {
MailboxManager mailboxManager = mock(MailboxManager.class);
when(mailboxManager.getSupportedMessageCapabilities()).thenReturn(EnumSet.noneOf(MessageCapabilities.class));
- messageFactory = new ImmutableMailboxMessage.Factory(mailboxManager);
+ messageFactory = new ImmutableMailboxMessage.Factory();
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/4] james-project git commit: Add an empty folder to make Eclipse
happy
Posted by bt...@apache.org.
Add an empty folder to make Eclipse happy
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5ccba9a5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5ccba9a5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5ccba9a5
Branch: refs/heads/master
Commit: 5ccba9a52be44869109884dcce48cad91056e529
Parents: 536f3ca
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Tue Jun 19 15:38:29 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Thu Jun 21 09:30:42 2018 +0700
----------------------------------------------------------------------
server/container/guice/jpa-smtp/src/main/resources/.gitkeep | 0
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/5ccba9a5/server/container/guice/jpa-smtp/src/main/resources/.gitkeep
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/src/main/resources/.gitkeep b/server/container/guice/jpa-smtp/src/main/resources/.gitkeep
new file mode 100644
index 0000000..e69de29
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/4] james-project git commit: JAMES-2414 Expose message
capabilities in message manager
Posted by bt...@apache.org.
JAMES-2414 Expose message capabilities in message manager
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/35c14ca7
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/35c14ca7
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/35c14ca7
Branch: refs/heads/master
Commit: 35c14ca73bcd21a82bf010b3cdf70d7833b4fc8b
Parents: 83a7265
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Tue Jun 19 15:50:38 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Thu Jun 21 09:30:43 2018 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/james/mailbox/MessageManager.java | 3 +++
.../org/apache/james/mailbox/store/StoreMessageManager.java | 6 ++++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/35c14ca7/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java
index fbae11d..27123b3 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MessageManager.java
@@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Date;
+import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -30,6 +31,7 @@ import java.util.Optional;
import javax.mail.Flags;
+import org.apache.james.mailbox.MailboxManager.MessageCapabilities;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.UnsupportedCriteriaException;
import org.apache.james.mailbox.model.ComposedMessageId;
@@ -268,6 +270,7 @@ public interface MessageManager {
*/
MessageResultIterator getMessages(MessageRange set, FetchGroup fetchGroup, MailboxSession mailboxSession) throws MailboxException;
+ EnumSet<MessageCapabilities> getSupportedMessageCapabilities();
/**
* Gets the id of the referenced mailbox
http://git-wip-us.apache.org/repos/asf/james-project/blob/35c14ca7/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index 307994a..c3bf699 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -41,6 +41,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.TeeInputStream;
import org.apache.james.mailbox.MailboxListener;
import org.apache.james.mailbox.MailboxManager;
+import org.apache.james.mailbox.MailboxManager.MessageCapabilities;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
@@ -830,4 +831,9 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
return messageMapper.execute(
() -> messageMapper.listAllMessageUids(mailbox));
}
+
+ @Override
+ public EnumSet<MessageCapabilities> getSupportedMessageCapabilities() {
+ return messageCapabilities;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/4] james-project git commit: JAMES-2422 Change the default list
delimiter (comma is used in LDAP configuration)
Posted by bt...@apache.org.
JAMES-2422 Change the default list delimiter (comma is used in LDAP configuration)
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d926a617
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d926a617
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d926a617
Branch: refs/heads/master
Commit: d926a617ae6d17f15b73ab2c93f9f1159563f676
Parents: 35c14ca
Author: Antoine Duprat <ad...@linagora.com>
Authored: Wed Jun 20 11:01:54 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Thu Jun 21 09:31:37 2018 +0700
----------------------------------------------------------------------
.../core/configuration/FileConfigurationProvider.java | 3 +++
.../james/utils/FileConfigurationProviderTest.java | 11 ++++++++++-
.../guice/guice-common/src/test/resources/test.xml | 1 +
3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d926a617/server/container/core/src/main/java/org/apache/james/server/core/configuration/FileConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/configuration/FileConfigurationProvider.java b/server/container/core/src/main/java/org/apache/james/server/core/configuration/FileConfigurationProvider.java
index bf818cf..9fe3ed6 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/configuration/FileConfigurationProvider.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/configuration/FileConfigurationProvider.java
@@ -40,9 +40,12 @@ public class FileConfigurationProvider implements ConfigurationProvider {
private static final Logger LOGGER = LoggerFactory.getLogger(FileConfigurationProvider.class);
private static final String CONFIGURATION_FILE_SUFFIX = ".xml";
+ private static final char SEMICOLON = ';';
+
public static final HierarchicalConfiguration EMTY_CONFIGURATION = new HierarchicalConfiguration();
public static XMLConfiguration getConfig(InputStream configStream) throws ConfigurationException {
+ XMLConfiguration.setDefaultListDelimiter(SEMICOLON);
XMLConfiguration config = new XMLConfiguration();
config.setDelimiterParsingDisabled(true);
config.setAttributeSplittingDisabled(true);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d926a617/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java
index 74678ec..8fc061a 100644
--- a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java
+++ b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FileConfigurationProviderTest.java
@@ -37,12 +37,14 @@ public class FileConfigurationProviderTest {
private static final String CONFIG_KEY_4 = "james";
private static final String CONFIG_KEY_5 = "internal";
private static final String CONFIG_KEY_ENV = "env";
+ private static final String CONFIG_KEY_ENV_WITH_COMMA = "envWithComma";
private static final String CONFIG_KEY_NOT_ENV = "notEnv";
private static final String VALUE_1 = "0";
private static final String VALUE_2 = "awesome";
private static final String VALUE_3 = "james";
private static final String VALUE_NOT_ENV = "${env:MY_NOT_IN_ENV_VAR}";
private static final String ENVIRONMENT_SET_VALUE = "testvalue";
+ private static final String ENVIRONMENT_WITH_COMMA = "testvalue,testvalue2,testvalue3";
private static final String FAKE_CONFIG_KEY = "fake";
private static final String ROOT_CONFIG_KEY = "test";
private static final String CONFIG_SEPARATOR = ".";
@@ -55,6 +57,7 @@ public class FileConfigurationProviderTest {
@Before
public void setUp() {
environmentVariables.set("MY_ENV_VAR", ENVIRONMENT_SET_VALUE);
+ environmentVariables.set("MY_ENV_VAR_WITH_COMMA", ENVIRONMENT_WITH_COMMA);
environmentVariables.clear("MY_NOT_IN_ENV_VAR");
Configuration configuration = Configuration.builder()
.workingDirectory("../")
@@ -90,7 +93,7 @@ public class FileConfigurationProviderTest {
assertThat(hierarchicalConfiguration.getKeys()).containsOnly(CONFIG_KEY_1,
String.join(CONFIG_SEPARATOR, CONFIG_KEY_4, CONFIG_KEY_2),
String.join(CONFIG_SEPARATOR, CONFIG_KEY_4, CONFIG_KEY_5, CONFIG_KEY_2),
- CONFIG_KEY_ENV, CONFIG_KEY_NOT_ENV);
+ CONFIG_KEY_ENV, CONFIG_KEY_ENV_WITH_COMMA, CONFIG_KEY_NOT_ENV);
assertThat(hierarchicalConfiguration.getProperty(CONFIG_KEY_1)).isEqualTo(VALUE_1);
}
@@ -141,4 +144,10 @@ public class FileConfigurationProviderTest {
HierarchicalConfiguration hierarchicalConfiguration = configurationProvider.getConfiguration(ROOT_CONFIG_KEY);
assertThat(hierarchicalConfiguration.getString(CONFIG_KEY_ENV)).isEqualTo(ENVIRONMENT_SET_VALUE);
}
+
+ @Test
+ public void getConfigurationShouldReplaceEnvironmentVariableWithoutSplittingThemWhenSet() throws Exception {
+ HierarchicalConfiguration hierarchicalConfiguration = configurationProvider.getConfiguration(ROOT_CONFIG_KEY);
+ assertThat(hierarchicalConfiguration.getString(CONFIG_KEY_ENV_WITH_COMMA)).isEqualTo(ENVIRONMENT_WITH_COMMA);
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d926a617/server/container/guice/guice-common/src/test/resources/test.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/test/resources/test.xml b/server/container/guice/guice-common/src/test/resources/test.xml
index d34c3c4..771a0cc 100644
--- a/server/container/guice/guice-common/src/test/resources/test.xml
+++ b/server/container/guice/guice-common/src/test/resources/test.xml
@@ -26,5 +26,6 @@
</internal>
</james>
<env>${env:MY_ENV_VAR}</env>
+ <envWithComma>${env:MY_ENV_VAR_WITH_COMMA}</envWithComma>
<notEnv>${env:MY_NOT_IN_ENV_VAR}</notEnv>
</test>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org