This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 01a451400125fbf857add3e7b00011eb48359ce7
Author: Joerg Thomas <joerg.tho...@consol.de>
AuthorDate: Thu Nov 14 10:52:40 2019 +0100
JAMES-2972 correct use of mailet attribute from 'matcher' to 'match',
project-wide
---
.../java/org/apache/james/transport/mailets/ICALToHeader.java | 2 +-
.../org/apache/james/transport/mailets/ICALToJsonAttribute.java | 2 +-
server/app/src/main/resources/mailetcontainer.xml | 8 ++++----
.../java/org/apache/james/transport/mailets/MetricsMailet.java | 2 +-
.../apache/james/transport/mailets/ToSenderDomainRepository.java | 2 +-
.../org/apache/james/transport/mailets/WithStorageDirective.java | 2 +-
.../java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
index 025dfc3..2e4dae2 100644
---
a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
+++
b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
@@ -53,7 +53,7 @@ import net.fortuna.ical4j.model.component.VEvent;
*
* <pre>
* <code>
- * <mailet matcher=??? class=ICALToHeader>
+ * <mailet match=??? class=ICALToHeader>
* <attribute>icalendars</attribute>
* </mailet>
* </code>
diff --git
a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java
b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java
index 5892e86..950adcc 100644
---
a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java
+++
b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java
@@ -78,7 +78,7 @@ import net.fortuna.ical4j.model.Calendar;
*
* <pre>
* <code>
- * <mailet matcher=??? class=ICALToJsonAttribute>
+ * <mailet match=??? class=ICALToJsonAttribute>
* <sourceAttribute>icalendars</sourceAttribute>
*
<destinationAttribute>icalendarJson</destinationAttribute>
* </mailet>
diff --git a/server/app/src/main/resources/mailetcontainer.xml
b/server/app/src/main/resources/mailetcontainer.xml
index bb98c7c..dba24bd 100644
--- a/server/app/src/main/resources/mailetcontainer.xml
+++ b/server/app/src/main/resources/mailetcontainer.xml
@@ -56,13 +56,13 @@
<!-- Important check to avoid looping -->
<mailet match="RelayLimit=30" class="Null"/>
- <mailet matcher="All" class="WithPriority">
+ <mailet match="All" class="WithPriority">
<priority>8</priority>
</mailet>
- <mailet matcher="HasPriority=8" class="Null"/>
- <mailet matcher="AtLeastPriority=8" class="Null"/>
- <mailet matcher="AtMostPriority=8" class="Null"/>
+ <mailet match="HasPriority=8" class="Null"/>
+ <mailet match="AtLeastPriority=8" class="Null"/>
+ <mailet match="AtMostPriority=8" class="Null"/>
<!-- Check attachment extensions for possible viruses -->
diff --git
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/MetricsMailet.java
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/MetricsMailet.java
index 22f5461..4ad9b31 100644
---
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/MetricsMailet.java
+++
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/MetricsMailet.java
@@ -36,7 +36,7 @@ import com.google.common.base.Preconditions;
*
* Example :
*
- * <mailet matcher="all" class="MetricsMailet">
+ * <mailet match="all" class="MetricsMailet">
* <metricName>relayDenied</metricName>
* </mailet>
*
diff --git
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java
index 86fd146..93dab2d 100644
---
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java
+++
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderDomainRepository.java
@@ -56,7 +56,7 @@ import com.github.fge.lambdas.consumers.ThrowingConsumer;
*
* Example:
*
- * <mailet matcher="All" class="ToSenderDomainRepository">
+ * <mailet match="All" class="ToSenderDomainRepository">
*
<urlPrefix>cassandra://var/mail/sendersRepositories/</urlPrefix>
* <passThrough>false</passThrough>
* <allowRepositoryCreation>true</allowRepositoryCreation>
diff --git
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java
index eb5762f..4d112a5 100644
---
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java
+++
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WithStorageDirective.java
@@ -45,7 +45,7 @@ import com.google.common.base.Strings;
*
* Example:
*
- * <mailet matcher="IsMarkedAsSpam" class="WithStorageDirective">
+ * <mailet match="IsMarkedAsSpam" class="WithStorageDirective">
* <targetFolderName>Spam</targetFolderName>
* </mailet>
*/
diff --git
a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java
b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java
index 1a2561b..85a09bc 100644
---
a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java
+++
b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/mailet/filter/JMAPFiltering.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
*
* Example:
*
- * <mailet matcher="RecipientIsLocal"
class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
+ * <mailet match="RecipientIsLocal"
class="org.apache.james.jmap.mailet.filter.JMAPFiltering"/>
*/
public class JMAPFiltering extends GenericMailet {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
