You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/01/26 12:40:59 UTC
[1/2] james-project git commit: JAMES-2292 Bind WebAdmin mailQueue
routes in jpa-smtp Guice product
Repository: james-project
Updated Branches:
refs/heads/master cae93f359 -> b31d303b6
JAMES-2292 Bind WebAdmin mailQueue routes in jpa-smtp Guice product
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fd6756eb
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fd6756eb
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fd6756eb
Branch: refs/heads/master
Commit: fd6756eb1cf3a9a2e30725ed9f12af6ae03a23cb
Parents: cae93f3
Author: benwa <bt...@linagora.com>
Authored: Fri Jan 26 09:26:54 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 26 09:26:54 2018 +0700
----------------------------------------------------------------------
server/container/guice/jpa-smtp/pom.xml | 4 ++++
.../src/main/java/org/apache/james/JPAJamesServerMain.java | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6756eb/server/container/guice/jpa-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml
index 1a43a4d..89947b5 100644
--- a/server/container/guice/jpa-smtp/pom.xml
+++ b/server/container/guice/jpa-smtp/pom.xml
@@ -78,6 +78,10 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-guice-webadmin-mailqueue</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailrepository</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/fd6756eb/server/container/guice/jpa-smtp/src/main/java/org/apache/james/JPAJamesServerMain.java
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/container/guice/jpa-smtp/src/main/java/org/apache/james/JPAJamesServerMain.java
index 45f3fba..5346eda 100644
--- a/server/container/guice/jpa-smtp/src/main/java/org/apache/james/JPAJamesServerMain.java
+++ b/server/container/guice/jpa-smtp/src/main/java/org/apache/james/JPAJamesServerMain.java
@@ -28,6 +28,7 @@ import org.apache.james.modules.server.ActiveMQQueueModule;
import org.apache.james.modules.server.DataRoutesModules;
import org.apache.james.modules.server.DefaultProcessorsConfigurationProviderModule;
import org.apache.james.modules.server.ElasticSearchMetricReporterModule;
+import org.apache.james.modules.server.MailQueueRoutesModule;
import org.apache.james.modules.server.MailRepositoriesRoutesModule;
import org.apache.james.modules.server.NoJwtModule;
import org.apache.james.modules.server.RawPostDequeueDecoratorModule;
@@ -45,6 +46,7 @@ public class JPAJamesServerMain {
new WebAdminServerModule(),
new DataRoutesModules(),
new MailRepositoriesRoutesModule(),
+ new MailQueueRoutesModule(),
new NoJwtModule(),
new DefaultProcessorsConfigurationProviderModule());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: JAMES-2285 delay could be equals to
what is specified
Posted by bt...@apache.org.
JAMES-2285 delay could be equals to what is specified
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b31d303b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b31d303b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b31d303b
Branch: refs/heads/master
Commit: b31d303b6f30561846ac3b789de704bfcd1a3536
Parents: fd6756e
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Jan 26 09:04:18 2018 +0100
Committer: benwa <bt...@linagora.com>
Committed: Fri Jan 26 19:40:23 2018 +0700
----------------------------------------------------------------------
.../java/org/apache/james/queue/api/DelayedMailQueueContract.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b31d303b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedMailQueueContract.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedMailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedMailQueueContract.java
index 16a312f..2744d77 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedMailQueueContract.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/DelayedMailQueueContract.java
@@ -112,7 +112,7 @@ public interface DelayedMailQueueContract {
getMailQueue().deQueue();
assertThat(started.elapsed(TimeUnit.MILLISECONDS))
- .isGreaterThan(unit.toMillis(delay));
+ .isGreaterThanOrEqualTo(unit.toMillis(delay));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org