[jira] [Created] (JAMES-2068) Update JSIEVE version to latest 0.7

2017-06-22 Thread Tellier Benoit (JIRA) 
Tellier Benoit created JAMES-2068:
-

 Summary: Update JSIEVE version to latest 0.7
 Key: JAMES-2068
 URL: https://issues.apache.org/jira/browse/JAMES-2068
 Project: James Server
  Issue Type: Task
  Components: Build System
Reporter: Tellier Benoit


JSieve 0.7 has just been released.

We need to update the James dependency to not depend on SNAPSHOT for future 
releases.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

[jira] [Created] (JAMES-2067) Write a post about recent JSIEVE 0.7 release

2017-06-22 Thread Tellier Benoit (JIRA) 
Tellier Benoit created JAMES-2067:
-

 Summary: Write a post about recent JSIEVE 0.7 release
 Key: JAMES-2067
 URL: https://issues.apache.org/jira/browse/JAMES-2067
 Project: James Server
  Issue Type: Task
  Components: Documentation
Reporter: Tellier Benoit


We need to write a post about this release



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

Closing vote: JSIEVE version 0.7

2017-06-22 Thread Benoit Tellier 
Hi,

I am very happy to tell you, that after a majority approval process, the
release for jsieve 0.7 have been accepted.

Here are the voting results:
 - 5 up-votes for this release, including 4 binding votes
 - no down votes.

This release includes:

 - Some header sanitizing (unwrap + decode)
 - An added action for Discarding a mail. This allow easier use of
JSieve library as this handling is no more implicit.

I will now:
 - Write a  post and tweet about this release
 - Publish artifacts on maven central
 - Update James server dependency

Cheers,

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

[jira] [Updated] (MAILBOX-300) JPA should fail gracefully when too long mailbox name

