[jira] [Comment Edited] (JAMES-1773) Lack of tests for mailets and matchers

[Laura Royet (JIRA)]

[ 
https://issues.apache.org/jira/browse/JAMES-1773?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15647222#comment-15647222
 ] 

Laura Royet edited comment on JAMES-1773 at 11/18/16 2:30 PM:
--

-  [MAILET-139|https://issues.apache.org/jira/browse/MAILET-139] 
SenderHostIsLocal should be covered with tests (DONE)



was (Author: lroyet):
-  [MAILET-139|https://issues.apache.org/jira/browse/MAILET-139] 
SenderHostIsLocal should be covered with tests (In Progress)


> Lack of tests for mailets and matchers
> --
>
> Key: JAMES-1773
> URL: https://issues.apache.org/jira/browse/JAMES-1773
> Project: James Server
>  Issue Type: Sub-task
>Reporter: btell...@apache.org
> Fix For: 3.0.0
>
>
> Here is a list of mailets and matchers (important) that lack tests : 
>  - Bounce, Forward, LocalDelivery,NotifyPostmaster, NotifySender, RRT, 
> Redirect, RemoteDelivery, Resend, ToRepository
>  - HasHeader, RecipientIsLocal, RelayLimit, SenderHostIs, SenderHostIsLocal, 
> SenderIsLocal, SenderInFakeDomain, HasAttachement, IsOverQuota



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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

[3/3] james-project git commit: Merge remote-tracking branch 'lroyet/MAILET-139'

[aduprat]

Merge remote-tracking branch 'lroyet/MAILET-139'


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

Branch: refs/heads/master
Commit: 3878e38b8257e0213d785e601fc9f4b403879615
Parents: 07a43ad 444aeb1
Author: Antoine Duprat 
Authored: Fri Nov 18 15:20:56 2016 +0100
Committer: Antoine Duprat 
Committed: Fri Nov 18 15:20:56 2016 +0100

--
 .../transport/matchers/SenderHostIsLocal.java   | 16 ++--
 .../matchers/SenderHostIsLocalTest.java | 85 
 .../transport/matchers/SenderIsLocalTest.java   | 17 +++-
 3 files changed, 111 insertions(+), 7 deletions(-)
--



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

[2/3] james-project git commit: MAILET-139 SenderHostIsLocal should be covered with tests

[aduprat]

MAILET-139 SenderHostIsLocal should be covered with 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/977ae9e0
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/977ae9e0
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/977ae9e0

Branch: refs/heads/master
Commit: 977ae9e0e60d159c83f480fe944f4e67ccb5a58b
Parents: ff57437
Author: Laura Royet 
Authored: Tue Nov 8 14:31:46 2016 +0100
Committer: Laura Royet 
Committed: Thu Nov 17 17:18:28 2016 +0100

--
 .../transport/matchers/SenderHostIsLocal.java   | 16 ++--
 .../matchers/SenderHostIsLocalTest.java | 85 
 2 files changed, 95 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/977ae9e0/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
--
diff --git 
a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
 
b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
index 2092908..6200383 100644
--- 
a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
+++ 
b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SenderHostIsLocal.java
@@ -20,11 +20,11 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.base.GenericMatcher;
+import java.util.Collection;
+
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
-
-import java.util.Collection;
+import org.apache.mailet.base.GenericMatcher;
 
 /**
  * Checks the sender's displayed domain name against a the hosts serviced by
@@ -38,12 +38,16 @@ import java.util.Collection;
  */
 public class SenderHostIsLocal extends GenericMatcher {
 public Collection match(Mail mail) {
-if (mail.getSender() != null
-&& this.getMailetContext().isLocalServer(
-mail.getSender().getDomain().toLowerCase())) {
+if (mail.getSender() != null && isLocalServer(mail)) {
 return mail.getRecipients();
 }
 return null;
+
+}
 
+private boolean isLocalServer(Mail mail) {
+return this.getMailetContext().isLocalServer(
+mail.getSender().getDomain().toLowerCase());
 }
+
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/977ae9e0/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java
--
diff --git 
a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java
 
b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java
new file mode 100644
index 000..e52fc4c
--- /dev/null
+++ 
b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderHostIsLocalTest.java
@@ -0,0 +1,85 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *
+ /
+
+
+package org.apache.james.transport.matchers;
+
+import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES;
+import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES2;
+import static org.apache.mailet.base.MailAddressFixture.JAMES2_APACHE_ORG;
+import static org.apache.mailet.base.MailAddressFixture.JAMES_APACHE_ORG;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Collection;
+
+import 

[1/3] james-project git commit: MAILET-139 add a test to SenderIsLocalTest

[aduprat]

Repository: james-project
Updated Branches:
  refs/heads/master 07a43adbe -> 3878e38b8


MAILET-139 add a test to SenderIsLocalTest


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

Branch: refs/heads/master
Commit: 444aeb171242a3f29e955ec0c4170c5574c749b7
Parents: 977ae9e
Author: Laura Royet 
Authored: Wed Nov 9 11:33:26 2016 +0100
Committer: Laura Royet 
Committed: Thu Nov 17 17:18:28 2016 +0100

--
 .../transport/matchers/SenderIsLocalTest.java  | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/444aeb17/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java
--
diff --git 
a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java
 
b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java
index 31f8251..a3ebb91 100644
--- 
a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java
+++ 
b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SenderIsLocalTest.java
@@ -20,6 +20,7 @@
 package org.apache.james.transport.matchers;
 
 import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES;
+import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES;
 import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES2;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -46,6 +47,7 @@ public class SenderIsLocalTest {
 public void setUp() throws MessagingException {
 MailetContext mailContext = mock(MailetContext.class);
 when(mailContext.isLocalEmail(ANY_AT_JAMES)).thenReturn(true);
+when(mailContext.isLocalEmail(OTHER_AT_JAMES)).thenReturn(false);
 when(mailContext.isLocalEmail(ANY_AT_JAMES2)).thenReturn(false);
 
 matcher = new SenderIsLocal();
@@ -65,9 +67,22 @@ public class SenderIsLocalTest {
 //Then
 assertThat(actual).containsExactly(ANY_AT_JAMES2);
 }
+
+@Test
+public void shouldNotMatchWhenSenderIsUnknown() throws MessagingException {
+//Given
+Mail mail = FakeMail.builder()
+.sender(OTHER_AT_JAMES)
+.recipient(ANY_AT_JAMES2)
+.build();
+//When
+Collection actual = matcher.match(mail);
+//Then
+assertThat(actual).isNull();
+}
 
 @Test
-public void shouldNotMatchWhenSenderIsNotLocal() throws MessagingException 
{
+public void shouldNotMatchWhenHostIsNotLocal() throws MessagingException {
 //Given
 Mail mail = FakeMail.builder()
 .sender(ANY_AT_JAMES2)


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

[1/2] james-project git commit: JAMES-1857: Add more documentation on README file

[aduprat]

Repository: james-project
Updated Branches:
  refs/heads/master 56acfd067 -> 07a43adbe


JAMES-1857: Add more documentation on README file


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

Branch: refs/heads/master
Commit: 07a43adbe77f25ef6f213e1134dcb0ee514b4e5a
Parents: 62ac5f7
Author: Quynh Nguyen 
Authored: Thu Nov 10 16:01:46 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 17:27:52 2016 +0700

--
 README.adoc | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/07a43adb/README.adoc
--
diff --git a/README.adoc b/README.adoc
index abd4145..f2ea15e 100644
--- a/README.adoc
+++ b/README.adoc
@@ -196,6 +196,9 @@ $ keytool -genkey -alias james -keyalg RSA -keystore 
dockerfiles/run/spring/dest
 Then we need to build james container :
 $ docker build -t james_run dockerfiles/run/spring/
 
+The provisioned james images bases on pre-build james server which is 
"linagora/james-project-spring-jpa". If we need to build james container with 
the default initial data (initial domain: james.local and initial users: 
user01, user02, user03):
+$ docker build -t james_run dockerfiles/run/spring/provisioned/
+
 To run this container :
 $ docker run --hostname HOSTNAME -p "25:25" -p "110:110" -p "143:143" -p 
"465:465" -p "587:587" -p "993:993" --name james_run -t james_run
 


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

[2/2] james-project git commit: JAMES-1857: JWS-Create James Image for get started part

[aduprat]

JAMES-1857: JWS-Create James Image for get started part


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

Branch: refs/heads/master
Commit: 62ac5f7810bd651ed0b38ae2ca26f06ef037a904
Parents: 56acfd0
Author: Quynh Nguyen 
Authored: Tue Nov 8 17:26:16 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 17:27:52 2016 +0700

--
 dockerfiles/run/spring/provisioned/Dockerfile   | 20 
 .../run/spring/provisioned/initialdata.sh   | 10 ++
 dockerfiles/run/spring/provisioned/startup.sh   |  5 +
 3 files changed, 35 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/62ac5f78/dockerfiles/run/spring/provisioned/Dockerfile
--
diff --git a/dockerfiles/run/spring/provisioned/Dockerfile 
b/dockerfiles/run/spring/provisioned/Dockerfile
new file mode 100644
index 000..f6f8f47
--- /dev/null
+++ b/dockerfiles/run/spring/provisioned/Dockerfile
@@ -0,0 +1,20 @@
+# Run James
+#
+# VERSION  1.0
+
+FROM linagora/james-jpa-spring
+
+WORKDIR /root
+
+RUN git clone https://github.com/vishnubob/wait-for-it.git wait-for-it
+RUN cp /root/wait-for-it/wait-for-it.sh /usr/bin/wait-for-it.sh
+
+COPY startup.sh /root/james-server-app-3.0.0-beta6-SNAPSHOT/bin
+COPY initialdata.sh /root/james-server-app-3.0.0-beta6-SNAPSHOT/bin
+
+RUN chmod +x /root/james-server-app-3.0.0-beta6-SNAPSHOT/bin/startup.sh
+RUN chmod +x /root/james-server-app-3.0.0-beta6-SNAPSHOT/bin/initialdata.sh
+
+WORKDIR /root/james-server-app-3.0.0-beta6-SNAPSHOT/bin
+
+ENTRYPOINT ["./startup.sh"]

http://git-wip-us.apache.org/repos/asf/james-project/blob/62ac5f78/dockerfiles/run/spring/provisioned/initialdata.sh
--
diff --git a/dockerfiles/run/spring/provisioned/initialdata.sh 
b/dockerfiles/run/spring/provisioned/initialdata.sh
new file mode 100644
index 000..5d0805f
--- /dev/null
+++ b/dockerfiles/run/spring/provisioned/initialdata.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+./james-cli.sh -h localhost -p  adddomain james.local
+./james-cli.sh -h localhost -p  adduser user01@james.local 1234
+./james-cli.sh -h localhost -p  adduser user02@james.local 1234
+./james-cli.sh -h localhost -p  adduser user03@james.local 1234
+
+
+
+

http://git-wip-us.apache.org/repos/asf/james-project/blob/62ac5f78/dockerfiles/run/spring/provisioned/startup.sh
--
diff --git a/dockerfiles/run/spring/provisioned/startup.sh 
b/dockerfiles/run/spring/provisioned/startup.sh
new file mode 100644
index 000..e2bd972
--- /dev/null
+++ b/dockerfiles/run/spring/provisioned/startup.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+wait-for-it.sh --host=localhost --port= --strict --timeout=0 -- 
./initialdata.sh &
+
+./wrapper-linux-x86-64 ../conf/wrapper.conf wrapper.syslog.ident=james 
wrapper.pidfile=../var/james.pid wrapper.daemonize=FALSE


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

[29/29] james-project git commit: Merge remote-tracking branch 'quynhn/JPA_Guice'

[aduprat]

Merge remote-tracking branch 'quynhn/JPA_Guice'


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

Branch: refs/heads/master
Commit: 56acfd067a5600c3403bbe8a14cbd91b945ba71a
Parents: 73a7c46 fd3c439
Author: Antoine Duprat 
Authored: Fri Nov 18 10:53:22 2016 +0100
Committer: Antoine Duprat 
Committed: Fri Nov 18 10:53:22 2016 +0100

--
 dockerfiles/compilation/java-8/compile.sh   |   4 +-
 .../META-INF/spring/mailbox-cassandra.xml   |   4 +-
 .../org/apache/james/mailbox/jpa/JPAId.java |   2 +-
 .../jpa/JPAMailboxSessionMapperFactory.java |   2 +
 .../mailbox/jpa/JPASubscriptionManager.java |   3 +
 .../mailbox/jpa/mail/JPAModSeqProvider.java |   2 +
 .../james/mailbox/jpa/mail/JPAUidProvider.java  |   2 +
 .../jpa/openjpa/OpenJPAMailboxManager.java  |   3 +
 .../resources/META-INF/spring/mailbox-jpa.xml   |  12 +-
 .../lucene/search/LuceneMessageSearchIndex.java |   3 +-
 .../META-INF/spring/mailbox-maildir.xml |   4 +-
 .../META-INF/spring/mailbox-memory.xml  |   4 +-
 .../META-INF/spring/spring-mailbox.xml  |   3 +-
 .../smtp/host/CassandraJamesSmtpHostSystem.java |   8 +-
 .../filesystem/api/AbstractFileSystemTest.java  |   1 -
 .../sample-configuration/cassandra.properties   |   6 +
 .../sample-configuration/dnsservice.xml |  29 ++
 .../sample-configuration/domainlist.xml |  28 ++
 .../elasticsearch.properties|  26 ++
 .../sample-configuration/imapserver.xml |  54 +++
 .../sample-configuration/jmap.properties|  11 +
 .../sample-configuration/jmx.properties |  28 ++
 .../sample-configuration/lmtpserver.xml |  41 +++
 .../sample-configuration/mailetcontainer.xml| 138 
 .../mailrepositorystore.xml |  34 ++
 .../sample-configuration/pop3server.xml |  42 +++
 .../recipientrewritetable.xml   |  27 ++
 .../sample-configuration/smtpserver.xml | 105 ++
 .../sample-configuration/usersrepository.xml|  27 ++
 .../org/apache/james/CassandraJamesServer.java  |  58 
 .../apache/james/CassandraJamesServerMain.java  |   4 +-
 .../apache/james/CassandraJamesServerTest.java  |   6 +-
 .../james/JamesCapabilitiesServerTest.java  |   6 +-
 .../sample-configuration/cassandra.properties   |   6 -
 .../sample-configuration/dnsservice.xml |  29 --
 .../sample-configuration/domainlist.xml |  28 --
 .../elasticsearch.properties|  26 --
 .../sample-configuration/imapserver.xml |  54 ---
 .../sample-configuration/jcr-repository.xml |  72 
 .../sample-configuration/jmap.properties|  11 -
 .../sample-configuration/jmx.properties |  28 --
 .../sample-configuration/lmtpserver.xml |  41 ---
 .../sample-configuration/mailetcontainer.xml| 137 
 .../mailrepositorystore.xml |  34 --
 .../sample-configuration/pop3server.xml |  42 ---
 .../recipientrewritetable.xml   |  27 --
 .../sample-configuration/smtpserver.xml | 105 --
 .../sample-configuration/usersrepository.xml|  27 --
 .../java/org/apache/james/GuiceJamesServer.java |  84 +
 .../org/apache/james/GuiceJamesServerImpl.java  |  88 +
 .../java/org/apache/james/JmapJamesServer.java  |  23 ++
 .../main/java/org/apache/james/JmapServer.java  |  26 ++
 .../java/org/apache/james/WebAdminServer.java   |  25 ++
 .../java/org/apache/james/jmap/JMAPModule.java  |  15 -
 .../james/modules/CommonServicesModule.java |   6 +-
 .../apache/james/modules/ProtocolsModule.java   |   2 -
 .../modules/data/SieveFileRepositoryModule.java |  36 ++
 .../modules/protocols/JMAPServerModule.java |   3 +
 .../server/CamelMailetContainerModule.java  |  20 ++
 .../modules/server/WebAdminServerModule.java|   3 +
 .../apache/james/utils/ExtendedServerProbe.java |   6 -
 .../java/org/apache/james/utils/GuiceProbe.java |  22 ++
 .../apache/james/utils/GuiceProbeProvider.java  |  47 +++
 .../apache/james/utils/GuiceServerProbe.java|  22 +-
 .../org/apache/james/utils/JmapGuiceProbe.java  |  52 +++
 .../apache/james/utils/WebAdminGuiceProbe.java  |  37 +++
 .../apache/james/AbstractJamesServerTest.java   |  29 +-
 .../james/AbstractJmapJamesServerTest.java  | 140 
 .../james/jmap/MailetPreconditionTest.java  |   5 +-
 .../james/utils/GuiceProbeProviderTest.java |  67 
 server/container/guice/jpa-guice/README.adoc|  40 +++
 server/container/guice/jpa-guice/pom.xml| 326 +++
 .../sample-configuration/dnsservice.xml |  29 ++
 

[16/29] james-project git commit: JAMES-1842: Add more binding for MessageId

[aduprat]

JAMES-1842: Add more binding for MessageId


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

Branch: refs/heads/master
Commit: 270a97f7d99150eae6fb65491082485ed8f98037
Parents: d65e484
Author: Quynh Nguyen 
Authored: Fri Oct 28 12:50:20 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../resources/META-INF/spring/mailbox-cassandra.xml |  4 +---
 .../src/main/resources/META-INF/spring/mailbox-jpa.xml  | 12 
 .../main/resources/META-INF/spring/mailbox-maildir.xml  |  4 +---
 .../main/resources/META-INF/spring/mailbox-memory.xml   |  4 +---
 .../main/resources/META-INF/spring/spring-mailbox.xml   |  3 ++-
 .../apache/james/modules/mailbox/JPAMailboxModule.java  |  4 
 6 files changed, 13 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/270a97f7/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
--
diff --git 
a/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml 
b/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
index 3d40aad..5078a18 100644
--- a/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
+++ b/mailbox/cassandra/src/main/resources/META-INF/spring/mailbox-cassandra.xml
@@ -34,7 +34,7 @@
 
 
 
-
+
 
 
 
@@ -42,8 +42,6 @@
 
 
 
-
-
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/270a97f7/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
--
diff --git a/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml 
b/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
index 223187c..a4fa05d 100644
--- a/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
+++ b/mailbox/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
@@ -34,20 +34,16 @@
 
 
 
-
-
-
-
-
-
+
+
+
+
 
 
 
 
 
 
-
-
 
 
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/270a97f7/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
--
diff --git 
a/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml 
b/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
index aaa1062..4e9ef7a 100644
--- a/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
+++ b/mailbox/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
@@ -40,7 +40,7 @@
 
 
 
-
+
 
 
 
@@ -48,8 +48,6 @@
 
 
 
-
-
 
 
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/270a97f7/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
--
diff --git 
a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml 
b/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
index 1beac65..92b2824 100644
--- a/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
+++ b/mailbox/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
@@ -38,15 +38,13 @@
 
 
 
-
+
 
 
 
 
 
 
-
-
 
 
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/270a97f7/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
--
diff --git 
a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml 
b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
index 182d1c1..153e1a2 100644
--- a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
+++ b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
@@ -22,7 +22,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd;>
 
-
 

[28/29] james-project git commit: JAMES-1842: Introduce GuiceJamesServer interface

[aduprat]

JAMES-1842: Introduce GuiceJamesServer interface


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

Branch: refs/heads/master
Commit: fdb400d41c9add031b0af1ff17b21ceba2db0095
Parents: 932f16c
Author: Antoine Duprat 
Authored: Wed Nov 16 09:59:04 2016 +0100
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:33:20 2016 +0700

--
 .../java/org/apache/james/GuiceJamesServer.java | 30 
 .../org/apache/james/GuiceJamesServerImpl.java  |  5 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/fdb400d4/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
new file mode 100644
index 000..d77521b
--- /dev/null
+++ 
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
@@ -0,0 +1,30 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *
+ /
+package org.apache.james;
+
+import org.apache.james.utils.GuiceServerProbe;
+
+public interface GuiceJamesServer {
+
+void start() throws Exception;
+
+void stop();
+
+GuiceServerProbe serverProbe();
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/fdb400d4/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServerImpl.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServerImpl.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServerImpl.java
index 0ebd7c6..e33c72c 100644
--- 
a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServerImpl.java
+++ 
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServerImpl.java
@@ -38,7 +38,7 @@ import com.google.inject.Module;
 import com.google.inject.TypeLiteral;
 import com.google.inject.util.Modules;
 
-public class GuiceJamesServerImpl {
+public class GuiceJamesServerImpl implements GuiceJamesServer {
 protected final Module module;
 private Stager preDestroy;
 private GuiceProbeProvider guiceProbeProvider;
@@ -62,6 +62,7 @@ public class GuiceJamesServerImpl {
 return new 
GuiceJamesServerImpl(Modules.override(module).with(overrides));
 }
 
+@Override
 public void start() throws Exception {
 Injector injector = Guice.createInjector(module);
 preDestroy = injector.getInstance(Key.get(new 
TypeLiteral() {}));
@@ -69,12 +70,14 @@ public class GuiceJamesServerImpl {
 guiceProbeProvider = injector.getInstance(GuiceProbeProvider.class);
 }
 
+@Override
 public void stop() {
 if (preDestroy != null) {
 preDestroy.stage();
 }
 }
 
+@Override
 public GuiceServerProbe serverProbe() {
 return guiceProbeProvider.getProbe(GuiceServerProbe.class);
 }


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

[23/29] james-project git commit: JAMES-1842: remove eclipse warnings

[aduprat]

JAMES-1842: remove eclipse warnings


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

Branch: refs/heads/master
Commit: 95e11203398f889cdf5089b24e5459f9936fad28
Parents: 0aafb2d
Author: Quynh Nguyen 
Authored: Wed Nov 16 09:44:50 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:33:08 2016 +0700

--
 .../filesystem/api/AbstractFileSystemTest.java  |  1 -
 .../apache/james/utils/GuiceProbeProvider.java  |  2 +
 .../org/apache/james/utils/JmapGuiceProbe.java  |  8 +---
 .../james/AbstractJmapJamesServerTest.java  |  1 -
 .../james/utils/GuiceProbeProviderTest.java |  3 +-
 .../mailbox/LuceneSearchMailboxModule.java  |  4 --
 .../james/modules/data/MemoryDataModule.java|  2 -
 .../james/mailets/TemporaryJamesServer.java |  1 -
 .../CassandraVacationIntegrationTest.java   |  1 -
 .../cassandra/cucumber/CassandraStepdefs.java   |  4 +-
 .../james/jmap/JMAPAuthenticationTest.java  |  1 -
 .../integration/GetMailboxesMethodTest.java | 39 ++--
 .../integration/GetMessageListMethodTest.java   |  1 -
 .../integration/SetMailboxesMethodTest.java |  1 -
 .../integration/SetMessagesMethodTest.java  |  1 -
 .../integration/cucumber/DownloadStepdefs.java  | 11 --
 .../cucumber/GetMessagesMethodStepdefs.java | 11 --
 .../integration/cucumber/MainStepdefs.java  |  2 +-
 .../cucumber/SetMailboxesMethodStepdefs.java| 11 --
 .../integration/cucumber/UploadStepdefs.java| 15 +---
 .../integration/cucumber/UserStepdefs.java  |  9 +++--
 .../jmap/memory/cucumber/MemoryStepdefs.java|  4 +-
 22 files changed, 66 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
--
diff --git 
a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
 
b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
index df43491..c0f58bf 100644
--- 
a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
+++ 
b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
@@ -44,7 +44,6 @@ import com.sun.net.httpserver.HttpServer;
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
 
-@SuppressWarnings("restriction")
 @RunWith(JUnitParamsRunner.class)
 public abstract class AbstractFileSystemTest {
 private static final String FAKE_DIRECTORY = 
"b7b73e3a-5234-11e5-87f2-9b171f273b49/";

http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java
index 7b98b6f..237c537 100644
--- 
a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java
+++ 
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceProbeProvider.java
@@ -30,12 +30,14 @@ import java.util.Set;
 public class GuiceProbeProvider {
 private final Map registry;
 
+@SuppressWarnings("unchecked")
 @Inject
 public GuiceProbeProvider(Set guiceProbes) {
 this.registry = guiceProbes.stream()
 .collect(Guavate.toImmutableMap(guiceProbe -> (Class) 
guiceProbe.getClass()));
 }
 
+@SuppressWarnings("unchecked")
 public  T getProbe(Class clazz) {
 Preconditions.checkNotNull(clazz);
 return Optional.ofNullable(registry.get(clazz))

http://git-wip-us.apache.org/repos/asf/james-project/blob/95e11203/server/container/guice/guice-common/src/main/java/org/apache/james/utils/JmapGuiceProbe.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/JmapGuiceProbe.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/JmapGuiceProbe.java
index 9d881e0..cf6 100644
--- 
a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/JmapGuiceProbe.java
+++ 

[20/29] james-project git commit: JAMES-1842 Remove tika dependency

[aduprat]

JAMES-1842 Remove tika dependency


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

Branch: refs/heads/master
Commit: 59f7382df73368c1632b7e7adda1ebc20fe43cac
Parents: df98b6e
Author: Quynh Nguyen 
Authored: Thu Nov 10 14:50:23 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:35 2016 +0700

--
 server/container/guice/jpa-guice/pom.xml | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/59f7382d/server/container/guice/jpa-guice/pom.xml
--
diff --git a/server/container/guice/jpa-guice/pom.xml 
b/server/container/guice/jpa-guice/pom.xml
index 28567a9..148ac96 100644
--- a/server/container/guice/jpa-guice/pom.xml
+++ b/server/container/guice/jpa-guice/pom.xml
@@ -212,10 +212,6 @@
 
 
 ${project.groupId}
-apache-james-mailbox-tika
-
-
-${project.groupId}
 james-server-data-jpa
 
 


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

[22/29] james-project git commit: JAMES-1842: replace tab by spaces

[aduprat]

JAMES-1842: replace tab by spaces


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

Branch: refs/heads/master
Commit: 0aafb2d5538d0471a624d142d90359d63c028ff4
Parents: 0e5cf23
Author: Quynh Nguyen 
Authored: Wed Nov 16 09:41:44 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:35 2016 +0700

--
 .../jmap/methods/integration/GetMailboxesMethodTest.java  | 10 +-
 .../jmap/methods/integration/GetVacationResponseTest.java | 10 +-
 .../jmap/methods/integration/SetMailboxesMethodTest.java  | 10 +-
 .../jmap/methods/integration/SetVacationResponseTest.java | 10 +-
 4 files changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/0aafb2d5/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
--
diff --git 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
index ca3d38c..e1f7622 100644
--- 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
+++ 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
@@ -67,12 +67,12 @@ public abstract class GetMailboxesMethodTesthttp://git-wip-us.apache.org/repos/asf/james-project/blob/0aafb2d5/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
--
diff --git 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
index 15c69eb..ec6e5cc 100644
--- 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
+++ 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
@@ -78,11 +78,11 @@ public abstract class GetVacationResponseTesthttp://git-wip-us.apache.org/repos/asf/james-project/blob/0aafb2d5/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
--
diff --git 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
index 5196788..8b69679 100644
--- 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
+++ 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
@@ -75,12 +75,12 @@ public abstract class SetMailboxesMethodTesthttp://git-wip-us.apache.org/repos/asf/james-project/blob/0aafb2d5/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
--
diff --git 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
index be04ecb..07a49a5 100644
--- 

[21/29] james-project git commit: JAMES-1842: require inject on persistence unit

[aduprat]

JAMES-1842: require inject on persistence unit


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

Branch: refs/heads/master
Commit: 0e5cf23b5d8a605545e44b8a8fa53ff8c764f45a
Parents: 59f7382
Author: Quynh Nguyen 
Authored: Wed Nov 16 09:36:32 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:35 2016 +0700

--
 .../james/rrt/jpa/JPARecipientRewriteTable.java | 28 +++-
 .../james/user/jpa/JPAUsersRepository.java  |  2 ++
 2 files changed, 17 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/0e5cf23b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
--
diff --git 
a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
 
b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
index 0b04e59..936e804 100644
--- 
a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
+++ 
b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
@@ -31,8 +32,8 @@ import javax.persistence.PersistenceUnit;
 import org.apache.james.rrt.api.RecipientRewriteTableException;
 import org.apache.james.rrt.jpa.model.JPARecipientRewrite;
 import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
-import org.apache.james.rrt.lib.Mappings;
-import org.apache.james.rrt.lib.MappingsImpl;
+import org.apache.james.rrt.lib.Mappings;
+import org.apache.james.rrt.lib.MappingsImpl;
 
 /**
  * Class responsible to implement the Virtual User Table in database with JPA
@@ -50,6 +51,7 @@ public class JPARecipientRewriteTable extends 
AbstractRecipientRewriteTable {
  * 
  * @param entityManagerFactory
  */
+@Inject
 @PersistenceUnit(unitName="James")
 public void setEntityManagerFactory(EntityManagerFactory 
entityManagerFactory) {
 this.entityManagerFactory = entityManagerFactory;
@@ -62,10 +64,10 @@ public class JPARecipientRewriteTable extends 
AbstractRecipientRewriteTable {
 protected void addMappingInternal(String user, String domain, String 
mapping) throws RecipientRewriteTableException {
 String fixedUser = getFixedUser(user);
 String fixedDomain = getFixedDomain(domain);
-Mappings map = getUserDomainMappings(fixedUser, fixedDomain);
+Mappings map = getUserDomainMappings(fixedUser, fixedDomain);
 if (map != null && map.size() != 0) {
-Mappings updatedMappings = 
MappingsImpl.from(map).add(mapping).build();
-doUpdateMapping(fixedUser, fixedDomain, 
updatedMappings.serialize());
+Mappings updatedMappings = 
MappingsImpl.from(map).add(mapping).build();
+doUpdateMapping(fixedUser, fixedDomain, 
updatedMappings.serialize());
 } else {
 doAddMapping(fixedUser, fixedDomain, mapping);
 }
@@ -111,7 +113,7 @@ public class JPARecipientRewriteTable extends 
AbstractRecipientRewriteTable {
  * @throws RecipientRewriteTableException
  * @see 
org.apache.james.rrt.lib.AbstractRecipientRewriteTable#mapAddress(java.lang.String,
 java.lang.String)
  */
-protected Mappings getUserDomainMappingsInternal(String user, String 
domain) throws RecipientRewriteTableException {
+protected Mappings getUserDomainMappingsInternal(String user, String 
domain) throws RecipientRewriteTableException {
 EntityManager entityManager = 
entityManagerFactory.createEntityManager();
 final EntityTransaction transaction = entityManager.getTransaction();
 try {
@@ -120,7 +122,7 @@ public class JPARecipientRewriteTable extends 
AbstractRecipientRewriteTable {
 List virtualUsers = 
entityManager.createNamedQuery("selectUserDomainMapping").setParameter("user", 
user).setParameter("domain", domain).getResultList();
 transaction.commit();
 if (virtualUsers.size() > 0) {
-return 
MappingsImpl.fromRawString(virtualUsers.get(0).getTargetAddress());
+return 
MappingsImpl.fromRawString(virtualUsers.get(0).getTargetAddress());
 }
 } catch (PersistenceException e) {
 getLogger().debug("Failed to get user domain 

[27/29] james-project git commit: JAMES-1842: Remove Generics on Cucumber stuffs

[aduprat]

JAMES-1842: Remove Generics on Cucumber stuffs


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

Branch: refs/heads/master
Commit: e849d6ed84b8a08222ec03d7f098ec61382ea532
Parents: f11fa61
Author: Antoine Duprat 
Authored: Wed Nov 16 10:21:24 2016 +0100
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:33:20 2016 +0700

--
 .../james/jmap/cassandra/cucumber/CassandraStepdefs.java |  4 ++--
 .../methods/integration/cucumber/DownloadStepdefs.java   | 11 ---
 .../integration/cucumber/GetMessagesMethodStepdefs.java  | 11 ---
 .../jmap/methods/integration/cucumber/MainStepdefs.java  |  8 +++-
 .../integration/cucumber/SetMailboxesMethodStepdefs.java | 11 ---
 .../methods/integration/cucumber/UploadStepdefs.java | 11 ---
 .../jmap/methods/integration/cucumber/UserStepdefs.java  |  9 +++--
 .../james/jmap/memory/cucumber/MemoryStepdefs.java   |  4 ++--
 8 files changed, 26 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/e849d6ed/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
--
diff --git 
a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
 
b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
index 2e3ea82..39f4b65 100644
--- 
a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
+++ 
b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
@@ -40,13 +40,13 @@ import cucumber.runtime.java.guice.ScenarioScoped;
 @ScenarioScoped
 public class CassandraStepdefs {
 
-private final MainStepdefs mainStepdefs;
+private final MainStepdefs mainStepdefs;
 private TemporaryFolder temporaryFolder = new TemporaryFolder();
 private EmbeddedElasticSearch embeddedElasticSearch = new 
EmbeddedElasticSearch(temporaryFolder);
 private EmbeddedCassandra cassandra = 
EmbeddedCassandra.createStartServer();
 
 @Inject
-private CassandraStepdefs(MainStepdefs mainStepdefs) 
{
+private CassandraStepdefs(MainStepdefs mainStepdefs) {
 this.mainStepdefs = mainStepdefs;
 }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e849d6ed/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
--
diff --git 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
index 50fbe6a..d000bb3 100644
--- 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
+++ 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
@@ -37,9 +37,6 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.fluent.Request;
 import org.apache.http.client.fluent.Response;
 import org.apache.http.client.utils.URIBuilder;
-import org.apache.james.GuiceJamesServerImpl;
-import org.apache.james.JmapServer;
-import org.apache.james.WebAdminServer;
 import org.apache.james.jmap.api.access.AccessToken;
 import org.apache.james.jmap.model.AttachmentAccessToken;
 import org.apache.james.mailbox.model.MailboxConstants;
@@ -59,7 +56,7 @@ import cucumber.api.java.en.When;
 import cucumber.runtime.java.guice.ScenarioScoped;
 
 @ScenarioScoped
-public class DownloadStepdefs  {
+public class DownloadStepdefs {
 
 private static final String ONE_ATTACHMENT_EML_ATTACHEMENT_BLOB_ID = 
"4000c5145f633410b80be368c44e1c394bff9437";
 private static final String EXPIRED_ATTACHMENT_TOKEN = "usera@domain.tld_"
@@ -70,15 +67,15 @@ public class DownloadStepdefs  userStepdefs;
-private final 

[18/29] james-project git commit: JAMES-1842: Rename GuiceJamesServer to GuiceJmapJamesServer, AbstractJamesServerTest to AbstractJmapJamesServerTest, add more GuiceJamesServer

[aduprat]

JAMES-1842: Rename GuiceJamesServer to GuiceJmapJamesServer, 
AbstractJamesServerTest to AbstractJmapJamesServerTest, add more 
GuiceJamesServer


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

Branch: refs/heads/master
Commit: 11771d03677b7f4ee7de9f41ae5295b8cfdeaf70
Parents: b9a9402
Author: Quynh Nguyen 
Authored: Mon Oct 31 11:24:21 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../org/apache/james/mailbox/jpa/JPAId.java |   2 +-
 .../src/main/resources/META-INF/persistence.xml |   3 -
 .../apache/james/CassandraJamesServerTest.java  |   2 +-
 .../java/org/apache/james/GuiceJamesServer.java |  99 ++
 .../org/apache/james/GuiceJmapJamesServer.java  |   2 +-
 .../java/org/apache/james/jmap/JMAPModule.java  |  15 -
 .../james/modules/CommonServicesModule.java |   2 -
 .../apache/james/modules/ProtocolsModule.java   |   4 +
 .../modules/ProtocolsModuleWithoutJMAP.java |   5 +
 .../server/CamelMailetContainerModule.java  |  20 ++
 .../apache/james/utils/GuiceServerProbe.java| 352 +++
 .../apache/james/AbstractJamesServerTest.java   |  33 +-
 .../james/AbstractJmapJamesServerTest.java  | 140 
 .../james/jmap/MailetPreconditionTest.java  |   5 +-
 server/container/guice/jpa-guice/pom.xml|  16 +-
 .../java/org/apache/james/JPAConfiguration.java |   3 +
 .../org/apache/james/JPAJamesServerMain.java|  27 +-
 .../james/modules/data/JPADataJmapModule.java   |  22 --
 .../james/modules/data/JPADataModule.java   |  32 ++
 .../modules/data/JPASieveRepositoryModule.java  |  18 +
 .../james/modules/mailbox/JPAMailboxModule.java |   8 +-
 .../mailbox/LuceneSearchMailboxModule.java  |   5 -
 .../ScheduledExecutorServiceProvider.java   |  49 ---
 .../src/main/resources/META-INF/persistence.xml |  45 +++
 .../org/apache/james/JPAJamesServerTest.java|   2 +-
 .../james/TestJPAConfigurationModule.java   |   5 +-
 .../src/test/resources/mailetcontainer.xml  |   1 -
 .../org/apache/james/MemoryJamesServerTest.java |   2 +-
 .../src/main/resources/META-INF/persistence.xml |   6 -
 server/pom.xml  |   7 +-
 30 files changed, 748 insertions(+), 184 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/11771d03/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java
--
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java 
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java
index 343476f..2992725 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java
@@ -25,7 +25,7 @@ public class JPAId implements MailboxId {
 public static class Factory implements MailboxId.Factory {
 @Override
 public JPAId fromString(String serialized) {
-return of(Long.parseLong(serialized));
+return of(Long.valueOf(serialized));
 }
 }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/11771d03/mailbox/jpa/src/main/resources/META-INF/persistence.xml
--
diff --git a/mailbox/jpa/src/main/resources/META-INF/persistence.xml 
b/mailbox/jpa/src/main/resources/META-INF/persistence.xml
index a9cbc68..3ec5f22 100644
--- a/mailbox/jpa/src/main/resources/META-INF/persistence.xml
+++ b/mailbox/jpa/src/main/resources/META-INF/persistence.xml
@@ -30,9 +30,6 @@
 
org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage
 org.apache.james.mailbox.jpa.mail.model.JPAProperty
 org.apache.james.mailbox.jpa.user.model.JPASubscription
-org.apache.james.domainlist.jpa.model.JPADomain
-org.apache.james.user.jpa.model.JPAUser
-org.apache.james.rrt.jpa.model.JPARecipientRewrite
 
 
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/11771d03/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
--
diff --git 
a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
 
b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
index 41187a1..2f53657 100644
--- 

[19/29] james-project git commit: JAMES-1842: Rename GuiceJamesServer to GuiceJmapJamesServer

[aduprat]

JAMES-1842: Rename GuiceJamesServer to GuiceJmapJamesServer


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

Branch: refs/heads/master
Commit: b9a94026675405de38e3e298b217e9a8f66baa6f
Parents: 91be31f
Author: Quynh Nguyen 
Authored: Fri Oct 28 16:43:45 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../smtp/host/CassandraJamesSmtpHostSystem.java |   8 +-
 .../apache/james/CassandraJamesServerMain.java  |   2 +-
 .../apache/james/CassandraJamesServerTest.java  |   4 +-
 .../james/JamesCapabilitiesServerTest.java  |   6 +-
 .../java/org/apache/james/GuiceJamesServer.java | 114 ---
 .../org/apache/james/GuiceJmapJamesServer.java  | 114 +++
 .../apache/james/AbstractJamesServerTest.java   |   4 +-
 .../org/apache/james/MemoryJamesServerMain.java |   2 +-
 .../org/apache/james/MemoryJamesServerTest.java |   4 +-
 .../james/mailets/TemporaryJamesServer.java |   6 +-
 .../CassandraGetMailboxesMethodTest.java|   6 +-
 .../CassandraGetMessageListMethodTest.java  |   6 +-
 .../CassandraGetVacationResponseTest.java   |   6 +-
 .../CassandraJmapAuthenticationTest.java|   6 +-
 .../CassandraSetMailboxesMethodTest.java|   6 +-
 .../CassandraSetMessagesMethodTest.java |   6 +-
 .../CassandraSetVacationResponseTest.java   |   6 +-
 .../CassandraVacationIntegrationTest.java   |   6 +-
 .../cassandra/cucumber/CassandraStepdefs.java   |   4 +-
 .../james/jmap/JMAPAuthenticationTest.java  |   6 +-
 .../james/jmap/VacationIntegrationTest.java |   6 +-
 .../integration/GetMailboxesMethodTest.java |   6 +-
 .../integration/GetMessageListMethodTest.java   |   6 +-
 .../integration/GetVacationResponseTest.java|   6 +-
 .../integration/SetMailboxesMethodTest.java |   6 +-
 .../integration/SetMessagesMethodTest.java  |   6 +-
 .../integration/SetVacationResponseTest.java|   6 +-
 .../integration/cucumber/MainStepdefs.java  |   4 +-
 .../memory/MemoryGetMailboxesMethodTest.java|   6 +-
 .../memory/MemoryGetMessageListMethodTest.java  |   6 +-
 .../MemoryGetVacationResponseMethodTest.java|   6 +-
 .../memory/MemoryJmapAuthenticationTest.java|   6 +-
 .../memory/MemorySetMailboxesMethodTest.java|   6 +-
 .../memory/MemorySetMessagesMethodTest.java |   6 +-
 .../MemorySetVacationResponseMethodTest.java|   6 +-
 .../memory/MemoryVacationIntegrationTest.java   |   6 +-
 .../jmap/memory/cucumber/MemoryStepdefs.java|   4 +-
 .../WebAdminServerIntegrationTest.java  |   6 +-
 38 files changed, 213 insertions(+), 213 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/b9a94026/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
--
diff --git 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
index 4949765..836e4e5 100644
--- 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
+++ 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
@@ -22,7 +22,7 @@ package org.apache.james.mpt.smtp.host;
 import java.util.Iterator;
 
 import org.apache.james.CassandraJamesServerMain;
-import org.apache.james.GuiceJamesServer;
+import org.apache.james.GuiceJmapJamesServer;
 import org.apache.james.backends.cassandra.EmbeddedCassandra;
 import org.apache.james.dnsservice.api.DNSService;
 import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
@@ -42,7 +42,7 @@ public class CassandraJamesSmtpHostSystem extends 
ExternalSessionFactory impleme
 private EmbeddedCassandra embeddedCassandra;
 private EmbeddedElasticSearch embeddedElasticSearch;
 
-private GuiceJamesServer jamesServer;
+private GuiceJmapJamesServer jamesServer;
 private InMemoryDNSService inMemoryDNSService;
 
 
@@ -104,8 +104,8 @@ public class CassandraJamesSmtpHostSystem extends 
ExternalSessionFactory impleme
 return inMemoryDNSService;
 }
 
-protected GuiceJamesServer createJamesServer() {
-return new GuiceJamesServer()
+protected GuiceJmapJamesServer createJamesServer() {
+return new GuiceJmapJamesServer()
 .combineWith(CassandraJamesServerMain.cassandraServerModule)
 .overrideWith(new 

[25/29] james-project git commit: JAMES-1842: Rename GuiceJamesServer to GuiceJamesServerImpl

[aduprat]

JAMES-1842: Rename GuiceJamesServer to GuiceJamesServerImpl


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

Branch: refs/heads/master
Commit: 932f16c3a70f81b887fb26022084c8eddaee0815
Parents: 95e1120
Author: Antoine Duprat 
Authored: Wed Nov 16 09:58:02 2016 +0100
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:33:20 2016 +0700

--
 .../smtp/host/CassandraJamesSmtpHostSystem.java |  8 +-
 .../org/apache/james/CassandraJamesServer.java  |  2 +-
 .../apache/james/CassandraJamesServerMain.java  |  2 +-
 .../james/JamesCapabilitiesServerTest.java  |  6 +-
 .../java/org/apache/james/GuiceJamesServer.java | 85 
 .../org/apache/james/GuiceJamesServerImpl.java  | 85 
 .../apache/james/AbstractJamesServerTest.java   |  4 +-
 .../james/AbstractJmapJamesServerTest.java  |  2 +-
 .../org/apache/james/MemoryJamesServer.java |  2 +-
 .../james/jmap/JMAPAuthenticationTest.java  |  4 +-
 .../james/jmap/VacationIntegrationTest.java |  4 +-
 .../integration/GetMailboxesMethodTest.java |  4 +-
 .../integration/GetMessageListMethodTest.java   |  4 +-
 .../integration/GetVacationResponseTest.java|  4 +-
 .../integration/SetMailboxesMethodTest.java |  4 +-
 .../integration/SetMessagesMethodTest.java  |  4 +-
 .../integration/SetVacationResponseTest.java|  4 +-
 .../integration/cucumber/DownloadStepdefs.java  |  4 +-
 .../cucumber/GetMessagesMethodStepdefs.java |  4 +-
 .../integration/cucumber/MainStepdefs.java  |  4 +-
 .../cucumber/SetMailboxesMethodStepdefs.java|  4 +-
 .../integration/cucumber/UploadStepdefs.java|  4 +-
 .../integration/cucumber/UserStepdefs.java  |  4 +-
 23 files changed, 126 insertions(+), 126 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
--
diff --git 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
index 4949765..bc8f678 100644
--- 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
+++ 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
@@ -22,7 +22,7 @@ package org.apache.james.mpt.smtp.host;
 import java.util.Iterator;
 
 import org.apache.james.CassandraJamesServerMain;
-import org.apache.james.GuiceJamesServer;
+import org.apache.james.GuiceJamesServerImpl;
 import org.apache.james.backends.cassandra.EmbeddedCassandra;
 import org.apache.james.dnsservice.api.DNSService;
 import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
@@ -42,7 +42,7 @@ public class CassandraJamesSmtpHostSystem extends 
ExternalSessionFactory impleme
 private EmbeddedCassandra embeddedCassandra;
 private EmbeddedElasticSearch embeddedElasticSearch;
 
-private GuiceJamesServer jamesServer;
+private GuiceJamesServerImpl jamesServer;
 private InMemoryDNSService inMemoryDNSService;
 
 
@@ -104,8 +104,8 @@ public class CassandraJamesSmtpHostSystem extends 
ExternalSessionFactory impleme
 return inMemoryDNSService;
 }
 
-protected GuiceJamesServer createJamesServer() {
-return new GuiceJamesServer()
+protected GuiceJamesServerImpl createJamesServer() {
+return new GuiceJamesServerImpl()
 .combineWith(CassandraJamesServerMain.cassandraServerModule)
 .overrideWith(new CassandraJmapServerModule(folder::getRoot, 
embeddedElasticSearch, embeddedCassandra),
 (binder) -> 
binder.bind(DNSService.class).toInstance(inMemoryDNSService));

http://git-wip-us.apache.org/repos/asf/james-project/blob/932f16c3/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
--
diff --git 
a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
 
b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
index f1ef305..e4375d4 100644
--- 
a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
+++ 
b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
@@ -27,7 +27,7 @@ import 

[15/29] james-project git commit: JAMES-1842: Add more interface for ExtendServerProbe

[aduprat]

JAMES-1842: Add more interface for ExtendServerProbe


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

Branch: refs/heads/master
Commit: e48ef9def640fc6116511ab5f5657679a145cdf0
Parents: 0c37cef
Author: Quynh Nguyen 
Authored: Fri Oct 28 16:29:05 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../james/utils/ExtendedJmapServerProbe.java| 17 +
 .../apache/james/utils/ExtendedServerProbe.java | 40 
 2 files changed, 41 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/e48ef9de/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java
index 415dfcc..04f2292 100644
--- 
a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java
+++ 
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java
@@ -19,26 +19,11 @@
 
 package org.apache.james.utils;
 
-import java.io.InputStream;
-import java.util.Date;
-
-import javax.mail.Flags;
-
-import org.apache.james.cli.probe.ServerProbe;
 import org.apache.james.jmap.api.vacation.AccountId;
 import org.apache.james.jmap.api.vacation.Vacation;
 import org.apache.james.jmap.api.vacation.VacationPatch;
-import org.apache.james.mailbox.exception.BadCredentialsException;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.store.mail.model.Mailbox;
-
-public interface ExtendedJmapServerProbe extends ServerProbe {
-
-void appendMessage(String username, MailboxPath mailboxPath, InputStream 
message, Date internalDate, boolean isRecent, Flags flags) 
-throws BadCredentialsException, MailboxException;
 
-Mailbox getMailbox(String namespace, String user, String name);
+public interface ExtendedJmapServerProbe extends ExtendedServerProbe {
 
 void modifyVacation(AccountId accountId, VacationPatch vacationPatch);
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/e48ef9de/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedServerProbe.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedServerProbe.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedServerProbe.java
new file mode 100644
index 000..7bc1a39
--- /dev/null
+++ 
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedServerProbe.java
@@ -0,0 +1,40 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *
+ /
+
+package org.apache.james.utils;
+
+import java.io.InputStream;
+import java.util.Date;
+
+import javax.mail.Flags;
+
+import org.apache.james.cli.probe.ServerProbe;
+import org.apache.james.mailbox.exception.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+

[17/29] james-project git commit: JAMES-1842: Rename ExtendedServerProbe to ExtendedJmapServerProbe

[aduprat]

JAMES-1842: Rename ExtendedServerProbe to ExtendedJmapServerProbe


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

Branch: refs/heads/master
Commit: 0c37cef36a4ac4d941d09225e755ebcb32fb72c1
Parents: 270a97f
Author: Quynh Nguyen 
Authored: Fri Oct 28 16:20:28 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../java/org/apache/james/GuiceJamesServer.java |  4 +-
 .../james/utils/ExtendedJmapServerProbe.java| 46 
 .../apache/james/utils/ExtendedServerProbe.java | 46 
 .../apache/james/utils/GuiceServerProbe.java|  4 +-
 .../james/mailets/TemporaryJamesServer.java |  4 +-
 5 files changed, 52 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/0c37cef3/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
index b3dc728..e9ce3f6 100644
--- 
a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
+++ 
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
@@ -29,7 +29,7 @@ import org.apache.james.modules.MailetProcessingModule;
 import org.apache.james.modules.ProtocolsModule;
 import org.apache.james.onami.lifecycle.Stager;
 import org.apache.james.utils.ConfigurationsPerformer;
-import org.apache.james.utils.ExtendedServerProbe;
+import org.apache.james.utils.ExtendedJmapServerProbe;
 import org.apache.james.utils.GuiceServerProbe;
 import org.apache.james.webadmin.Port;
 import org.apache.james.webadmin.WebAdminServer;
@@ -100,7 +100,7 @@ public class GuiceJamesServer {
 }
 }
 
-public ExtendedServerProbe serverProbe() {
+public ExtendedJmapServerProbe serverProbe() {
 return serverProbe;
 }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/0c37cef3/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java
new file mode 100644
index 000..415dfcc
--- /dev/null
+++ 
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/ExtendedJmapServerProbe.java
@@ -0,0 +1,46 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *
+ /
+
+package org.apache.james.utils;
+
+import java.io.InputStream;
+import java.util.Date;
+
+import javax.mail.Flags;
+
+import org.apache.james.cli.probe.ServerProbe;
+import org.apache.james.jmap.api.vacation.AccountId;
+import org.apache.james.jmap.api.vacation.Vacation;
+import org.apache.james.jmap.api.vacation.VacationPatch;
+import org.apache.james.mailbox.exception.BadCredentialsException;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.store.mail.model.Mailbox;
+
+public interface ExtendedJmapServerProbe extends ServerProbe {
+
+void 

[08/29] james-project git commit: JAMES-1842: Inversion of control on GuiceProbe

[aduprat]

JAMES-1842: Inversion of control on GuiceProbe


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

Branch: refs/heads/master
Commit: ebbf1e6fe6f41f568396f409a28381912d0aeebd
Parents: 2ae5e1a
Author: Quynh Nguyen 
Authored: Thu Nov 10 12:04:27 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../smtp/host/CassandraJamesSmtpHostSystem.java |   8 +-
 .../org/apache/james/CassandraJamesServer.java  |  58 +++
 .../apache/james/CassandraJamesServerMain.java  |   4 +-
 .../apache/james/CassandraJamesServerTest.java  |   6 +-
 .../james/JamesCapabilitiesServerTest.java  |   6 +-
 .../java/org/apache/james/GuiceJamesServer.java |  40 +-
 .../org/apache/james/GuiceJmapJamesServer.java  | 114 --
 .../main/java/org/apache/james/JmapServer.java  |  26 ++
 .../java/org/apache/james/WebAdminServer.java   |  25 ++
 .../james/modules/CommonServicesModule.java |   4 +
 .../apache/james/modules/ProtocolsModule.java   |   6 -
 .../modules/ProtocolsModuleWithoutJMAP.java |  30 --
 .../modules/protocols/JMAPServerModule.java |   3 +
 .../modules/server/WebAdminServerModule.java|   3 +
 .../james/utils/ExtendedJmapServerProbe.java|  31 --
 .../java/org/apache/james/utils/GuiceProbe.java |  22 ++
 .../apache/james/utils/GuiceProbeProvider.java  |  45 +++
 .../apache/james/utils/GuiceServerProbe.java|   4 +-
 .../org/apache/james/utils/JmapGuiceProbe.java  |  56 +++
 .../james/utils/JmapGuiceServerProbe.java   | 368 ---
 .../apache/james/utils/WebAdminGuiceProbe.java  |  37 ++
 .../james/AbstractJmapJamesServerTest.java  |  11 +-
 .../james/utils/GuiceProbeProviderTest.java |  68 
 .../modules/data/JPASieveRepositoryModule.java  |  18 +
 .../mailbox/LuceneSearchMailboxModule.java  |   8 +-
 .../org/apache/james/MemoryJamesServer.java |  56 +++
 .../org/apache/james/MemoryJamesServerMain.java |   4 +-
 .../org/apache/james/MemoryJamesServerTest.java |   6 +-
 .../james/mailets/TemporaryJamesServer.java |  11 +-
 .../CassandraGetMailboxesMethodTest.java|   8 +-
 .../CassandraGetMessageListMethodTest.java  |   8 +-
 .../CassandraGetVacationResponseTest.java   |   8 +-
 .../CassandraJmapAuthenticationTest.java|   8 +-
 .../CassandraSetMailboxesMethodTest.java|   8 +-
 .../CassandraSetMessagesMethodTest.java |   8 +-
 .../CassandraSetVacationResponseTest.java   |   8 +-
 .../CassandraVacationIntegrationTest.java   |   9 +-
 .../cassandra/cucumber/CassandraStepdefs.java   |   4 +-
 .../james/jmap/JMAPAuthenticationTest.java  |  15 +-
 .../james/jmap/VacationIntegrationTest.java |  19 +-
 .../integration/GetMailboxesMethodTest.java |  51 +--
 .../integration/GetMessageListMethodTest.java   |  15 +-
 .../integration/GetVacationResponseTest.java|  26 +-
 .../integration/SetMailboxesMethodTest.java |  15 +-
 .../integration/SetMessagesMethodTest.java  |  17 +-
 .../integration/SetVacationResponseTest.java|  33 +-
 .../integration/cucumber/MainStepdefs.java  |  14 +-
 .../memory/MemoryGetMailboxesMethodTest.java|   8 +-
 .../memory/MemoryGetMessageListMethodTest.java  |   8 +-
 .../MemoryGetVacationResponseMethodTest.java|   8 +-
 .../memory/MemoryJmapAuthenticationTest.java|   8 +-
 .../memory/MemorySetMailboxesMethodTest.java|   8 +-
 .../memory/MemorySetMessagesMethodTest.java |   8 +-
 .../MemorySetVacationResponseMethodTest.java|   8 +-
 .../memory/MemoryVacationIntegrationTest.java   |   8 +-
 .../jmap/memory/cucumber/MemoryStepdefs.java|   4 +-
 .../WebAdminServerIntegrationTest.java  |  11 +-
 57 files changed, 663 insertions(+), 768 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/ebbf1e6f/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
--
diff --git 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
index 836e4e5..4949765 100644
--- 
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
+++ 
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/host/CassandraJamesSmtpHostSystem.java
@@ -22,7 +22,7 @@ package org.apache.james.mpt.smtp.host;
 import java.util.Iterator;
 
 import org.apache.james.CassandraJamesServerMain;
-import 

[02/29] james-project git commit: JAMES-1842: Introduce SieveFile repository module

[aduprat]

JAMES-1842: Introduce SieveFile repository module


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

Branch: refs/heads/master
Commit: f824e277aebb8f6acd69b081e1788853a5acb7e9
Parents: ebbf1e6
Author: Quynh Nguyen 
Authored: Thu Nov 10 14:04:47 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../modules/data/SieveFileRepositoryModule.java | 36 
 .../org/apache/james/JPAJamesServerMain.java|  4 +--
 .../modules/data/JPASieveRepositoryModule.java  | 36 
 .../james/modules/data/MemoryDataModule.java|  5 ++-
 4 files changed, 40 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/f824e277/server/container/guice/guice-common/src/main/java/org/apache/james/modules/data/SieveFileRepositoryModule.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/data/SieveFileRepositoryModule.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/data/SieveFileRepositoryModule.java
new file mode 100644
index 000..c6b36fd
--- /dev/null
+++ 
b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/data/SieveFileRepositoryModule.java
@@ -0,0 +1,36 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *
+ /
+package org.apache.james.modules.data;
+
+import org.apache.james.sieverepository.api.SieveRepository;
+import org.apache.james.sieverepository.file.SieveFileRepository;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Scopes;
+
+public class SieveFileRepositoryModule extends AbstractModule {
+
+@Override
+protected void configure() {
+bind(SieveFileRepository.class).in(Scopes.SINGLETON);
+
+bind(SieveRepository.class).to(SieveFileRepository.class);
+}
+
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/f824e277/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
--
diff --git 
a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
 
b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
index ae623ce..97aeaa3 100644
--- 
a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
+++ 
b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
@@ -20,7 +20,7 @@
 package org.apache.james;
 
 import org.apache.james.modules.data.JPADataModule;
-import org.apache.james.modules.data.JPASieveRepositoryModule;
+import org.apache.james.modules.data.SieveFileRepositoryModule;
 import org.apache.james.modules.mailbox.JPAMailboxModule;
 import org.apache.james.modules.mailbox.LuceneSearchMailboxModule;
 import org.apache.james.modules.server.ActiveMQQueueModule;
@@ -35,7 +35,7 @@ public class JPAJamesServerMain {
 public static final Module jpaServerModule = Modules.combine(
 new JPAMailboxModule(),
 new JPADataModule(),
-new JPASieveRepositoryModule(),
+new SieveFileRepositoryModule(),
 new QuotaModule(),
 new ActiveMQQueueModule());
 

[07/29] james-project git commit: JAMES-1842: Inversion of control on GuiceProbe

[aduprat]

http://git-wip-us.apache.org/repos/asf/james-project/blob/ebbf1e6f/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
--
diff --git 
a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
 
b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
index 510876c..d7801d8 100644
--- 
a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
+++ 
b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapAuthenticationTest.java
@@ -18,8 +18,8 @@
  /
 package org.apache.james.jmap.cassandra;
 
+import org.apache.james.CassandraJamesServer;
 import org.apache.james.CassandraJamesServerMain;
-import org.apache.james.GuiceJmapJamesServer;
 import org.apache.james.backends.cassandra.EmbeddedCassandra;
 import org.apache.james.jmap.FixedDateZonedDateTimeProvider;
 import org.apache.james.jmap.JMAPAuthenticationTest;
@@ -30,7 +30,7 @@ import org.junit.Rule;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TemporaryFolder;
 
-public class CassandraJmapAuthenticationTest extends JMAPAuthenticationTest {
+public class CassandraJmapAuthenticationTest extends 
JMAPAuthenticationTest {
 
 private TemporaryFolder temporaryFolder = new TemporaryFolder();
 private EmbeddedElasticSearch embeddedElasticSearch = new 
EmbeddedElasticSearch(temporaryFolder);
@@ -42,8 +42,8 @@ public class CassandraJmapAuthenticationTest extends 
JMAPAuthenticationTest {
 .around(embeddedElasticSearch);
 
 @Override
-protected GuiceJmapJamesServer 
createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) {
-return new GuiceJmapJamesServer()
+protected CassandraJamesServer 
createJmapServer(FixedDateZonedDateTimeProvider zonedDateTimeProvider) {
+return new CassandraJamesServer()
 
.combineWith(CassandraJamesServerMain.cassandraServerModule)
 .overrideWith(new 
CassandraJmapServerModule(temporaryFolder, embeddedElasticSearch, cassandra),
 (binder) -> 
binder.bind(ZonedDateTimeProvider.class).toInstance(zonedDateTimeProvider));

http://git-wip-us.apache.org/repos/asf/james-project/blob/ebbf1e6f/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
--
diff --git 
a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
 
b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
index 443f48b..59017a3 100644
--- 
a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
+++ 
b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraSetMailboxesMethodTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.james.jmap.cassandra;
 
+import org.apache.james.CassandraJamesServer;
 import org.apache.james.CassandraJamesServerMain;
-import org.apache.james.GuiceJmapJamesServer;
 import org.apache.james.backends.cassandra.EmbeddedCassandra;
 import org.apache.james.jmap.methods.integration.SetMailboxesMethodTest;
 import org.apache.james.mailbox.elasticsearch.EmbeddedElasticSearch;
@@ -29,7 +29,7 @@ import org.junit.Rule;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TemporaryFolder;
 
-public class CassandraSetMailboxesMethodTest extends SetMailboxesMethodTest {
+public class CassandraSetMailboxesMethodTest extends 
SetMailboxesMethodTest {
 
 private TemporaryFolder temporaryFolder = new TemporaryFolder();
 private EmbeddedElasticSearch embeddedElasticSearch = new 
EmbeddedElasticSearch(temporaryFolder);
@@ -41,8 +41,8 @@ public class CassandraSetMailboxesMethodTest extends 
SetMailboxesMethodTest {
 .around(embeddedElasticSearch);
 
 @Override
-protected GuiceJmapJamesServer createJmapServer() {
-return new GuiceJmapJamesServer()
+protected CassandraJamesServer createJmapServer() {
+return new CassandraJamesServer()
 
.combineWith(CassandraJamesServerMain.cassandraServerModule)
 

[13/29] james-project git commit: JAMES-1842: Rename GuiceServerProbe to JmapGuiceServerProbe

[aduprat]

JAMES-1842: Rename GuiceServerProbe to JmapGuiceServerProbe


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

Branch: refs/heads/master
Commit: 91be31f9b0f3d0838267c7f90fceb83ff9af5b71
Parents: e48ef9d
Author: Quynh Nguyen 
Authored: Fri Oct 28 16:38:04 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../java/org/apache/james/GuiceJamesServer.java |   6 +-
 .../james/modules/CommonServicesModule.java |   4 +-
 .../apache/james/utils/GuiceServerProbe.java| 368 ---
 .../james/utils/JmapGuiceServerProbe.java   | 368 +++
 4 files changed, 373 insertions(+), 373 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/91be31f9/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
index e9ce3f6..6d0209d 100644
--- 
a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
+++ 
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
@@ -30,7 +30,7 @@ import org.apache.james.modules.ProtocolsModule;
 import org.apache.james.onami.lifecycle.Stager;
 import org.apache.james.utils.ConfigurationsPerformer;
 import org.apache.james.utils.ExtendedJmapServerProbe;
-import org.apache.james.utils.GuiceServerProbe;
+import org.apache.james.utils.JmapGuiceServerProbe;
 import org.apache.james.webadmin.Port;
 import org.apache.james.webadmin.WebAdminServer;
 
@@ -46,7 +46,7 @@ public class GuiceJamesServer {
 
 private final Module module;
 private Stager preDestroy;
-private GuiceServerProbe serverProbe;
+private JmapGuiceServerProbe serverProbe;
 private Optional jmapPort;
 private Optional webadminPort;
 
@@ -73,7 +73,7 @@ public class GuiceJamesServer {
 Injector injector = Guice.createInjector(module);
 preDestroy = injector.getInstance(Key.get(new 
TypeLiteral() {}));
 injector.getInstance(ConfigurationsPerformer.class).initModules();
-serverProbe = injector.getInstance(GuiceServerProbe.class);
+serverProbe = injector.getInstance(JmapGuiceServerProbe.class);
 jmapPort = locateJMAPPort(injector);
 webadminPort =locateWebAdminPort(injector);
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/91be31f9/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java
index e79ed7f..10af893 100644
--- 
a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java
+++ 
b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java
@@ -33,7 +33,7 @@ import 
org.apache.james.modules.server.AsyncTasksExecutorModule;
 import org.apache.james.modules.server.ConfigurationProviderModule;
 import org.apache.james.modules.server.DNSServiceModule;
 import org.apache.james.onami.lifecycle.PreDestroyModule;
-import org.apache.james.utils.GuiceServerProbe;
+import org.apache.james.utils.JmapGuiceServerProbe;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
@@ -55,7 +55,7 @@ public class CommonServicesModule extends AbstractModule {
 install(new AsyncTasksExecutorModule());
 
 bind(FileSystemImpl.class).in(Scopes.SINGLETON);
-bind(GuiceServerProbe.class).in(Scopes.SINGLETON);
+bind(JmapGuiceServerProbe.class).in(Scopes.SINGLETON);
 
 bind(FileSystem.class).to(FileSystemImpl.class);
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/91be31f9/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceServerProbe.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceServerProbe.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/GuiceServerProbe.java
deleted file mode 100644
index cbc7f81..000
--- 

[10/29] james-project git commit: JAMES-1842: Add jpa-guice module

[aduprat]

http://git-wip-us.apache.org/repos/asf/james-project/blob/d65e484a/server/container/guice/jpa-guice/src/test/resources/pop3server.xml
--
diff --git a/server/container/guice/jpa-guice/src/test/resources/pop3server.xml 
b/server/container/guice/jpa-guice/src/test/resources/pop3server.xml
new file mode 100644
index 000..e4187da
--- /dev/null
+++ b/server/container/guice/jpa-guice/src/test/resources/pop3server.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+pop3server
+0.0.0.0:1110
+200
+
+
+file://conf/keystore
+james72laBalle
+
org.bouncycastle.jce.provider.BouncyCastleProvider
+
+1200
+0
+0
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/james-project/blob/d65e484a/server/container/guice/jpa-guice/src/test/resources/smtpserver.xml
--
diff --git a/server/container/guice/jpa-guice/src/test/resources/smtpserver.xml 
b/server/container/guice/jpa-guice/src/test/resources/smtpserver.xml
new file mode 100644
index 000..a3d4b8f
--- /dev/null
+++ b/server/container/guice/jpa-guice/src/test/resources/smtpserver.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+smtpserver-global
+0.0.0.0:1025
+200
+
+file://conf/keystore
+james72laBalle
+
org.bouncycastle.jce.provider.BouncyCastleProvider
+SunX509
+
+360
+0
+0
+false
+0.0.0.0/0
+true
+0
+true
+JAMES Linagora's SMTP awesome Server
+
+
+
+
+
+
+smtpserver-TLS
+0.0.0.0:10465
+200
+
+file://conf/keystore
+james72laBalle
+
org.bouncycastle.jce.provider.BouncyCastleProvider
+SunX509
+
+360
+0
+0
+
+true
+0.0.0.0/0
+
+false
+0
+true
+JAMES Linagora's SMTP awesome Server
+
+
+
+
+
+
+smtpserver-authenticated
+0.0.0.0:1587
+200
+
+file://conf/keystore
+james72laBalle
+
org.bouncycastle.jce.provider.BouncyCastleProvider
+SunX509
+
+360
+0
+0
+
+true
+0.0.0.0/0
+
+false
+0
+true
+JAMES Linagora's SMTP awesome Server
+
+
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/james-project/blob/d65e484a/server/container/guice/pom.xml
--
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index 16d39b0..92a62bb 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -36,6 +36,7 @@
 guice-common
 cassandra-guice
 memory-guice
+jpa-guice
 onami
 
 


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

[26/29] james-project git commit: JAMES-1842: Introduce JmapJamesServer interface

[aduprat]

JAMES-1842: Introduce JmapJamesServer interface


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

Branch: refs/heads/master
Commit: f11fa6140e2c01db4f2b1aaf76dc3ffe6a091a06
Parents: fdb400d
Author: Antoine Duprat 
Authored: Wed Nov 16 10:05:38 2016 +0100
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:33:20 2016 +0700

--
 .../org/apache/james/CassandraJamesServer.java  |  2 +-
 .../james/AbstractJmapJamesServerTest.java  |  2 +-
 .../java/org/apache/james/JmapJamesServer.java  | 23 
 .../org/apache/james/MemoryJamesServer.java |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/f11fa614/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
--
diff --git 
a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
 
b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
index e4375d4..4ca7c76 100644
--- 
a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
+++ 
b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/CassandraJamesServer.java
@@ -27,7 +27,7 @@ import com.google.common.collect.Iterables;
 import com.google.inject.Module;
 import com.google.inject.util.Modules;
 
-public class CassandraJamesServer extends GuiceJamesServerImpl implements 
JmapServer, WebAdminServer {
+public class CassandraJamesServer extends GuiceJamesServerImpl implements 
JmapJamesServer {
 
 public CassandraJamesServer() {
 super();

http://git-wip-us.apache.org/repos/asf/james-project/blob/f11fa614/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
--
diff --git 
a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
 
b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
index cdfd301..46d8917 100644
--- 
a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
+++ 
b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
@@ -39,7 +39,7 @@ import com.jayway.restassured.RestAssured;
 import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 
-public abstract class AbstractJmapJamesServerTest {
+public abstract class AbstractJmapJamesServerTest {
 
 private static final int IMAP_PORT = 1143; // You need to be root 
(superuser) to bind to ports under 1024.
 private static final int IMAP_PORT_SSL = 1993;

http://git-wip-us.apache.org/repos/asf/james-project/blob/f11fa614/server/container/guice/guice-common/src/test/java/org/apache/james/JmapJamesServer.java
--
diff --git 
a/server/container/guice/guice-common/src/test/java/org/apache/james/JmapJamesServer.java
 
b/server/container/guice/guice-common/src/test/java/org/apache/james/JmapJamesServer.java
new file mode 100644
index 000..cf374ba
--- /dev/null
+++ 
b/server/container/guice/guice-common/src/test/java/org/apache/james/JmapJamesServer.java
@@ -0,0 +1,23 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *

[11/29] james-project git commit: JAMES-1842: Add jpa-guice module

[aduprat]

JAMES-1842: Add jpa-guice module


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

Branch: refs/heads/master
Commit: d65e484a701c04efd570fc8fbc6050a5f273ed33
Parents: 4bc564d
Author: Quynh Nguyen 
Authored: Fri Oct 28 12:24:15 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../james-database.properties   |  40 +++
 .../MailetProcessingWithoutCamelModule.java |  34 ++
 .../modules/ProtocolsModuleWithoutJMAP.java |  25 ++
 server/container/guice/jpa-guice/README.adoc|  40 +++
 server/container/guice/jpa-guice/pom.xml| 336 +++
 .../java/org/apache/james/JPAConfiguration.java |  63 
 .../org/apache/james/JPAJamesServerMain.java|  61 
 .../james/modules/data/JPADataJmapModule.java   |  22 ++
 .../james/modules/data/JPADomainListModule.java |  77 +
 .../data/JPARecipientRewriteTableModule.java|  78 +
 .../modules/data/JPAUsersRepositoryModule.java  |  79 +
 .../james/modules/mailbox/JPAMailboxModule.java | 134 
 .../mailbox/LuceneSearchMailboxModule.java  |  55 +++
 .../ScheduledExecutorServiceProvider.java   |  49 +++
 .../jpa-guice/src/main/resources/logback.xml|  22 ++
 .../org/apache/james/JPAJamesServerTest.java|  44 +++
 .../james/JamesCapabilitiesServerTest.java  |  75 +
 .../james/TestJPAConfigurationModule.java   |  49 +++
 .../jpa-guice/src/test/resources/dnsservice.xml |  29 ++
 .../test/resources/fakemailrepositorystore.xml  |  31 ++
 .../jpa-guice/src/test/resources/imapserver.xml |  54 +++
 .../guice/jpa-guice/src/test/resources/keystore | Bin 0 -> 2245 bytes
 .../jpa-guice/src/test/resources/lmtpserver.xml |  41 +++
 .../src/test/resources/mailetcontainer.xml  | 113 +++
 .../src/test/resources/mailrepositorystore.xml  |  31 ++
 .../src/test/resources/managesieveserver.xml|  65 
 .../jpa-guice/src/test/resources/pop3server.xml |  42 +++
 .../jpa-guice/src/test/resources/smtpserver.xml | 105 ++
 server/container/guice/pom.xml  |   1 +
 29 files changed, 1795 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/d65e484a/server/container/guice/guice-common/sample-configuration/james-database.properties
--
diff --git 
a/server/container/guice/guice-common/sample-configuration/james-database.properties
 
b/server/container/guice/guice-common/sample-configuration/james-database.properties
new file mode 100644
index 000..b3ac7eb
--- /dev/null
+++ 
b/server/container/guice/guice-common/sample-configuration/james-database.properties
@@ -0,0 +1,40 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+#  This template file can be used as example for James Server configuration
+#  DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
+
+# See http://james.apache.org/server/3/config.html for usage
+
+# Use derby as default
+database.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
+database.url=jdbc:derby:../var/store/derby;create=true
+database.username=app
+database.password=app
+
+# Supported adapters are:
+# DB2, DERBY, H2, HSQL, INFORMIX, MYSQL, ORACLE, POSTGRESQL, SQL_SERVER, 
SYBASE 
+vendorAdapter.database=DERBY
+
+# Use streaming for Blobs
+# This is only supported on a limited set of databases atm. You should check 
if its supported by your DB before enable
+# it. 
+# 
+# See:
+# 
http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html  
#7.11.  LOB Streaming 
+# 
+openjpa.streaming=false
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/james-project/blob/d65e484a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingWithoutCamelModule.java

[01/29] james-project git commit: JAMES-1842 Remove MailetProcessingWithoutCamelModule

[aduprat]

Repository: james-project
Updated Branches:
  refs/heads/master 73a7c4682 -> 56acfd067


JAMES-1842 Remove MailetProcessingWithoutCamelModule


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

Branch: refs/heads/master
Commit: df98b6e38d1e8dd3d61427382e96b60c4bee4793
Parents: f824e27
Author: Quynh Nguyen 
Authored: Thu Nov 10 14:48:25 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../MailetProcessingWithoutCamelModule.java | 34 
 1 file changed, 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/df98b6e3/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingWithoutCamelModule.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingWithoutCamelModule.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingWithoutCamelModule.java
deleted file mode 100644
index 78fbc98..000
--- 
a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingWithoutCamelModule.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information*
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the*
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *  *
- *   http://www.apache.org/licenses/LICENSE-2.0 *
- *  *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
- * KIND, either express or implied.  See the License for the*
- * specific language governing permissions and limitations  *
- * under the License.   *
- /
-package org.apache.james.modules;
-
-import org.apache.james.modules.server.MailStoreRepositoryModule;
-import org.apache.james.modules.server.SieveModule;
-
-import com.google.inject.AbstractModule;
-
-public class MailetProcessingWithoutCamelModule extends AbstractModule {
-
-@Override
-protected void configure() {
-install(new SieveModule());
-install(new MailStoreRepositoryModule());
-}
-
-}


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

[14/29] james-project git commit: JAMES-1842: JPA needs lucene so it should not run exclude-lucene profile

[aduprat]

JAMES-1842: JPA needs lucene so it should not run exclude-lucene profile


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

Branch: refs/heads/master
Commit: c659fcb1aded8ec1059e8f55c5ab88848f2f2fbd
Parents: 11771d0
Author: Quynh Nguyen 
Authored: Mon Oct 31 16:45:09 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 dockerfiles/compilation/java-8/compile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/c659fcb1/dockerfiles/compilation/java-8/compile.sh
--
diff --git a/dockerfiles/compilation/java-8/compile.sh 
b/dockerfiles/compilation/java-8/compile.sh
index a9f6da2..966f872 100755
--- a/dockerfiles/compilation/java-8/compile.sh
+++ b/dockerfiles/compilation/java-8/compile.sh
@@ -44,9 +44,9 @@ git checkout $SHA1
 # Compilation
 
 if [ "$SKIPTESTS" = "skipTests" ]; then
-   mvn package -DskipTests 
-Pcassandra,elasticsearch,inmemory,exclude-lucene,with-assembly,with-jetm
+   mvn package -DskipTests 
-Pcassandra,elasticsearch,inmemory,with-assembly,with-jetm
 else
-   mvn package 
-Pcassandra,inmemory,elasticsearch,exclude-lucene,with-assembly,with-jetm
+   mvn package -Pcassandra,inmemory,elasticsearch,with-assembly,with-jetm
 fi
 
 # Retrieve result


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

[05/29] james-project git commit: JAMES-1842: Remove sample-configuration on common and move them to specified module

[aduprat]

JAMES-1842: Remove sample-configuration on common and move them to specified 
module


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

Branch: refs/heads/master
Commit: b45667b6cbb0c6fcf3e22fcc849345415a87c849
Parents: c659fcb
Author: Quynh Nguyen 
Authored: Thu Nov 3 17:08:27 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../sample-configuration/cassandra.properties   |   6 +
 .../sample-configuration/dnsservice.xml |  29 
 .../sample-configuration/domainlist.xml |  28 
 .../elasticsearch.properties|  26 
 .../sample-configuration/imapserver.xml |  54 
 .../sample-configuration/jmap.properties|  11 ++
 .../sample-configuration/jmx.properties |  28 
 .../sample-configuration/lmtpserver.xml |  41 ++
 .../sample-configuration/mailetcontainer.xml| 138 +++
 .../mailrepositorystore.xml |  34 +
 .../sample-configuration/pop3server.xml |  42 ++
 .../recipientrewritetable.xml   |  27 
 .../sample-configuration/smtpserver.xml | 105 ++
 .../sample-configuration/usersrepository.xml|  27 
 .../sample-configuration/cassandra.properties   |   6 -
 .../sample-configuration/dnsservice.xml |  29 
 .../sample-configuration/domainlist.xml |  28 
 .../elasticsearch.properties|  26 
 .../sample-configuration/imapserver.xml |  54 
 .../james-database.properties   |  40 --
 .../sample-configuration/jcr-repository.xml |  72 --
 .../sample-configuration/jmap.properties|  11 --
 .../sample-configuration/jmx.properties |  28 
 .../sample-configuration/lmtpserver.xml |  41 --
 .../sample-configuration/mailetcontainer.xml| 137 --
 .../mailrepositorystore.xml |  34 -
 .../sample-configuration/pop3server.xml |  42 --
 .../recipientrewritetable.xml   |  27 
 .../sample-configuration/smtpserver.xml | 105 --
 .../sample-configuration/usersrepository.xml|  27 
 .../sample-configuration/dnsservice.xml |  29 
 .../sample-configuration/domainlist.xml |  28 
 .../sample-configuration/imapserver.xml |  54 
 .../james-database.properties   |  40 ++
 .../sample-configuration/jmx.properties |  28 
 .../sample-configuration/lmtpserver.xml |  41 ++
 .../sample-configuration/mailetcontainer.xml| 137 ++
 .../mailrepositorystore.xml |  34 +
 .../sample-configuration/pop3server.xml |  42 ++
 .../recipientrewritetable.xml   |  27 
 .../sample-configuration/smtpserver.xml | 105 ++
 .../sample-configuration/usersrepository.xml|  27 
 .../sample-configuration/dnsservice.xml |  29 
 .../sample-configuration/domainlist.xml |  28 
 .../sample-configuration/imapserver.xml |  54 
 .../sample-configuration/jmap.properties|  11 ++
 .../sample-configuration/jmx.properties |  28 
 .../sample-configuration/lmtpserver.xml |  41 ++
 .../sample-configuration/mailetcontainer.xml| 137 ++
 .../mailrepositorystore.xml |  34 +
 .../sample-configuration/pop3server.xml |  42 ++
 .../recipientrewritetable.xml   |  27 
 .../sample-configuration/smtpserver.xml | 105 ++
 .../sample-configuration/usersrepository.xml|  27 
 54 files changed, 1751 insertions(+), 707 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/b45667b6/server/container/guice/cassandra-guice/sample-configuration/cassandra.properties
--
diff --git 
a/server/container/guice/cassandra-guice/sample-configuration/cassandra.properties
 
b/server/container/guice/cassandra-guice/sample-configuration/cassandra.properties
new file mode 100644
index 000..1358332
--- /dev/null
+++ 
b/server/container/guice/cassandra-guice/sample-configuration/cassandra.properties
@@ -0,0 +1,6 @@
+# Configuration file for cassandra mailbox
+
+cassandra.ip=172.17.0.2
+cassandra.port=9042
+cassandra.keyspace=apache_james
+cassandra.replication.factor=1
\ No newline at end of file

[12/29] james-project git commit: JAMES-1842: James server supports JPA, enrich persistence file

[aduprat]

JAMES-1842: James server supports JPA, enrich persistence file


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

Branch: refs/heads/master
Commit: 4bc564df7cff035b86344829a23c9c1cff55cd89
Parents: 3ed07d6
Author: Quynh Nguyen 
Authored: Fri Oct 28 12:20:20 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../jpa/src/main/resources/META-INF/persistence.xml|  3 +++
 .../src/main/resources/META-INF/persistence.xml|  6 ++
 server/pom.xml | 13 -
 3 files changed, 21 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/4bc564df/mailbox/jpa/src/main/resources/META-INF/persistence.xml
--
diff --git a/mailbox/jpa/src/main/resources/META-INF/persistence.xml 
b/mailbox/jpa/src/main/resources/META-INF/persistence.xml
index 3ec5f22..a9cbc68 100644
--- a/mailbox/jpa/src/main/resources/META-INF/persistence.xml
+++ b/mailbox/jpa/src/main/resources/META-INF/persistence.xml
@@ -30,6 +30,9 @@
 
org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage
 org.apache.james.mailbox.jpa.mail.model.JPAProperty
 org.apache.james.mailbox.jpa.user.model.JPASubscription
+org.apache.james.domainlist.jpa.model.JPADomain
+org.apache.james.user.jpa.model.JPAUser
+org.apache.james.rrt.jpa.model.JPARecipientRewrite
 
 
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/4bc564df/server/data/data-jpa/src/main/resources/META-INF/persistence.xml
--
diff --git a/server/data/data-jpa/src/main/resources/META-INF/persistence.xml 
b/server/data/data-jpa/src/main/resources/META-INF/persistence.xml
index 14a6a4f..9e7bdf9 100644
--- a/server/data/data-jpa/src/main/resources/META-INF/persistence.xml
+++ b/server/data/data-jpa/src/main/resources/META-INF/persistence.xml
@@ -26,6 +26,12 @@
 

org.apache.openjpa.persistence.PersistenceProviderImpl
 
osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/james)
+org.apache.james.mailbox.jpa.mail.model.JPAMailbox
+org.apache.james.mailbox.jpa.mail.model.JPAUserFlag
+
org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMessage
+
org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMessage
+org.apache.james.mailbox.jpa.mail.model.JPAProperty
+org.apache.james.mailbox.jpa.user.model.JPASubscription
 org.apache.james.domainlist.jpa.model.JPADomain
 org.apache.james.user.jpa.model.JPAUser
 org.apache.james.rrt.jpa.model.JPARecipientRewrite

http://git-wip-us.apache.org/repos/asf/james-project/blob/4bc564df/server/pom.xml
--
diff --git a/server/pom.xml b/server/pom.xml
index cb25e8f..efd8a5d 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -703,6 +703,12 @@
 ${project.version}
 
 
+org.apache.james
+apache-james-mailbox-lucene
+${project.version}
+test-jar
+
+
 org.apache.james.protocols
 protocols-imap
 ${project.version}
@@ -785,6 +791,12 @@
 
 
 org.apache.james
+apache-james-mailbox-jpa
+${project.version}
+test-jar
+
+
+org.apache.james
 apache-james-mailbox-tool
 ${project.version}
 
@@ -1185,7 +1197,6 @@
 org.apache.openjpa
 openjpa
 ${openjpa.version}
-runtime
 
 
 org.apache.geronimo.specs


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

[03/29] james-project git commit: JAMES-1842: Update new version of new module

[aduprat]

JAMES-1842: Update new version of new module


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

Branch: refs/heads/master
Commit: 2ae5e1a1326127a723fc753c2d4bcdd8ee6fa596
Parents: b45667b
Author: Quynh Nguyen 
Authored: Fri Nov 4 10:56:26 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 server/container/guice/jpa-guice/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/2ae5e1a1/server/container/guice/jpa-guice/pom.xml
--
diff --git a/server/container/guice/jpa-guice/pom.xml 
b/server/container/guice/jpa-guice/pom.xml
index 73beb1d..28567a9 100644
--- a/server/container/guice/jpa-guice/pom.xml
+++ b/server/container/guice/jpa-guice/pom.xml
@@ -25,7 +25,7 @@
 
 org.apache.james
 james-server-guice
-3.0.0-beta5-SNAPSHOT
+3.0.0-beta6-SNAPSHOT
 ../pom.xml
 
 


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

[09/29] james-project git commit: JAMES-1842: JMAP port should be Optional

[aduprat]

JAMES-1842: JMAP port should be Optional


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

Branch: refs/heads/master
Commit: 978e722ebee120f42b835911b644f5758fefe3e7
Parents: ff57437
Author: Quynh Nguyen 
Authored: Fri Oct 28 12:07:17 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../java/org/apache/james/GuiceJamesServer.java | 16 
 .../org/apache/james/AbstractJamesServerTest.java   |  6 +-
 .../apache/james/jmap/JMAPAuthenticationTest.java   |  3 ++-
 .../apache/james/jmap/VacationIntegrationTest.java  |  3 ++-
 .../methods/integration/GetMailboxesMethodTest.java |  3 ++-
 .../integration/GetMessageListMethodTest.java   |  3 ++-
 .../integration/GetVacationResponseTest.java|  3 ++-
 .../methods/integration/SetMailboxesMethodTest.java |  3 ++-
 .../methods/integration/SetMessagesMethodTest.java  |  3 ++-
 .../integration/SetVacationResponseTest.java|  3 ++-
 .../methods/integration/cucumber/MainStepdefs.java  |  3 ++-
 11 files changed, 35 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/978e722e/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
--
diff --git 
a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
 
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
index 39411b0..b3dc728 100644
--- 
a/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
+++ 
b/server/container/guice/guice-common/src/main/java/org/apache/james/GuiceJamesServer.java
@@ -47,7 +47,7 @@ public class GuiceJamesServer {
 private final Module module;
 private Stager preDestroy;
 private GuiceServerProbe serverProbe;
-private int jmapPort;
+private Optional jmapPort;
 private Optional webadminPort;
 
 public GuiceJamesServer() {
@@ -57,7 +57,7 @@ public class GuiceJamesServer {
 new MailetProcessingModule()));
 }
 
-private GuiceJamesServer(Module module) {
+public GuiceJamesServer(Module module) {
 this.module = module;
 }
 
@@ -74,10 +74,18 @@ public class GuiceJamesServer {
 preDestroy = injector.getInstance(Key.get(new 
TypeLiteral() {}));
 injector.getInstance(ConfigurationsPerformer.class).initModules();
 serverProbe = injector.getInstance(GuiceServerProbe.class);
-jmapPort = injector.getInstance(JMAPServer.class).getPort();
+jmapPort = locateJMAPPort(injector);
 webadminPort =locateWebAdminPort(injector);
 }
 
+private Optional locateJMAPPort(Injector injector) {
+try {
+return 
Optional.of(injector.getInstance(JMAPServer.class).getPort());
+} catch(Exception e) {
+return Optional.empty();
+}
+}
+
 private Optional locateWebAdminPort(Injector injector) {
 try {
 return 
Optional.of(injector.getInstance(WebAdminServer.class).getPort());
@@ -96,7 +104,7 @@ public class GuiceJamesServer {
 return serverProbe;
 }
 
-public int getJmapPort() {
+public Optional getJmapPort() {
 return jmapPort;
 }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/978e722e/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java
--
diff --git 
a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java
 
b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java
index 6529ef4..11fc881 100644
--- 
a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java
+++ 
b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java
@@ -31,6 +31,7 @@ import java.nio.channels.SocketChannel;
 import java.nio.charset.Charset;
 
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -46,6 +47,7 @@ public abstract class AbstractJamesServerTest {
 private static final int POP3_PORT = 1110;
 private static final int SMTP_PORT = 1025;
 private static final int LMTP_PORT = 1024;
+private static final int JMAP_PORT = 1080;
 
 private GuiceJamesServer server;
 private SocketChannel socketChannel;
@@ -60,7 +62,8 @@ public abstract 

[06/29] james-project git commit: JAMES-1842: Related JPA objects should be injectable

[aduprat]

JAMES-1842: Related JPA objects should be injectable


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

Branch: refs/heads/master
Commit: 3ed07d6a8578eeebe8a26e48b14d1b50c4b7cff2
Parents: 978e722
Author: Quynh Nguyen 
Authored: Fri Oct 28 12:16:15 2016 +0700
Committer: Quynh Nguyen 
Committed: Fri Nov 18 09:25:34 2016 +0700

--
 .../apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java  | 2 ++
 .../java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java | 3 +++
 .../java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java | 2 ++
 .../java/org/apache/james/mailbox/jpa/mail/JPAUidProvider.java| 2 ++
 .../apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java   | 3 +++
 .../james/mailbox/lucene/search/LuceneMessageSearchIndex.java | 3 ++-
 .../main/java/org/apache/james/domainlist/jpa/JPADomainList.java  | 2 ++
 7 files changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/3ed07d6a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
--
diff --git 
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
 
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
index 9a219af..dfdd356 100644
--- 
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
+++ 
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
@@ -18,6 +18,7 @@
  /
 package org.apache.james.mailbox.jpa;
 
+import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
@@ -47,6 +48,7 @@ public class JPAMailboxSessionMapperFactory extends 
MailboxSessionMapperFactory
 private final UidProvider uidProvider;
 private final ModSeqProvider modSeqProvider;
 
+@Inject
 public JPAMailboxSessionMapperFactory(EntityManagerFactory 
entityManagerFactory, UidProvider uidProvider, ModSeqProvider modSeqProvider) {
 this.entityManagerFactory = entityManagerFactory;
 this.uidProvider = uidProvider;

http://git-wip-us.apache.org/repos/asf/james-project/blob/3ed07d6a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
--
diff --git 
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
 
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
index bf5a0e6..8251052 100644
--- 
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
+++ 
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPASubscriptionManager.java
@@ -18,6 +18,8 @@
  /
 package org.apache.james.mailbox.jpa;
 
+import javax.inject.Inject;
+
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.jpa.user.model.JPASubscription;
 import org.apache.james.mailbox.store.StoreSubscriptionManager;
@@ -29,6 +31,7 @@ import org.apache.james.mailbox.store.user.model.Subscription;
  */
 public class JPASubscriptionManager extends StoreSubscriptionManager {
 
+@Inject
 public JPASubscriptionManager(JPAMailboxSessionMapperFactory 
mapperFactory) {
 super(mapperFactory);
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/3ed07d6a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java
--
diff --git 
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java
 
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java
index 7d002d6..5896243 100644
--- 
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java
+++ 
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java
@@ -18,6 +18,7 @@
  /
 package org.apache.james.mailbox.jpa.mail;
 
+import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceException;
@@ -34,6 +35,7 @@ public class JPAModSeqProvider extends 
AbstractLockingModSeqProvider {
 
 private final EntityManagerFactory factory;
 
+

[04/29] james-project git commit: JAMES-1842: Remove sample-configuration on common and move them to specified module

[aduprat]

http://git-wip-us.apache.org/repos/asf/james-project/blob/b45667b6/server/container/guice/jpa-guice/sample-configuration/lmtpserver.xml
--
diff --git 
a/server/container/guice/jpa-guice/sample-configuration/lmtpserver.xml 
b/server/container/guice/jpa-guice/sample-configuration/lmtpserver.xml
new file mode 100644
index 000..87a0caa
--- /dev/null
+++ b/server/container/guice/jpa-guice/sample-configuration/lmtpserver.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+lmtpserver
+
+127.0.0.1:1024
+200
+1200
+
+0
+
+0
+
+
+0
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/james-project/blob/b45667b6/server/container/guice/jpa-guice/sample-configuration/mailetcontainer.xml
--
diff --git 
a/server/container/guice/jpa-guice/sample-configuration/mailetcontainer.xml 
b/server/container/guice/jpa-guice/sample-configuration/mailetcontainer.xml
new file mode 100644
index 000..968b59c
--- /dev/null
+++ b/server/container/guice/jpa-guice/sample-configuration/mailetcontainer.xml
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+postmas...@james.minet.net
+
+
+
+20
+
+
+
+
+
+
+
+
+sieve-manager-check
+
+
+transport
+
+
+true
+
+
+transport
+
+
+transport
+
+
+
+
+
+
+spam
+550 Requested action not taken: rejected - see 
http://njabl.org/
+
+
+transport
+
+
+
+
+
+
+file://var/mail/error/
+
+
+
+
+
+
+X-UserIsAuth
+true
+
+
+X-WasSigned
+true
+
+
+
+
+local-address-error
+550 - Requested action not taken: no such user 
here
+
+
+outgoing
+5000, 10, 50
+25
+0
+10
+true
+bounces
+
+
+relay-denied
+
+
+
+
+
+file://var/mail/spam/
+
+
+
+
+
+none
+
+
+file://var/mail/address-error/
+
+
+
+
+
+none
+
+
+file://var/mail/relay-denied/
+Warning: You are sending an e-mail to a remote server. 
You must be authentified to perform such an operation
+
+
+
+
+
+false
+
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/james-project/blob/b45667b6/server/container/guice/jpa-guice/sample-configuration/mailrepositorystore.xml
--
diff --git 
a/server/container/guice/jpa-guice/sample-configuration/mailrepositorystore.xml 
b/server/container/guice/jpa-guice/sample-configuration/mailrepositorystore.xml
new file mode 100644
index 000..acca810
--- /dev/null
+++ 
b/server/container/guice/jpa-guice/sample-configuration/mailrepositorystore.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+file
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/james-project/blob/b45667b6/server/container/guice/jpa-guice/sample-configuration/pop3server.xml
--
diff --git 
a/server/container/guice/jpa-guice/sample-configuration/pop3server.xml 
b/server/container/guice/jpa-guice/sample-configuration/pop3server.xml
new file mode 100644
index 000..c57c832
--- /dev/null
+++ b/server/container/guice/jpa-guice/sample-configuration/pop3server.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+pop3server
+0.0.0.0:1110
+200
+
+
+file://conf/keystore
+james72laBalle
+
org.bouncycastle.jce.provider.BouncyCastleProvider
+
+1200
+0
+0
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/james-project/blob/b45667b6/server/container/guice/jpa-guice/sample-configuration/recipientrewritetable.xml
--
diff --git 

[jira] [Closed] (JAMES-1861) Sometimes JMAP fail to parse message containing lines with more than 1000 characters

[JIRA]

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

Raphaël Ouazana closed JAMES-1861.
--
Resolution: Fixed

merged

> Sometimes JMAP fail to parse message containing lines with more than 1000 
> characters
> 
>
> Key: JAMES-1861
> URL: https://issues.apache.org/jira/browse/JAMES-1861
> Project: James Server
>  Issue Type: Bug
>  Components: JMAP
>Reporter: Raphaël Ouazana
>Assignee: Antoine Duprat
>
> Here is the stack trace:
> [WARN ] o.e.j.s.ServletHandler - /jmap
> org.apache.james.mime4j.io.MaxLineLimitException: Maximum line length
> limit (1000) exceeded
> at
> org.apache.james.mime4j.io.BufferedLineReaderInputStream.readLine(BufferedLineReaderInputStream.java:218)
> at
> org.apache.james.mime4j.io.LineReaderInputStreamAdaptor.readLine(LineReaderInputStreamAdaptor.java:78)
> at
> org.apache.james.mime4j.stream.MimeEntity.readRawField(MimeEntity.java:215)
> ... 72 common frames omitted
> Wrapped by: org.apache.james.mime4j.MimeException:
> org.apache.james.mime4j.io.MaxLineLimitException: Maximum line length
> limit (1000) exceeded
> at
> org.apache.james.mime4j.stream.MimeEntity.readRawField(MimeEntity.java:242)
> at
> org.apache.james.mime4j.stream.MimeEntity.nextField(MimeEntity.java:258)
> at
> org.apache.james.mime4j.stream.MimeEntity.advance(MimeEntity.java:296)
> at
> org.apache.james.mime4j.stream.MimeTokenStream.next(MimeTokenStream.java:368)
> at
> org.apache.james.mime4j.parser.MimeStreamParser.parse(MimeStreamParser.java:176)
> at
> org.apache.james.mime4j.message.MessageBuilder.parse(MessageBuilder.java:911)
> ... 67 common frames omitted
> Wrapped by: org.apache.james.mime4j.MimeIOException:
> org.apache.james.mime4j.io.MaxLineLimitException: Maximum line length
> limit (1000) exceeded
> at
> org.apache.james.mime4j.message.MessageBuilder.parse(MessageBuilder.java:913)
> at
> org.apache.james.mime4j.message.MessageBuilder.read(MessageBuilder.java:88)
> at
> org.apache.james.jmap.model.MessageFactory.parse(MessageFactory.java:104)
> ... 65 common frames omitted
> Wrapped by: org.apache.james.mailbox.exception.MailboxException: Unable
> to parse message: org.apache.james.mime4j.io.MaxLineLimitException:
> Maximum line length limit (1000) exceeded
> at
> org.apache.james.jmap.model.MessageFactory.parse(MessageFactory.java:108)
> at
> org.apache.james.jmap.model.MessageFactory.fromMetaDataWithContent(MessageFactory.java:73)
> at
> com.github.fge.lambdas.functions.FunctionChainer.lambda$sneakyThrow$49(FunctionChainer.java:74)
> at
> java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
> at
> java.util.stream.ForEachOps$ForEachOp$OfRef.accept(ForEachOps.java:184)
> at
> java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
> at
> java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
> at
> java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
> at
> java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
> at java.util.Iterator.forEachRemaining(Iterator.java:116)
> at
> java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801)
> at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)
> at
> java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)
> at
> java.util.stream.ForEachOps$ForEachOp.evaluateSequential(ForEachOps.java:151)
> at
> java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(ForEachOps.java:174)
> at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
> at
> java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:418)
> at
> java.util.stream.ReferencePipeline$7$1.accept(ReferencePipeline.java:270)
> at java.util.Iterator.forEachRemaining(Iterator.java:116)
> at
> java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801)
> at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)
> at
> java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)
> at
> java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708)
> at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
> at
> java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:499)
> at
> org.apache.james.jmap.methods.GetMessagesMethod.getMessagesResponse(GetMessagesMethod.java:118)
> at
> org.apache.james.jmap.methods.GetMessagesMethod.process(GetMessagesMethod.java:91)
> at
> org.apache.james.jmap.methods.RequestHandler.lambda$extractAndProcess$1(RequestHandler.java:67)
> at 

[2/2] james-project git commit: Merge remote-tracking branch 'rouazana/JAMES-1861'

[aduprat]

Merge remote-tracking branch 'rouazana/JAMES-1861'


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

Branch: refs/heads/master
Commit: 73a7c4682f81eca1bbaab5820c72eff85ad25ff4
Parents: ff57437 71c05bd
Author: Antoine Duprat 
Authored: Fri Nov 18 09:47:50 2016 +0100
Committer: Antoine Duprat 
Committed: Fri Nov 18 09:47:50 2016 +0100

--
 .../cucumber/GetMessagesMethodStepdefs.java |  5 +
 .../test/resources/cucumber/GetMessages.feature |  7 +++
 .../src/test/resources/eml/longLine.eml |  1 +
 .../apache/james/jmap/model/MessageFactory.java |  8 +++-
 .../james/jmap/model/MessageFactoryTest.java| 21 
 5 files changed, 41 insertions(+), 1 deletion(-)
--



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

[1/2] james-project git commit: JAMES-1861 Don't fail with mail with lines with more than 1000 characters (which is the default mime4j configuration)

[aduprat]

Repository: james-project
Updated Branches:
  refs/heads/master ff5743731 -> 73a7c4682


JAMES-1861 Don't fail with mail with lines with more than 1000 characters 
(which is the default mime4j 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/71c05bde
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/71c05bde
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/71c05bde

Branch: refs/heads/master
Commit: 71c05bdec6d2073314fb06305c682faa8c46b0eb
Parents: 17c79db
Author: Raphael Ouazana 
Authored: Wed Nov 16 17:57:16 2016 +0100
Committer: Raphael Ouazana 
Committed: Thu Nov 17 14:29:47 2016 +0100

--
 .../cucumber/GetMessagesMethodStepdefs.java |  5 +
 .../test/resources/cucumber/GetMessages.feature |  7 +++
 .../src/test/resources/eml/longLine.eml |  1 +
 .../apache/james/jmap/model/MessageFactory.java |  8 +++-
 .../james/jmap/model/MessageFactoryTest.java| 21 
 5 files changed, 41 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/71c05bde/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
--
diff --git 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
index 5bbc254..39dc1a3 100644
--- 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
+++ 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
@@ -150,6 +150,11 @@ public class GetMessagesMethodStepdefs {
 appendMessage("eml/multipartRelated.eml");
 }
 
+@Given("^the user has a message in \"([^\"]*)\" mailbox beginning by a 
long line$")
+public void appendMessageBeginningByALongLine(String mailbox) throws 
Throwable {
+appendMessage("eml/longLine.eml");
+}
+
 private void appendMessage(String emlFileName) throws Exception {
 ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
 
mainStepdefs.jmapServer.serverProbe().appendMessage(userStepdefs.lastConnectedUser,
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/71c05bde/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/resources/cucumber/GetMessages.feature
--
diff --git 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/resources/cucumber/GetMessages.feature
 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/resources/cucumber/GetMessages.feature
index 377a306..23615aa 100644
--- 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/resources/cucumber/GetMessages.feature
+++ 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/resources/cucumber/GetMessages.feature
@@ -207,3 +207,10 @@ Feature: GetMessages method
 And the list should contain 1 message
 And the textBody of the message is "Hello text body\n"
 And the htmlBody of the message is "Hello html body\n"
+
+Scenario: Retrieving message with more than 1000 char by line should return 
message when exists
+Given the user has a message in "inbox" mailbox beginning by a long line
+When the user ask for messages "["usern...@domain.tld|inbox|1"]"
+Then no error is returned
+And the list should contain 1 message
+And the id of the message is "usern...@domain.tld|inbox|1"

http://git-wip-us.apache.org/repos/asf/james-project/blob/71c05bde/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/resources/eml/longLine.eml
--
diff --git 
a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/resources/eml/longLine.eml
 
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/resources/eml/longLine.eml
new file mode 100644
index 000..84b285e
--- /dev/null
+++