[jira] [Created] (JAMES-2573) Error while building site
Antoine Duprat created JAMES-2573:
-
Summary: Error while building site
Key: JAMES-2573
URL: https://issues.apache.org/jira/browse/JAMES-2573
Project: James Server
Issue Type: New Feature
Components: site
Reporter: Antoine Duprat
Building the site with the docker tool is failing:
{code:java}
[ERROR] Failed to execute goal org.apache.rat:apache-rat-plugin:0.12:check
(default) on project apache-mailet-icalendar: Too many files with unapproved
license: 1 See RAT report in:
/home/aduprat/work/james-project/mailet/icalendar/target/rat.txt -> [Help 1]
{code}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Closed] (JAMES-2325) Allow to exclude some matcher/mailet from documentation
[ https://issues.apache.org/jira/browse/JAMES-2325?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Tellier Benoit closed JAMES-2325. - > Allow to exclude some matcher/mailet from documentation > --- > > Key: JAMES-2325 > URL: https://issues.apache.org/jira/browse/JAMES-2325 > Project: James Server > Issue Type: Improvement > Components: Documentation, Mailet Contributions >Affects Versions: master >Reporter: Tellier Benoit >Priority: Major > Labels: docuentation, feature, newbie > Fix For: 3.2.0 > > > Apache James uses the `mailetdocs-maven-plugin` in order to build the > mailet/matcher documentation. > This plugin scans the sources, finds mailet and matcher, then generates the > documentation entry from its javadoc. > Nowadays all mailet and matchers are included. > This is a problem because we have some test specifics mailets/matcher that > are not usable as part of James but still are reported as part of the > documentation. > (Examples includes > james-project/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/mailets/CustomMailet.java > and the like, used to generate a separate library containing custom > mailets/matchers in order to test custom mailets/matchers instanciation) > The goal of this ticket is to add a `@ExcludeFromDocumentation` annotation as > part of the mailet-api. The plugin would skip such annotated mailets/matcher. > In order to to this: > - Create a new `@ExcludeFromDocumentation` in the mailet API > - Annotate with it classes in > `james-project/server/container/guice/custom-mailets` > - Modify > james-project/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java > in order to skip classes annotated as excluded. > - Add a test in > james-project/mailet/mailetdocs-maven-plugin/src/test/java/org/apache/james/mailet/DefaultDescriptorsExtractorTest.java > showing excluded mailets are not listed (add an excluded mailet in that > package, then assert in a new test that it is not reported). > As always we stay at your disposal to answer any question on the chat! > https://gitter.im/apache/james-project -- This message was sent by Atlassian JIRA (v7.6.3#76005) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (JAMES-2325) Allow to exclude some matcher/mailet from documentation
[ https://issues.apache.org/jira/browse/JAMES-2325?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Tellier Benoit resolved JAMES-2325. --- Resolution: Fixed Fix Version/s: 3.2.0 mschnitzler solved this in https://github.com/linagora/james-project/pull/1845 Many thanks to him! > Allow to exclude some matcher/mailet from documentation > --- > > Key: JAMES-2325 > URL: https://issues.apache.org/jira/browse/JAMES-2325 > Project: James Server > Issue Type: Improvement > Components: Documentation, Mailet Contributions >Affects Versions: master >Reporter: Tellier Benoit >Priority: Major > Labels: docuentation, feature, newbie > Fix For: 3.2.0 > > > Apache James uses the `mailetdocs-maven-plugin` in order to build the > mailet/matcher documentation. > This plugin scans the sources, finds mailet and matcher, then generates the > documentation entry from its javadoc. > Nowadays all mailet and matchers are included. > This is a problem because we have some test specifics mailets/matcher that > are not usable as part of James but still are reported as part of the > documentation. > (Examples includes > james-project/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/mailets/CustomMailet.java > and the like, used to generate a separate library containing custom > mailets/matchers in order to test custom mailets/matchers instanciation) > The goal of this ticket is to add a `@ExcludeFromDocumentation` annotation as > part of the mailet-api. The plugin would skip such annotated mailets/matcher. > In order to to this: > - Create a new `@ExcludeFromDocumentation` in the mailet API > - Annotate with it classes in > `james-project/server/container/guice/custom-mailets` > - Modify > james-project/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java > in order to skip classes annotated as excluded. > - Add a test in > james-project/mailet/mailetdocs-maven-plugin/src/test/java/org/apache/james/mailet/DefaultDescriptorsExtractorTest.java > showing excluded mailets are not listed (add an excluded mailet in that > package, then assert in a new test that it is not reported). > As always we stay at your disposal to answer any question on the chat! > https://gitter.im/apache/james-project -- This message was sent by Atlassian JIRA (v7.6.3#76005) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Closed] (JAMES-2318) Expose Cassandra PoolingOptions::setMaxQueueSize
[
https://issues.apache.org/jira/browse/JAMES-2318?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Tellier Benoit closed JAMES-2318.
-
> Expose Cassandra PoolingOptions::setMaxQueueSize
>
>
> Key: JAMES-2318
> URL: https://issues.apache.org/jira/browse/JAMES-2318
> Project: James Server
> Issue Type: Improvement
> Components: cassandra
>Reporter: Tellier Benoit
>Priority: Major
> Labels: easyfix, feature, newbie
> Fix For: 3.2.0
>
>
> The logs contains some entries like:
> {code:java}
> java.util.concurrent.CompletionException:
> com.datastax.driver.core.exceptions.NoHostAvailableException: All host(s)
> tried for query failed (tried: /172.17.0.1:9042
> (com.datastax.driver.core.exceptions.BusyPoolException: [/172.17.0.1] Pool is
> busy (no available connection and the queue has reached its max size 256)))
> {code}
> We would like to expose Cassandra driver PoolingOptions::setMaxQueueSize, in
> order to see the impact on such configuration parameter on, dropped Cassandra
> requests.
> This can be done by:
> - Adding more configuration options in
> **ResilientClusterProvider**::readPoolingOptions
> - You will need to add documentation in
> `/src/site/xdoc/server/config-cassandra.xml`
> If you want to do it, reach us in the chat
> (https://gitter.im/apache/james-project)! We will give you detailed
> guidelines.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (JAMES-2318) Expose Cassandra PoolingOptions::setMaxQueueSize
[
https://issues.apache.org/jira/browse/JAMES-2318?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Tellier Benoit resolved JAMES-2318.
---
Resolution: Fixed
Fix Version/s: 3.2.0
> Expose Cassandra PoolingOptions::setMaxQueueSize
>
>
> Key: JAMES-2318
> URL: https://issues.apache.org/jira/browse/JAMES-2318
> Project: James Server
> Issue Type: Improvement
> Components: cassandra
>Reporter: Tellier Benoit
>Priority: Major
> Labels: easyfix, feature, newbie
> Fix For: 3.2.0
>
>
> The logs contains some entries like:
> {code:java}
> java.util.concurrent.CompletionException:
> com.datastax.driver.core.exceptions.NoHostAvailableException: All host(s)
> tried for query failed (tried: /172.17.0.1:9042
> (com.datastax.driver.core.exceptions.BusyPoolException: [/172.17.0.1] Pool is
> busy (no available connection and the queue has reached its max size 256)))
> {code}
> We would like to expose Cassandra driver PoolingOptions::setMaxQueueSize, in
> order to see the impact on such configuration parameter on, dropped Cassandra
> requests.
> This can be done by:
> - Adding more configuration options in
> **ResilientClusterProvider**::readPoolingOptions
> - You will need to add documentation in
> `/src/site/xdoc/server/config-cassandra.xml`
> If you want to do it, reach us in the chat
> (https://gitter.im/apache/james-project)! We will give you detailed
> guidelines.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Commented] (JAMES-2318) Expose Cassandra PoolingOptions::setMaxQueueSize
[
https://issues.apache.org/jira/browse/JAMES-2318?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16662023#comment-16662023
]
Tellier Benoit commented on JAMES-2318:
---
https://github.com/linagora/james-project/pull/1825 solved this
Many thanks matzepan for this!
> Expose Cassandra PoolingOptions::setMaxQueueSize
>
>
> Key: JAMES-2318
> URL: https://issues.apache.org/jira/browse/JAMES-2318
> Project: James Server
> Issue Type: Improvement
> Components: cassandra
>Reporter: Tellier Benoit
>Priority: Major
> Labels: easyfix, feature, newbie
> Fix For: 3.2.0
>
>
> The logs contains some entries like:
> {code:java}
> java.util.concurrent.CompletionException:
> com.datastax.driver.core.exceptions.NoHostAvailableException: All host(s)
> tried for query failed (tried: /172.17.0.1:9042
> (com.datastax.driver.core.exceptions.BusyPoolException: [/172.17.0.1] Pool is
> busy (no available connection and the queue has reached its max size 256)))
> {code}
> We would like to expose Cassandra driver PoolingOptions::setMaxQueueSize, in
> order to see the impact on such configuration parameter on, dropped Cassandra
> requests.
> This can be done by:
> - Adding more configuration options in
> **ResilientClusterProvider**::readPoolingOptions
> - You will need to add documentation in
> `/src/site/xdoc/server/config-cassandra.xml`
> If you want to do it, reach us in the chat
> (https://gitter.im/apache/james-project)! We will give you detailed
> guidelines.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Closed] (JAMES-2570) Upgrade com.sparkjava:spark-core from 2.6.0 to 2.8.0
[ https://issues.apache.org/jira/browse/JAMES-2570?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Tellier Benoit closed JAMES-2570. - > Upgrade com.sparkjava:spark-core from 2.6.0 to 2.8.0 > > > Key: JAMES-2570 > URL: https://issues.apache.org/jira/browse/JAMES-2570 > Project: James Server > Issue Type: Improvement >Reporter: Trần Tiến Đức >Priority: Major > > h5. CVE-2018-9159 [More > information|https://nvd.nist.gov/vuln/detail/CVE-2018-9159](https://nvd.nist.gov/vuln/detail/CVE-2018-9159) > moderate severity > *Vulnerable versions:* < 2.7.2 > *Patched version:* 2.7.2 > In Spark before 2.7.2, a remote attacker can read unintended static files via > various representations of absolute or relative pathnames, as demonstrated by > file: URLs and directory traversal sequences. NOTE: this product is unrelated > to Ignite Realtime Spark. -- This message was sent by Atlassian JIRA (v7.6.3#76005) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Resolved] (JAMES-2570) Upgrade com.sparkjava:spark-core from 2.6.0 to 2.8.0
[ https://issues.apache.org/jira/browse/JAMES-2570?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Tellier Benoit resolved JAMES-2570. --- Resolution: Fixed https://github.com/linagora/james-project/pull/1837 solved this. > Upgrade com.sparkjava:spark-core from 2.6.0 to 2.8.0 > > > Key: JAMES-2570 > URL: https://issues.apache.org/jira/browse/JAMES-2570 > Project: James Server > Issue Type: Improvement >Reporter: Trần Tiến Đức >Priority: Major > > h5. CVE-2018-9159 [More > information|https://nvd.nist.gov/vuln/detail/CVE-2018-9159](https://nvd.nist.gov/vuln/detail/CVE-2018-9159) > moderate severity > *Vulnerable versions:* < 2.7.2 > *Patched version:* 2.7.2 > In Spark before 2.7.2, a remote attacker can read unintended static files via > various representations of absolute or relative pathnames, as demonstrated by > file: URLs and directory traversal sequences. NOTE: this product is unrelated > to Ignite Realtime Spark. -- This message was sent by Atlassian JIRA (v7.6.3#76005) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[7/8] james-project git commit: JAMES-2318 Expose Cassandra PoolingOptions::setMaxQueueSize
JAMES-2318 Expose Cassandra PoolingOptions::setMaxQueueSize
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fe5d53c4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fe5d53c4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fe5d53c4
Branch: refs/heads/master
Commit: fe5d53c474c2696aef408b6ec9243119054cecef
Parents: a5e3479
Author: matzepan
Authored: Sat Oct 20 15:23:46 2018 +0200
Committer: Benoit Tellier
Committed: Wed Oct 24 16:38:54 2018 +0700
--
.../init/configuration/ClusterConfiguration.java | 5 -
.../destination/conf/cassandra.properties | 1 +
src/site/xdoc/server/config-cassandra.xml | 17 +++--
3 files changed, 16 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe5d53c4/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
--
diff --git
a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
index e8fcc15..2db6f7e 100644
---
a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
+++
b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
@@ -204,11 +204,13 @@ public class ClusterConfiguration {
Optional maxRequests =
Optional.ofNullable(configuration.getInteger("cassandra.pooling.local.max.requests",
null));
Optional poolingTimeout =
Optional.ofNullable(configuration.getInteger("cassandra.pooling.timeout",
null));
Optional heartbeatTimeout =
Optional.ofNullable(configuration.getInteger("cassandra.pooling.heartbeat.timeout",
null));
+Optional maxQueueSize =
Optional.ofNullable(configuration.getInteger("cassandra.pooling.max.queue.size",
null));
if (!maxConnections.isPresent()
&& !maxRequests.isPresent()
&& !poolingTimeout.isPresent()
-&& !heartbeatTimeout.isPresent()) {
+&& !heartbeatTimeout.isPresent()
+&& !maxQueueSize.isPresent()) {
return Optional.empty();
}
PoolingOptions result = new PoolingOptions();
@@ -223,6 +225,7 @@ public class ClusterConfiguration {
});
poolingTimeout.ifPresent(result::setPoolTimeoutMillis);
heartbeatTimeout.ifPresent(result::setHeartbeatIntervalSeconds);
+maxQueueSize.ifPresent(result::setMaxQueueSize);
return Optional.of(result);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe5d53c4/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties
--
diff --git
a/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties
b/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties
index afc5915..27ef4a8 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties
+++ b/dockerfiles/run/guice/cassandra/destination/conf/cassandra.properties
@@ -14,6 +14,7 @@ cassandra.retryConnection.minDelay=5000
# cassandra.pooling.timeout=5000
## In seconds.
# cassandra.pooling.heartbeat.timeout=30
+# cassandra.pooling.max.queue.size=256
## These low level tuning options controls performance related options in
Cassandra related code
## The default values are documented here. Understand the effects before
editing.
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe5d53c4/src/site/xdoc/server/config-cassandra.xml
--
diff --git a/src/site/xdoc/server/config-cassandra.xml
b/src/site/xdoc/server/config-cassandra.xml
index 142a3f4..292681e 100644
--- a/src/site/xdoc/server/config-cassandra.xml
+++ b/src/site/xdoc/server/config-cassandra.xml
@@ -65,7 +65,7 @@
cassandra.readTimeoutMillis
Optional.
- If specified defines the Cassandra http://docs.datastax.com/en/developer/java-driver/2.1/manual/socket_options/";>driver
read timeout
+ If specified defines the Cassandra https://docs.datastax.com/en/developer/java-driver/3.5/manual/socket_options/";>driver
read timeout.
# Read com.datastax.driver.core.PoolingOptions for knowing defaults
value
# No value here will default to driver's default value
@@ -76,22 +76,27 @@
# cassandra.pooling.timeout=5000
## In seconds.
# cassandra.pooling.heartbeat.timeout=30
[8/8] james-project git commit: JAMES-2318 Added defaults
JAMES-2318 Added defaults Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d87517fb Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d87517fb Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d87517fb Branch: refs/heads/master Commit: d87517fb85feb0b26a9c8b338a1036bae0e635e9 Parents: fe5d53c Author: matzepan Authored: Tue Oct 23 18:58:45 2018 +0200 Committer: Benoit Tellier Committed: Wed Oct 24 16:38:54 2018 +0700 -- src/site/xdoc/server/config-cassandra.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/james-project/blob/d87517fb/src/site/xdoc/server/config-cassandra.xml -- diff --git a/src/site/xdoc/server/config-cassandra.xml b/src/site/xdoc/server/config-cassandra.xml index 292681e..505d5f4 100644 --- a/src/site/xdoc/server/config-cassandra.xml +++ b/src/site/xdoc/server/config-cassandra.xml @@ -79,23 +79,23 @@ # cassandra.pooling.max.queue.size=256 cassandra.pooling.local.max.connections -Optional. - If specified defines the Cassandra https://docs.datastax.com/en/developer/java-driver/3.5/manual/pooling/";>maximum number of connections to hosts (remote and local). +Optional. Defaults to 8. + If specified defines the Cassandra https://docs.datastax.com/en/developer/java-driver/3.5/manual/pooling/#pool-size";>maximum number of connections to hosts (remote and local). cassandra.pooling.local.max.requests -Optional. +Optional. Defaults to 128. If specified defines the Cassandra https://docs.datastax.com/en/developer/java-driver/3.5/manual/pooling/";>maximum number of concurrent requests per connection. cassandra.pooling.timeout -Optional. +Optional. Defaults to 5000 (ms). If specified defines the Cassandra https://docs.datastax.com/en/developer/java-driver/3.5/manual/pooling/#acquisition-queue";>timeout for waiting in the pool queue. Should be higher than sockets timeout. cassandra.pooling.heartbeat.timeout -Optional. +Optional. Defaults to 30 (s). If specified defines the Cassandra https://docs.datastax.com/en/developer/java-driver/3.5/manual/pooling/#heartbeat";>heartbeat timeout. cassandra.pooling.max.queue.size -Optional. +Optional. Defaults to 256. If specified defines the Cassandra https://docs.datastax.com/en/developer/java-driver/3.5/manual/pooling/#acquisition-queue";>maximum size of the connection pool queue. mailbox.max.retry.acl - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[4/8] james-project git commit: JAMES-2544 Re-use surefire forks in rabbitMQ projects
JAMES-2544 Re-use surefire forks in rabbitMQ projects This allows: - Avoiding one testcontainer instanciation per test class - Avoids starting a Cassandra container per test class Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/62125931 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/62125931 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/62125931 Branch: refs/heads/master Commit: 62125931ef34eef96450baccd34a695542c924c7 Parents: fa09d84 Author: Benoit Tellier Authored: Thu Oct 11 09:32:02 2018 +0700 Committer: Benoit Tellier Committed: Wed Oct 24 16:36:38 2018 +0700 -- server/queue/queue-rabbitmq/pom.xml | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/james-project/blob/62125931/server/queue/queue-rabbitmq/pom.xml -- diff --git a/server/queue/queue-rabbitmq/pom.xml b/server/queue/queue-rabbitmq/pom.xml index d55ddec..870200d 100644 --- a/server/queue/queue-rabbitmq/pom.xml +++ b/server/queue/queue-rabbitmq/pom.xml @@ -228,4 +228,16 @@ test + + + + +org.apache.maven.plugins +maven-surefire-plugin + +true + + + + - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[6/8] james-project git commit: JAMES-2570 Upgrade spark java from 2.6.0 to 2.8.0
JAMES-2570 Upgrade spark java from 2.6.0 to 2.8.0 Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a5e34790 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a5e34790 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a5e34790 Branch: refs/heads/master Commit: a5e3479057823e0b7a4940400083365a6baaa597 Parents: a4f5c07 Author: tran tien duc Authored: Tue Oct 23 15:14:17 2018 +0700 Committer: Benoit Tellier Committed: Wed Oct 24 16:37:23 2018 +0700 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/james-project/blob/a5e34790/pom.xml -- diff --git a/pom.xml b/pom.xml index 609f6fc..8d514a1 100644 --- a/pom.xml +++ b/pom.xml @@ -1846,7 +1846,7 @@ com.sparkjava spark-core -2.6.0 +2.8.0 com.sun.mail - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[1/8] james-project git commit: JAMES-2325 fix checkstyle violation
Repository: james-project
Updated Branches:
refs/heads/master db9928165 -> d87517fb8
JAMES-2325 fix checkstyle violation
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fa09d845
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fa09d845
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fa09d845
Branch: refs/heads/master
Commit: fa09d84525792b2b868be2129da1c3c3146ab3ae
Parents: 122ffe1
Author: Michael Schnitzler
Authored: Tue Oct 23 20:37:33 2018 +0200
Committer: Benoit Tellier
Committed: Wed Oct 24 16:36:16 2018 +0700
--
.../org/apache/james/mailet/DefaultDescriptorsExtractor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa09d845/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
--
diff --git
a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
index ea4ec1b..eaba5f0 100644
---
a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
+++
b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
@@ -100,8 +100,8 @@ public class DefaultDescriptorsExtractor {
}
if (isExcludedFromDocumentation(nextClass)) {
- log.debug(nameOfNextClass + " is excluded from documentation");
- return;
+log.debug(nameOfNextClass + " is excluded from documentation");
+return;
}
try {
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[3/8] james-project git commit: JAMES-2325 Allow to exclude some matcher/mailet from documentation
JAMES-2325 Allow to exclude some matcher/mailet from documentation
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/403c70e3
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/403c70e3
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/403c70e3
Branch: refs/heads/master
Commit: 403c70e3f70db50fa95b8de2752eb361dc76e55b
Parents: db99281
Author: Michael Schnitzler
Authored: Tue Oct 23 20:10:47 2018 +0200
Committer: Benoit Tellier
Committed: Wed Oct 24 16:36:16 2018 +0700
--
.../apache/mailet/ExcludeFromDocumentation.java | 29 +++
.../mailet/DefaultDescriptorsExtractor.java | 13 +
.../mailet/DefaultDescriptorsExtractorTest.java | 24 +++--
.../apache/james/mailet/ExperimentalMailet.java | 54
.../james/mailet/NonExperimentalMailet.java | 52 ---
.../ExcludedFromDocumentationMailet.java| 54
.../NotExcludedFromDocumentationMailet.java | 52 +++
.../mailet/experimental/ExperimentalMailet.java | 54
.../experimental/NonExperimentalMailet.java | 52 +++
9 files changed, 275 insertions(+), 109 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/403c70e3/mailet/api/src/main/java/org/apache/mailet/ExcludeFromDocumentation.java
--
diff --git
a/mailet/api/src/main/java/org/apache/mailet/ExcludeFromDocumentation.java
b/mailet/api/src/main/java/org/apache/mailet/ExcludeFromDocumentation.java
new file mode 100644
index 000..bcd2c72
--- /dev/null
+++ b/mailet/api/src/main/java/org/apache/mailet/ExcludeFromDocumentation.java
@@ -0,0 +1,29 @@
+/
+ * 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.mailet;
+
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Target;
+
+@Target(TYPE)
+public @interface ExcludeFromDocumentation {
+
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/403c70e3/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
--
diff --git
a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
index f43ae24..ea4ec1b 100644
---
a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
+++
b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
@@ -31,6 +31,7 @@ import java.util.List;
import java.util.Set;
import org.apache.james.mailet.MailetMatcherDescriptor.Type;
+import org.apache.mailet.ExcludeFromDocumentation;
import org.apache.mailet.Experimental;
import org.apache.mailet.Mailet;
import org.apache.mailet.Matcher;
@@ -98,6 +99,11 @@ public class DefaultDescriptorsExtractor {
log.debug("Class: " + nameOfNextClass);
}
+if (isExcludedFromDocumentation(nextClass)) {
+ log.debug(nameOfNextClass + " is excluded from documentation");
+ return;
+}
+
try {
final Class klass = classLoader.loadClass(nameOfNextClass);
@@ -187,6 +193,13 @@ public class DefaultDescriptorsExtractor {
.anyMatch((JavaAnnotation annotation) ->
annotation.getType().getCanonicalName()
.equals(Experimental.class.getName()));
}
+
+p
[2/8] james-project git commit: JAMES-2325 exclude custom mailets from documentation
JAMES-2325 exclude custom mailets from documentation
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/122ffe1b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/122ffe1b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/122ffe1b
Branch: refs/heads/master
Commit: 122ffe1b25c27616a076af0a90e1300abddf9d6f
Parents: 403c70e
Author: Michael Schnitzler
Authored: Tue Oct 23 20:19:24 2018 +0200
Committer: Benoit Tellier
Committed: Wed Oct 24 16:36:16 2018 +0700
--
.../src/main/java/com/custom/mailets/AnotherMailet.java | 3 +++
.../java/org/apache/james/transport/mailets/CustomMailet.java | 3 +++
2 files changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/122ffe1b/server/container/guice/custom-mailets/src/main/java/com/custom/mailets/AnotherMailet.java
--
diff --git
a/server/container/guice/custom-mailets/src/main/java/com/custom/mailets/AnotherMailet.java
b/server/container/guice/custom-mailets/src/main/java/com/custom/mailets/AnotherMailet.java
index ec9eb26..ab4af17 100644
---
a/server/container/guice/custom-mailets/src/main/java/com/custom/mailets/AnotherMailet.java
+++
b/server/container/guice/custom-mailets/src/main/java/com/custom/mailets/AnotherMailet.java
@@ -21,6 +21,7 @@ package com.custom.mailets;
import javax.mail.MessagingException;
+import org.apache.mailet.ExcludeFromDocumentation;
import org.apache.mailet.Mail;
import org.apache.mailet.base.GenericMailet;
@@ -29,6 +30,8 @@ import org.apache.mailet.base.GenericMailet;
*
* Does nothing.
*/
+
+@ExcludeFromDocumentation
public class AnotherMailet extends GenericMailet {
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/122ffe1b/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/mailets/CustomMailet.java
--
diff --git
a/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/mailets/CustomMailet.java
b/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/mailets/CustomMailet.java
index f8420fb..1b2e710 100644
---
a/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/mailets/CustomMailet.java
+++
b/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/mailets/CustomMailet.java
@@ -21,6 +21,7 @@ package org.apache.james.transport.mailets;
import javax.mail.MessagingException;
+import org.apache.mailet.ExcludeFromDocumentation;
import org.apache.mailet.Mail;
import org.apache.mailet.base.GenericMailet;
@@ -30,6 +31,8 @@ import org.apache.mailet.base.GenericMailet;
*
* Does nothing.
*/
+
+@ExcludeFromDocumentation
public class CustomMailet extends GenericMailet {
@Override
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[5/8] james-project git commit: Increase wait time in DeploymentValidation script
Increase wait time in DeploymentValidation script This test was proved flacky Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a4f5c07c Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a4f5c07c Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a4f5c07c Branch: refs/heads/master Commit: a4f5c07cd12b556ae1f1c87d14a0f29541109f9d Parents: 6212593 Author: Benoit Tellier Authored: Wed Oct 17 13:49:47 2018 +0700 Committer: Benoit Tellier Committed: Wed Oct 24 16:36:53 2018 +0700 -- .../org/apache/james/imap/scripts/ValidateDeployment.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/james-project/blob/a4f5c07c/mpt/impl/imap-mailbox/external-james/src/test/resources/org/apache/james/imap/scripts/ValidateDeployment.test -- diff --git a/mpt/impl/imap-mailbox/external-james/src/test/resources/org/apache/james/imap/scripts/ValidateDeployment.test b/mpt/impl/imap-mailbox/external-james/src/test/resources/org/apache/james/imap/scripts/ValidateDeployment.test index cfca166..4cf817b 100644 --- a/mpt/impl/imap-mailbox/external-james/src/test/resources/org/apache/james/imap/scripts/ValidateDeployment.test +++ b/mpt/impl/imap-mailbox/external-james/src/test/resources/org/apache/james/imap/scripts/ValidateDeployment.test @@ -508,7 +508,7 @@ S: d OK STORE completed. # Indexation may be asynchronous LOG INFO Waiting for indexation -WAIT 1000 +WAIT 5000 C: e SEARCH FLAGGED S: \* SEARCH 1 2 - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