2017-06-22 Thread Tellier Benoit (JIRA) 

 [ 
https://issues.apache.org/jira/browse/MAILBOX-300?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit updated MAILBOX-300:
---
Labels: easy-fix newbie  (was: )

> JPA  should fail gracefully when too long mailbox name
> --
>
> Key: MAILBOX-300
> URL: https://issues.apache.org/jira/browse/MAILBOX-300
> Project: James Mailbox
>  Issue Type: Bug
>  Components: jpa
>Reporter: Tellier Benoit
>  Labels: easy-fix, newbie
>
> We need to:
>  - Find the limit
>  - Throw a MailboxException when overpassed
>  - Re-enable JpaMailboxWithLongNameError



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

[jira] [Updated] (MAILBOX-299) Maildir should fail gracefully when mailbox name is too long

2017-06-22 Thread Tellier Benoit (JIRA) 

 [ 
https://issues.apache.org/jira/browse/MAILBOX-299?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit updated MAILBOX-299:
---
 Labels: easy-fix newbie  (was: )
Component/s: maildir

> Maildir should fail gracefully when mailbox name is too long
> 
>
> Key: MAILBOX-299
> URL: https://issues.apache.org/jira/browse/MAILBOX-299
> Project: James Mailbox
>  Issue Type: Bug
>  Components: maildir
>Reporter: Tellier Benoit
>  Labels: easy-fix, newbie
>
> We need to:
>  - find maximum mailbox name length
>  - Ensure this limit is not overpassed
>  - Throw overwise
>  - Re-enable MPT tests in MaildirMailboxWithLongNameError



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

[jira] [Created] (MAILBOX-300) JPA should fail gracefully when too long mailbox name

2017-06-22 Thread Tellier Benoit (JIRA) 
Tellier Benoit created MAILBOX-300:
--

 Summary: JPA  should fail gracefully when too long mailbox name
 Key: MAILBOX-300
 URL: https://issues.apache.org/jira/browse/MAILBOX-300
 Project: James Mailbox
  Issue Type: Bug
  Components: jpa
Reporter: Tellier Benoit


We need to:
 - Find the limit
 - Throw a MailboxException when overpassed
 - Re-enable JpaMailboxWithLongNameError



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

[jira] [Created] (MAILBOX-299) Maildir should fail gracefully when mailbox name is too long

2017-06-22 Thread Tellier Benoit (JIRA) 
Tellier Benoit created MAILBOX-299:
--

 Summary: Maildir should fail gracefully when mailbox name is too 
long
 Key: MAILBOX-299
 URL: https://issues.apache.org/jira/browse/MAILBOX-299
 Project: James Mailbox
  Issue Type: Bug
Reporter: Tellier Benoit


We need to:
 - find maximum mailbox name length
 - Ensure this limit is not overpassed
 - Throw overwise
 - Re-enable MPT tests in MaildirMailboxWithLongNameError



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

[jira] [Resolved] (JAMES-2064) Can not authenticate with curl

2017-06-22 Thread Tellier Benoit (JIRA) 

 [ 
https://issues.apache.org/jira/browse/JAMES-2064?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit resolved JAMES-2064.
---
Resolution: Fixed

https://github.com/linagora/james-project/pull/855 solved this

> Can not authenticate with curl
> --
>
> Key: JAMES-2064
> URL: https://issues.apache.org/jira/browse/JAMES-2064
> Project: James Server
>  Issue Type: Bug
>  Components: IMAPServer
>Reporter: Tellier Benoit
>
> Here is the recorded commands:
> {code:java}
> benwa@horizon ~/Documents/apache/onssd/james-project (git)-[JAMES-1789-2] % 
> curl -u btell...@linagora.com -v imap://openpaas.linagora.com/INBOX/
> Enter host password for user 'btell...@linagora.com':
> *   Trying 109.197.180.230...
> * TCP_NODELAY set
> * Connected to openpaas.linagora.com (109.197.180.230) port 143 (#0)
> < * OK JAMES IMAP4rev1 Server  Server james.openpaas.linagora.com is ready.
> > A001 CAPABILITY
> < * CAPABILITY NAMESPACE QUOTA IMAP4rev1 QRESYNC UNSELECT WITHIN SASL-IR ACL 
> ENABLE SEARCHRES UIDPLUS CHILDREN AUTH=PLAIN LITERAL+ MOVE ANNOTATION ESEARCH 
> IDLE I18NLEVEL=1 STARTTLS
> < A001 OK CAPABILITY completed.
> > A002 AUTHENTICATE PLAIN YnRlmQ=
> < A002 NO AUTHENTICATE Not an admin
> * Closing connection 0
> {code}
> The corresponding log is: 
> https://openpaas.linagora.com/viewlogs/app/kibana#/doc/logs-*/logs-2017-06-15/tester/?id=AVyq9YEGzFPejjEzie5O
> Apparently IMAP command parsing for authenticate leads to thinks it is 
> delegation, when it is not...
> Digging a bit more it turns out the login was on the form 
> "\0user\0user\0password"
> So self delegation...



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

[jira] [Closed] (JAMES-2064) Can not authenticate with curl

2017-06-22 Thread Tellier Benoit (JIRA) 

 [ 
https://issues.apache.org/jira/browse/JAMES-2064?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit closed JAMES-2064.
-

> Can not authenticate with curl
> --
>
> Key: JAMES-2064
> URL: https://issues.apache.org/jira/browse/JAMES-2064
> Project: James Server
>  Issue Type: Bug
>  Components: IMAPServer
>Reporter: Tellier Benoit
>
> Here is the recorded commands:
> {code:java}
> benwa@horizon ~/Documents/apache/onssd/james-project (git)-[JAMES-1789-2] % 
> curl -u btell...@linagora.com -v imap://openpaas.linagora.com/INBOX/
> Enter host password for user 'btell...@linagora.com':
> *   Trying 109.197.180.230...
> * TCP_NODELAY set
> * Connected to openpaas.linagora.com (109.197.180.230) port 143 (#0)
> < * OK JAMES IMAP4rev1 Server  Server james.openpaas.linagora.com is ready.
> > A001 CAPABILITY
> < * CAPABILITY NAMESPACE QUOTA IMAP4rev1 QRESYNC UNSELECT WITHIN SASL-IR ACL 
> ENABLE SEARCHRES UIDPLUS CHILDREN AUTH=PLAIN LITERAL+ MOVE ANNOTATION ESEARCH 
> IDLE I18NLEVEL=1 STARTTLS
> < A001 OK CAPABILITY completed.
> > A002 AUTHENTICATE PLAIN YnRlmQ=
> < A002 NO AUTHENTICATE Not an admin
> * Closing connection 0
> {code}
> The corresponding log is: 
> https://openpaas.linagora.com/viewlogs/app/kibana#/doc/logs-*/logs-2017-06-15/tester/?id=AVyq9YEGzFPejjEzie5O
> Apparently IMAP command parsing for authenticate leads to thinks it is 
> delegation, when it is not...
> Digging a bit more it turns out the login was on the form 
> "\0user\0user\0password"
> So self delegation...



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

james-project git commit: JAMES-2064 Consider IMAP self delegation as normal login

2017-06-22 Thread btellier 
Repository: james-project
Updated Branches:
  refs/heads/master 7eb1c5245 -> 369b35fc9


JAMES-2064 Consider IMAP self delegation as normal login


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

Branch: refs/heads/master
Commit: 369b35fc9664bf0ec8927bfa9213be83f5e58ec6
Parents: 7eb1c52
Author: benwa 
Authored: Thu Jun 22 16:51:49 2017 +0700
Committer: benwa 
Committed: Thu Jun 22 16:51:49 2017 +0700

--
 .../james/imap/scripts/AuthenticatePlain.test| 19 +++
 .../imap/processor/AbstractAuthProcessor.java|  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/369b35fc/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AuthenticatePlain.test
--
diff --git 
a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AuthenticatePlain.test
 
b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AuthenticatePlain.test
index 50fa93d..6bdf831 100644
--- 
a/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AuthenticatePlain.test
+++ 
b/mpt/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/AuthenticatePlain.test
@@ -56,6 +56,25 @@ S: \* OK \[HIGHESTMODSEQ .*\] Highest
 S: \* OK \[UIDNEXT .*\] Predicted next UID
 }
 S: 0004 OK \[READ-WRITE\] SELECT completed\.
+REINIT
+
+# Correct user with correct password can authenticate with empty delegation 
part
+C: A002 AUTHENTICATE PLAIN aW1hcHVzZXIAaW1hcHVzZXIAcGFzc3dvcmQ=
+# \0imapuser\0imapuser\0password
+S: A002 OK AUTHENTICATE completed.
+
+# Ensure we are imapuser
+C: 0004 SELECT imapuser
+SUB {
+S: \* FLAGS .*
+S: \* .* EXISTS
+S: \* .* RECENT
+S: \* OK \[UIDVALIDITY .*\] UIDs valid
+S: \* OK \[PERMANENTFLAGS .*\] Limited
+S: \* OK \[HIGHESTMODSEQ .*\] Highest
+S: \* OK \[UIDNEXT .*\] Predicted next UID
+}
+S: 0004 OK \[READ-WRITE\] SELECT completed\.
 
 REINIT
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/369b35fc/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
--
diff --git 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
index fe7cbaa..54b5d4f 100644
--- 
a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
+++ 
b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
@@ -185,7 +185,7 @@ public abstract class AbstractAuthProcessor extends Abstr
 }
 
 public boolean isDelegation() {
-return delegateUserName.isPresent();
+return delegateUserName.isPresent() && 
!delegateUserName.get().equals(authenticationId);
 }
 
 public Optional getDelegateUserName() {


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

[jira] [Created] (JAMES-2066) Create a mailet to parse MIME

2017-06-22 Thread Luc DUZAN (JIRA) 
Luc DUZAN created JAMES-2066:


 Summary: Create a mailet to parse MIME
 Key: JAMES-2066
 URL: https://issues.apache.org/jira/browse/JAMES-2066
 Project: James Server
  Issue Type: Improvement
  Components: Mailet Contributions
Reporter: Luc DUZAN


The aim of this mailet will be to avoid other mailet to do the same MIME 
parsing over and over



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

[jira] [Created] (JAMES-2065) Create a mailet that take a attribute of mail which is a list and copy the value of that list into a header

2017-06-22 Thread Luc DUZAN (JIRA) 
Luc DUZAN created JAMES-2065:


 Summary: Create a mailet that take a attribute of mail which is a 
list and copy the value of that list into a header
 Key: JAMES-2065
 URL: https://issues.apache.org/jira/browse/JAMES-2065
 Project: James Server
  Issue Type: Improvement
  Components: Mailet Contributions
Reporter: Luc DUZAN


This mailet will be like MailAttributeToMimeHeaders except that the attribute 
will be a list of string instead of a String.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

Re: Call for vote: JSIEVE version 0.7

2017-06-22 Thread Eric Charles 

+1

Eric

On 16/06/17 10:07, aduprat wrote:

Hello,

I would like to call a vote for JSieve release.

This release includes:

 - Some header sanitizing (unwrap + decode)
 - An added action for Discarding a mail. This allow easier use of
JSieve library as this handling is no more implicit.

This release is a requirement for James 3.0 upcoming release (we should
not depend on SNAPSHOT dependencies).

This is a majority approval, as described in
http://www.apache.org/foundation/glossary.html#MajorityApproval? As a
reminder:

 - 3 binding +1 required (PMC)
 - Majority of +1
 - This can not be vetoed

You can check the maven release artifact:
 - https://repository.apache.org/#stagingRepositories #1015

Answer this email with:
 +1 to promote the release
 -1 to reject the release

The starts from 10 am 30 16th June 2017 UTC+2 and will be closed on 10
am 30 23th June 2017 UTC+2 (one week)

Best regards,

Antoine Duprat

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



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

[jira] [Created] (JAMES-2064) Can not authenticate with curl

2017-06-22 Thread Tellier Benoit (JIRA) 
Tellier Benoit created JAMES-2064:
-

 Summary: Can not authenticate with curl
 Key: JAMES-2064
 URL: https://issues.apache.org/jira/browse/JAMES-2064
 Project: James Server
  Issue Type: Bug
  Components: IMAPServer
Reporter: Tellier Benoit


Here is the recorded commands:


{code:java}
benwa@horizon ~/Documents/apache/onssd/james-project (git)-[JAMES-1789-2] % 
curl -u btell...@linagora.com -v imap://openpaas.linagora.com/INBOX/
Enter host password for user 'btell...@linagora.com':
*   Trying 109.197.180.230...
* TCP_NODELAY set
* Connected to openpaas.linagora.com (109.197.180.230) port 143 (#0)
< * OK JAMES IMAP4rev1 Server  Server james.openpaas.linagora.com is ready.
> A001 CAPABILITY
< * CAPABILITY NAMESPACE QUOTA IMAP4rev1 QRESYNC UNSELECT WITHIN SASL-IR ACL 
ENABLE SEARCHRES UIDPLUS CHILDREN AUTH=PLAIN LITERAL+ MOVE ANNOTATION ESEARCH 
IDLE I18NLEVEL=1 STARTTLS
< A001 OK CAPABILITY completed.
> A002 AUTHENTICATE PLAIN YnRlmQ=
< A002 NO AUTHENTICATE Not an admin
* Closing connection 0
{code}

The corresponding log is: 
https://openpaas.linagora.com/viewlogs/app/kibana#/doc/logs-*/logs-2017-06-15/tester/?id=AVyq9YEGzFPejjEzie5O

Apparently IMAP command parsing for authenticate leads to thinks it is 
delegation, when it is not...


Digging a bit more it turns out the login was on the form 
"\0user\0user\0password"

So self delegation...



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

[jira] [Resolved] (JAMES-1720) Upgrade to Cassandra driver to 3.x

2017-06-22 Thread Tellier Benoit (JIRA) 

 [ 
https://issues.apache.org/jira/browse/JAMES-1720?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit resolved JAMES-1720.
---
Resolution: Fixed

https://github.com/linagora/james-project/pull/853 solved the issue

> Upgrade to Cassandra driver to 3.x
> --
>
> Key: JAMES-1720
> URL: https://issues.apache.org/jira/browse/JAMES-1720
> Project: James Server
>  Issue Type: Improvement
>  Components: cassandra
>Reporter: Tellier Benoit
>
> This upgrade is done to allow us using codecs.
> Acceptation criteria :
>  - James should use a 3.0 driver



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

[jira] [Closed] (JAMES-1720) Upgrade to Cassandra driver to 3.x

2017-06-22 Thread Tellier Benoit (JIRA) 

 [ 
https://issues.apache.org/jira/browse/JAMES-1720?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit closed JAMES-1720.
-

> Upgrade to Cassandra driver to 3.x
> --
>
> Key: JAMES-1720
> URL: https://issues.apache.org/jira/browse/JAMES-1720
> Project: James Server
>  Issue Type: Improvement
>  Components: cassandra
>Reporter: Tellier Benoit
>
> This upgrade is done to allow us using codecs.
> Acceptation criteria :
>  - James should use a 3.0 driver



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

[4/4] james-project git commit: JAMES-1720 MockMailboxSession is mutable and thus should not be static in tests

2017-06-22 Thread btellier 
JAMES-1720 MockMailboxSession is mutable and thus should not be static in 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/7eb1c524
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7eb1c524
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7eb1c524

Branch: refs/heads/master
Commit: 7eb1c5245b8d13f82a303700798559c4cbb12c95
Parents: e72b79b
Author: benwa 
Authored: Wed Jun 21 17:55:40 2017 +0700
Committer: benwa 
Committed: Thu Jun 22 15:44:34 2017 +0700

--
 .../AbstractMessageIdManagerStorageTest.java|  8 ++--
 .../StoreMailboxManagerAnnotationTest.java  |  4 +-
 .../store/StoreMessageIdManagerTestSystem.java  |  5 ++-
 .../event/MailboxAnnotationListenerTest.java|  3 +-
 .../BroadcastDelegatingMailboxListenerTest.java | 46 ++--
 ...RegisteredDelegatingMailboxListenerTest.java | 25 ++-
 .../mailbox/store/mail/MessageUtilsTest.java|  3 +-
 .../registrations/GlobalRegistrationTest.java   | 10 ++---
 .../registrations/MailboxRegistrationTest.java  |  9 ++--
 9 files changed, 62 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/7eb1c524/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
--
diff --git 
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
 
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
index 97d35fe..4dcd687 100644
--- 
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
+++ 
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerStorageTest.java
@@ -55,8 +55,6 @@ import com.google.common.collect.ImmutableMap;
 public abstract class AbstractMessageIdManagerStorageTest {
 public static final Flags FLAGS = new Flags();
 
-private static final MailboxSession SYSTEM_USER = new 
MockMailboxSession("systemuser", SessionType.System);
-
 private static final MessageUid messageUid1 = MessageUid.of(111);
 private static final MessageUid messageUid2 = MessageUid.of(222);
 
@@ -95,6 +93,7 @@ public abstract class AbstractMessageIdManagerStorageTest {
 private Mailbox mailbox4;
 private MailboxSession session;
 private MailboxSession otherSession;
+private MailboxSession systemSession;
 
 @Rule
 public ExpectedException expectedException = ExpectedException.none();
@@ -105,6 +104,7 @@ public abstract class AbstractMessageIdManagerStorageTest {
 public void setUp() throws Exception {
 session = new MockMailboxSession(MailboxManagerFixture.USER);
 otherSession = new 
MockMailboxSession(MailboxManagerFixture.OTHER_USER);
+systemSession = new MockMailboxSession("systemuser", 
SessionType.System);
 testingData = createTestingData();
 messageIdManager = testingData.getMessageIdManager();
 
@@ -349,7 +349,7 @@ public abstract class AbstractMessageIdManagerStorageTest {
 
 MessageId messageId = testingData.persist(mailbox1.getMailboxId(), 
messageUid1, FLAGS, session);
 
-messageIdManager.delete(messageId, 
ImmutableList.of(mailbox1.getMailboxId()), SYSTEM_USER);
+messageIdManager.delete(messageId, 
ImmutableList.of(mailbox1.getMailboxId()), systemSession);
 }
 
 @Test
@@ -510,7 +510,7 @@ public abstract class AbstractMessageIdManagerStorageTest {
 Flags newFlags = new Flags(Flags.Flag.SEEN);
 MessageId messageId = testingData.persist(mailbox1.getMailboxId(), 
messageUid1, FLAGS, session);
 
-messageIdManager.setFlags(newFlags, 
MessageManager.FlagsUpdateMode.ADD, messageId, 
ImmutableList.of(mailbox1.getMailboxId()), SYSTEM_USER);
+messageIdManager.setFlags(newFlags, 
MessageManager.FlagsUpdateMode.ADD, messageId, 
ImmutableList.of(mailbox1.getMailboxId()), systemSession);
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/james-project/blob/7eb1c524/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java
--
diff --git 
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java
 
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java
index 08e5837..dbccca7 100644
--- 
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java
+++ 
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java
@@ -67,7 +67,6 @@

[2/4] james-project git commit: JAMES-1720 upgrade cassandra driver to 3.x

2017-06-22 Thread btellier 
JAMES-1720 upgrade cassandra driver to 3.x


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

Branch: refs/heads/master
Commit: b93d42ca73906571f229e6e8244e6c4ba28071f2
Parents: be37b9c
Author: Matthieu Baechler 
Authored: Tue May 16 22:59:34 2017 +0200
Committer: benwa 
Committed: Thu Jun 22 15:44:22 2017 +0700

--
 backends-common/cassandra/pom.xml   | 19 --
 .../backends/cassandra/init/ClusterBuilder.java |  2 +-
 .../init/QueryLoggerConfiguration.java  |  5 +-
 .../backends/cassandra/CassandraCluster.java| 17 +++--
 mailbox/cassandra/pom.xml   |  5 --
 .../cassandra/mail/CassandraMessageDAO.java |  4 +-
 .../CassandraCombinationManagerTest.java| 13 
 .../CassandraCombinationManagerTestSystem.java  |  8 +++
 .../cassandra/CassandraMailboxManagerTest.java  | 45 -
 ...CassandraMessageIdManagerSideEffectTest.java | 12 
 .../CassandraMessageIdManagerStorageTest.java   | 12 
 .../CassandraMessageIdManagerTestSystem.java|  9 +++
 .../CassandraSubscriptionManagerTest.java   | 26 ++--
 .../cassandra/CassandraTestSystemFixture.java   | 68 +++-
 ...istributedMailboxDelegatingListenerTest.java | 20 --
 ...CassandraMailboxPathRegistrerMapperTest.java |  6 ++
 .../cassandra/mail/CassandraACLMapperTest.java  |  1 +
 .../mail/CassandraApplicableFlagDAOTest.java|  1 +
 .../mail/CassandraDeletedMessageDAOTest.java|  1 +
 .../mail/CassandraFirstUnseenDAOTest.java   |  1 +
 .../mail/CassandraIndexTableHandlerTest.java|  1 +
 .../mail/CassandraMailboxCounterDAOTest.java|  1 +
 .../cassandra/mail/CassandraMailboxDAOTest.java |  1 +
 .../CassandraMailboxManagerAttachmentTest.java  | 39 +++
 .../CassandraMailboxMapperConcurrencyTest.java  |  1 +
 .../mail/CassandraMailboxMapperTest.java|  1 +
 .../mail/CassandraMailboxPathDAOTest.java   |  1 +
 .../mail/CassandraMailboxRecentDAOTest.java |  8 +--
 .../cassandra/mail/CassandraMapperProvider.java | 48 --
 .../cassandra/mail/CassandraMessageDAOTest.java |  1 +
 .../mail/CassandraMessageIdDAOTest.java |  1 +
 .../CassandraMessageIdToImapUidDAOTest.java |  1 +
 .../mail/CassandraModSeqProviderTest.java   | 25 +++
 .../mail/CassandraUidProviderTest.java  | 15 +++--
 .../quota/CassandraCurrentQuotaManagerTest.java | 11 +++-
 .../CassandraPerUserMaxQuotaManagerTest.java|  1 +
 .../user/CassandraSubscriptionMapperTest.java   | 14 ++--
 .../mailbox/jpa/mail/JPAMapperProvider.java |  6 ++
 .../inmemory/mail/InMemoryMapperProvider.java   |  6 ++
 mailbox/pom.xml |  1 -
 .../store/mail/model/AnnotationMapperTest.java  |  3 +-
 .../store/mail/model/AttachmentMapperTest.java  |  5 +-
 .../store/mail/model/MailboxMapperTest.java |  3 +-
 .../store/mail/model/MapperProvider.java|  3 +-
 .../store/mail/model/MessageIdMapperTest.java   |  3 +-
 .../store/mail/model/MessageMapperTest.java |  3 +-
 .../store/mail/model/MessageMoveTest.java   |  3 +-
 .../model/MessageWithAttachmentMapperTest.java  |  3 +-
 .../modules/mailbox/CassandraSessionModule.java |  2 +-
 .../cassandra/CassandraActiveScriptDAO.java |  4 +-
 .../CassandraRecipientRewriteTableTest.java |  1 +
 .../james/rrt/cassandra/CassandraStepdefs.java  |  1 +
 .../cassandra/CassandraActiveScriptDAOTest.java |  5 +-
 .../sieve/cassandra/CassandraSieveDAOTest.java  |  5 +-
 .../cassandra/CassandraSieveQuotaDAOTest.java   |  4 +-
 .../cassandra/CassandraSieveRepositoryTest.java |  1 +
 .../vacation/CassandraVacationDAO.java  |  4 +-
 57 files changed, 352 insertions(+), 159 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/b93d42ca/backends-common/cassandra/pom.xml
--
diff --git a/backends-common/cassandra/pom.xml 
b/backends-common/cassandra/pom.xml
index 34ee18f..0c2d39d 100644
--- a/backends-common/cassandra/pom.xml
+++ b/backends-common/cassandra/pom.xml
@@ -130,11 +130,20 @@
 org.apache.james
 james-server-util-java8
 
-   
-   com.datastax.cassandra
-   cassandra-driver-core
-   2.1.8
-   
+
+com.datastax.cassandra
+cassandra-driver-core
+3.2.0
+shaded
+
+

[1/4] james-project git commit: JAMES-1720 upgrade cassandra driver to 3.x

2017-06-22 Thread btellier 
Repository: james-project
Updated Branches:
  refs/heads/master be37b9c0c -> 7eb1c5245


http://git-wip-us.apache.org/repos/asf/james-project/blob/b93d42ca/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOTest.java
--
diff --git 
a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOTest.java
 
b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOTest.java
index 51ae3ed..e3ff18a 100644
--- 
a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOTest.java
+++ 
b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAOTest.java
@@ -31,11 +31,12 @@ import org.junit.Test;
 public class CassandraSieveQuotaDAOTest {
 
 public static final String USER = "user";
-private static CassandraCluster cassandra = CassandraCluster.create(new 
CassandraSieveRepositoryModule());
+private CassandraCluster cassandra;
 private CassandraSieveQuotaDAO sieveQuotaDAO;
 
 @Before
 public void setUp() {
+cassandra = CassandraCluster.create(new 
CassandraSieveRepositoryModule());
 cassandra.ensureAllTables();
 sieveQuotaDAO = new CassandraSieveQuotaDAO(cassandra.getConf());
 }
@@ -43,6 +44,7 @@ public class CassandraSieveQuotaDAOTest {
 @After
 public void tearDown() {
 cassandra.clearAllTables();
+cassandra.close();
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/james-project/blob/b93d42ca/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
--
diff --git 
a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
 
b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
index 8451207..8d37f63 100644
--- 
a/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
+++ 
b/server/data/data-cassandra/src/test/java/org/apache/james/sieve/cassandra/CassandraSieveRepositoryTest.java
@@ -37,5 +37,6 @@ public class CassandraSieveRepositoryTest extends 
AbstractSieveRepositoryTest {
 @Override
 protected void cleanUp() throws Exception {
 cassandra.clearAllTables();
+cassandra.close();
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/james-project/blob/b93d42ca/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java
--
diff --git 
a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java
 
b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java
index 8394be1..d2ac082 100644
--- 
a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java
+++ 
b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java
@@ -102,7 +102,7 @@ public class CassandraVacationDAO {
 private Optional retrieveDate(Row row, String dateField) {
 return Optional.ofNullable(row.getUDTValue(dateField))
 .map(udtValue -> ZonedDateTimeRepresentation.fromDate(
-udtValue.getDate(CassandraZonedDateTimeModule.DATE),
+udtValue.getTimestamp(CassandraZonedDateTimeModule.DATE),
 udtValue.getString(CassandraZonedDateTimeModule.TIME_ZONE))
 .getZonedDateTime());
 }
@@ -132,7 +132,7 @@ public class CassandraVacationDAO {
 private Optional convertToUDTOptional(Optional 
zonedDateTimeOptional) {
 return 
zonedDateTimeOptional.map(ZonedDateTimeRepresentation::fromZonedDateTime)
 .map(representation -> zonedDateTimeUserType.newValue()
-.setDate(CassandraZonedDateTimeModule.DATE, 
representation.getDate())
+.setTimestamp(CassandraZonedDateTimeModule.DATE, 
representation.getDate())
 .setString(CassandraZonedDateTimeModule.TIME_ZONE, 
representation.getSerializedZoneId()));
 }
 }


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

[3/4] james-project git commit: JAMES-1720 Add toString to ScriptSummary

2017-06-22 Thread btellier 
JAMES-1720 Add toString to ScriptSummary


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

Branch: refs/heads/master
Commit: e72b79ba4ccc60719efbb299d836778707c31fa0
Parents: b93d42c
Author: benwa 
Authored: Wed Jun 21 17:43:16 2017 +0700
Committer: benwa 
Committed: Thu Jun 22 15:44:34 2017 +0700

--
 .../org/apache/james/sieverepository/api/ScriptSummary.java | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/e72b79ba/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/ScriptSummary.java
--
diff --git 
a/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/ScriptSummary.java
 
b/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/ScriptSummary.java
index 5eeb08b..126a6d6 100644
--- 
a/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/ScriptSummary.java
+++ 
b/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/ScriptSummary.java
@@ -20,6 +20,7 @@
 
 package org.apache.james.sieverepository.api;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 
 public class ScriptSummary {
@@ -55,4 +56,12 @@ public class ScriptSummary {
 public final int hashCode() {
 return Objects.hashCode(name, activeFile);
 }
+
+@Override
+public String toString() {
+return MoreObjects.toStringHelper(this)
+.add("name",  name)
+.add("activeFile", activeFile)
+.toString();
+}
 }
\ No newline at end of file


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