Repository: james-project
Updated Branches:
  refs/heads/master cfe82011b -> 6ea664e94


JAMES-1789 Refresh list of available mailets/matcher in server and add 
experimental sections


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

Branch: refs/heads/master
Commit: 6ea664e94aa22d68a68d25e519dcce0f1248d4d1
Parents: cfe8201
Author: benwa <btell...@linagora.com>
Authored: Thu Jun 15 14:25:44 2017 +0700
Committer: benwa <btell...@linagora.com>
Committed: Thu Jun 15 17:21:25 2017 +0700

----------------------------------------------------------------------
 src/site/site.xml                               |   1 -
 src/site/xdoc/server/config-mailetcontainer.xml |   3 +-
 src/site/xdoc/server/dev-provided-mailets.xml   | 681 -------------------
 src/site/xdoc/server/dev-provided-matchers.xml  | 396 -----------
 src/site/xdoc/server/dev-provided.xml           |  19 +-
 .../xdoc/server/feature-mailetcontainer.xml     |   7 +-
 6 files changed, 15 insertions(+), 1092 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/6ea664e9/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index e523974..d2e7941 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -161,7 +161,6 @@
                         </item>
                         <item name="Provided Extensions" 
href="/server/dev-provided.html" collapse="true" >
                             <item name="Mailets" 
href="/server/dev-provided-mailets.html" />
-                            <item name="Matchers" 
href="/server/dev-provided-matchers.html" />
                             <item name="SMTP Hooks" 
href="/server/dev-provided-smtp-hooks.html" />
                         </item>
                     </item>

http://git-wip-us.apache.org/repos/asf/james-project/blob/6ea664e9/src/site/xdoc/server/config-mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/config-mailetcontainer.xml 
b/src/site/xdoc/server/config-mailetcontainer.xml
index f0783f0..629da0d 100644
--- a/src/site/xdoc/server/config-mailetcontainer.xml
+++ b/src/site/xdoc/server/config-mailetcontainer.xml
@@ -32,8 +32,7 @@
           actions based on incoming mail) pipeline arranged into processors 
(List of mailet/matcher pairs allowing
           better logical organisation).</p>
 
-      <p>Apache James Server includes a number of pre-packaged <a 
href="dev-provided-mailets.html">Mailets</a> and
-        <a href="dev-provided-matchers.html">Matchers</a>.</p>
+      <p>Apache James Server includes a number of pre-packaged <a 
href="dev-provided-mailets.html">Mailets and Matchers</a>.</p>
 
       <p>Consult <a 
href="https://github.com/apache/james-project/tree/master/server/app/src/main/resources/mailetcontainer-template.xml";>mailetcontainer-template.xml</a>
 in GIT to get some examples and hints.</p>
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/6ea664e9/src/site/xdoc/server/dev-provided-mailets.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/dev-provided-mailets.xml 
b/src/site/xdoc/server/dev-provided-mailets.xml
deleted file mode 100644
index 226d46e..0000000
--- a/src/site/xdoc/server/dev-provided-mailets.xml
+++ /dev/null
@@ -1,681 +0,0 @@
-<?xml version="1.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.    
--->
-<document>
-
- <properties>
-  <title>Apache James Server 3 - Provided Mailets</title>
- </properties>
-
-<body>
-
-<section name="Mailets">
-
-<p>James provides a number of implemented Mailets for use by James 
administrators in their 
-configurations.  These are primarily mailets that members of the James 
developer or user 
-communities have found useful in their own configurations.  A description of 
how to configure 
-Mailets and use them in the James SpoolManager can be found <a 
href="config-mailetcontainer.html">here</a>.</p>
-
-<subsection name="AddFooter">
-<p>Description: This mailet adds a text footer to the message.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>text</strong> (required) - the text that will be added as a footer 
to the message.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="AddHabeasWarrantMark">
-<p>Description: This mailet adds a Habeas warrant mark (see <a 
href="http://habeas.com";>http://habeas.com</a> for details) to the message.</p>
-
-<p>Parameters: None.</p>
-</subsection>
-
-<subsection name="AddHeader">
-<p>Description: This mailet is <strong>deprecated</strong> .Please use 
SetMimeHeader .</p>
-</subsection>
-
-<subsection name="AvalonListserv">
-<p>Provides basic list server functionality.  Implements basic filters for 
emails sent to the list, 
-including restriction of senders to members, diallowing attachments in list 
messages, and subject line 
-processing</p>
-
-<p>Parameters:
-<ul>
-<li><strong>repositoryName</strong> (required) - the name of the user 
repository that contains the users 
-for this list.</li>
-<li><strong>membersonly</strong> (optional) - whether only members of the list 
can send messages to this 
-list.  Defaults to false.</li>
-<li><strong>attachmentsallowed</strong> (optional) - whether attachments are 
allowed in messages sent to this 
-list.  Defaults to true.</li>
-<li><strong>replytolist</strong> (optional) - whether the reply-to address for 
all messages sent to this 
-list is set to the list address.  Defaults to true.</li>
-<li><strong>subjectprefix</strong> (optional) - a String value.  If set, this 
value is prepended to the subject
-line of all messages sent to the list.</li>
-<li><strong>autobracket</strong> (optional) - a boolean value.  If a 
subjectprefix is set, this value determines 
-whether the prefix is bracketed before being prepended to the subject line.  
Defaults to true.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="AvalonListservManager">
-<p>Processes list management commands of the form 
&lt;list-name&gt;-on@&lt;host&gt; and 
-&lt;list-name&gt;-off@&lt;host&gt; where &lt;list-name&gt; and lt;host&gt; are 
arbitrary.  Note 
-that this should be used in tandem with a CommandForListserv matcher to ensure 
that only commands 
-intended for a specific list are processed.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>repositoryName</strong> (required) - the name of the user 
repository that contains the users 
-for this list.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="BayesianAnalysis">
-<p>Description: Spam detection mailet using bayesian analysis techniques.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>repositoryPath</strong> (required) - The repositoryPath which is 
used.</li>
-<li><strong>headerName</strong> - The HeaderName which get adds to holds the 
Probalitity. Default is <i>X-MessageIsSpamProbability</i>.</li>
-<li><strong>ignoreLocalSender</strong> - Set to true if you want to ignore 
messages from local senders. By local sender we mean a return-path 
-with a local server part (server listed in &lt;servernames&gt; in 
mailetcontainer.xml). Default is <i>false</i>.</li>
-<li><strong>maxSize</strong> - Set this to the maximum message size (in bytes) 
after analysis will be skipped. Default is <i>100000</i>.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="BayesianAnalysisFeeder">
-<p>Description: Feeds ham OR spam messages to train the BayesianAnalysis 
mailet.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>repositoryPath</strong> (required) - The repositoryPath which is 
used.</li>
-<li><strong>feedType</strong> (required) - The type of the message which is 
used to feed the mailet. Allowed values are <i>spam</i> and <i>ham</i>.</li>
-<li><strong>maxSize</strong> - Set this to the maximum message size (in bytes) 
after analysis will be skipped. Default is <i>100000</i>.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="Bounce">
-<p>Description: Generates a response to the reverse-path address.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>sender</strong> - The senderAddress which will be used for sending 
the bounce. Possible values: <i>address</i>, <i>postmaster</i> , <i>sender</i>,
-<i>unaltered</i>. Default <i>postmaster</i>.</li>
-<li><strong>attachError</strong> - Attach error. Default is false.</li>
-<li><strong>message</strong> - Set the message which get included in the 
bounce.</li>
-<li><strong>prefix</strong> - Optional subject prefix prepended to the 
original message.</li>
-<li><strong>inline</strong> - Specify which mailpart will be included in the 
email body. Possible values: <i>unaltered</i>, <i>heads</i>, <i>body</i> , 
<i>all</i>,
-"none". Default "none".</li>
-<li><strong>attachment</strong> - Specify which mailpart will be attached to 
the email. Possible values: <i>none</i>, <i>heads</i>, <i>body</i>, <i>all</i>,
-<i>message</i>. Default <i>message</i>.</li>
-<li><strong>passThrough</strong> - If set to false the email will not 
processed after the bounce. Possible values: <i>true</i>, <i>false</i>.
-Default <i>true</i>.</li>
-<li><strong>fakeDomainCheck</strong> - If set to false true will check if the 
sender domain is valid. Possible values: <i>true</i>, <i>false</i>.
-Default <i>true</i>.</li>
-<li><strong>debug</strong> - If set true you can enable debugging. Possible 
values: <i>true</i>, <i>false</i>. 
-Default <i>false</i>.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="ClamAVScan">
-<p>Description: Does an antivirus scan check using a ClamAV daemon (CLAMD).</p>
-
-<p>Parameters:
-<ul>
-<li><strong>host</strong> - The host name of the server where CLAMD runs. The 
default is <i>localhost</i></li>
-<li><strong>port</strong>  - The port on which CLAMD listens. The default is 
<i>3310</i>.</li>
-<li><strong>maxPings</strong> - The maximum number of connection retries 
during startup. If the value is <i>0</i> no startup 
-test will be done.</li>
-<li><strong>pingIntervalMillis</strong> (required) - The interval (in 
milliseconds) between each connection retry during startup. 
-The default is <i>30000</i> (30 seconds)</li>
-<li><strong>streamBufferSize</strong> - the BufferedOutputStream buffer size 
to use writing to the <I>stream connection</I>. The 
-default is <i>8192</i>.</li>
-<li><strong>debug</strong> - If set true you can enable debugging. Possible 
values: <i>true</i>, <i>false</i>. 
-Default <i>false</i>.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="CommandListservFooter">
-<p>Description: CommandListservFooter is based on the AddFooter mailet. It is 
used by the CommandListservProcessor to inject a footer into mailing list.</p>
-
-<p>Parameters: None.</p>
-</subsection>
-
-<subsection name="CommandListservManager">
-<p> Description: CommandListservManager is the default implementation of 
ICommandListservManager.
-It loads all the configured IListServCommands and delegates to them at runtime.
-<br/>
-It isn't responsible for procesing messages sent to the main mailing list, but 
is responsible for
-individual commands sent by users, such as: info, subscribe, etc...
-<br/>
-Requests sent to the CommandListservManager take the form of:
-<pre>
-&lt;listName&gt;-&lt;commandName&gt;@domain
-</pre>
- 
-If the command isn't recognized an error will be sent.
-<br/>
-<br/>
-The configuration for this mailet sould be in the 'root' processor block.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>listName</strong> - The listname </li>
-<li><strong>displayName</strong>  - The full listname</li>
-<li><strong>listOwner</strong> - An emailaddress which will be used as 
owneraddress.</li>
-<li><strong>repositoryName</strong> - the repository name </li> 
-<li><strong>listDomain</strong> - The domain</li>
-</ul>
-</p>
-<br/> 
-<p> Example configuration:
-<source>
-&lt;mailet match="CommandListservMatcher=announce@localhost" 
class="CommandListservManager"&gt;
-  &lt;listName&gt;announce&lt;/listName&gt;
-  &lt;displayName&gt;Announce mailing list&lt;/displayName&gt;
-  &lt;listOwner&gt;owner@localhost&lt;/listOwner&gt;
-  &lt;repositoryName&gt;list-announce&lt;/repositoryName&gt;
-  &lt;listDomain&gt;localhost&lt;/listDomain&gt;
-
-  &lt;commandpackages&gt;
-     
&lt;commandpackage&gt;org.apache.james.transport.mailets.listservcommands&lt;/commandpackage&gt;
-  &lt;/commandpackages&gt;
-
-  &lt;commands&gt;
-     &lt;command name="subscribe" class="Subscribe"/&gt;
-     &lt;command name="subscribe-confirm" class="SubscribeConfirm"/&gt;
-     &lt;command name="unsubscribe" class="UnSubscribe"/&gt;
-     &lt;command name="unsubscribe-confirm" class="UnSubscribeConfirm"/&gt;
-     &lt;command name="error" class="ErrorCommand"/&gt;
-     &lt;command name="owner" class="Owner"/&gt;
-     &lt;command name="info" class="Info"/&gt;
-  &lt;/commands&gt;
- &lt;/mailet&gt;
-</source> 
-</p>
-</subsection>
-
-
-<subsection name="DSNBounce">
-<p>Description: Generates a Delivery Status Notification (DSN). Note that this 
is different than a mail-client's
-reply, which would use the Reply-To or From header.Bounced messages are 
attached in their entirety (headers and
-content) and the resulting MIME part type is "message/rfc822".
-The reverse-path and the Return-Path header of the response is set to 
<i>null</i> (<i>&lt;&gt;</i>),
-meaning that no reply should be sent.
-A sender of the notification message can optionally be specified.
-If one is not specified, the postmaster's address will be used.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>sender</strong> - An address, postmaster,sender or unaltered. 
Default is <i>postmaster</i></li>
-<li><strong>prefix</strong>  - Optional subject prefix prepended to the 
original message.</li>
-<li><strong>attachment</strong> - Values are message, heads or none. Default 
is <i>message</i>. 
-test will be done.</li>
-<li><strong>messageString</strong> - the message sent in the bounce, the first 
occurrence of the pattern [machine] is replaced with the name of the executing 
machine, default=Hi. This is the James mail server at [machine] .... </li> 
-<li><strong>passThrough</strong> (optional) - a boolean value (true/false) 
indicating whether
-processing should continue on the message is on.  If false, the original 
message is GHOSTed.  Defaults to false.</li>
-<li><strong>debug</strong> - If set true you can enable debugging. Possible 
values: <i>true</i>, <i>false</i>. 
-Default <i>false</i>.</li> 
-</ul>
-</p>
-</subsection>
-
-<subsection name="Forward">
-<p>Description: This mailet forwards the message to a set of recipients.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>forwardto</strong> (required) - a comma delimited list of email 
addresses.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="FromRepository">
-<p>Description: This mailet ee-spools mail found in the specified 
Repository.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>repositoryPath</strong> (required) - The repositoryPath which is 
used.</li>
-<li><strong>processor</strong> (required) - The target processor to move the 
mails to.</li>
-<li><strong>delete</strong> - If set to true the mails get deleted after 
re-spooling. Default is <i>false</i>.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="ICommandListservManager">
-<p>Description: ICommandListservManager is the interface that describes the 
functionality of any command based list serv managers.</p>
-
-<p>Parameters: None.</p>
-</subsection>
-
-<subsection name="JDBCAlias">
-<p>Description: This mailet does alias translation for email addresses stored 
in a database table.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>mappings</strong> (required) - a URL of the form 
db://&lt;data-source&gt;/&lt;table&gt;, where 
-&lt;table&gt; is the table in the database containing the alias info and 
&lt;data-source&gt; is the name 
-of the data-source in mailetcontainer.xml that is to be used.</li>
-<li><strong>source-column</strong> (required) - the column containing the 
aliases.</li>
-<li><strong>target-column</strong> (required) - the column containing the 
alias targets.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="JDBCRecipientRewriteTable">
-<p>Description: This mailet does complex alias translation for email addresses 
stored in a database table.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>table</strong> (required) - the URL describing the database table. 
 This URL has the form 
-db://&lt;data-source&gt;/&lt;table&gt; where &lt;data-source&gt; and 
&lt;table&gt; are the names of 
-the data-source as defined in mailetcontainer.xml and the table in the 
database.</li>
-<li><strong>sqlquery</strong> (optional) - the text of the SQL query used by 
the mailet to do user
-lookup.  The default is "select RecipientRewriteTable.target-address from 
RecipientRewriteTable, RecipientRewriteTable as VUTDomains where 
(RecipientRewriteTable.user like ? or RecipientRewriteTable.user like '\\%') 
and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain like 
'\\%' and VUTDomains.domain like ?)) order by 
concat(RecipientRewriteTable.user,'@',RecipientRewriteTable.domain) desc limit 
1"</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="LocalDelivery">
-<p>Description: This mailet delivers messages to local mailboxes.</p>
-
-<p>Parameters: None.</p>
-</subsection>
-
-<subsection name="LogMessage">
-<p>Description: Logs Message Headers and/or Body.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>passThrough</strong> (optional) - If the "passThrough" in confs is 
true the mail will be left untouched in
-the pipe. If false will be destroyed.  Default is true.</li>
-<li><strong>headers</strong> (optional) - If set to true the headers get 
logged. Default is true"</li>
-<li><strong>body</strong> (optional) - If set to true the body get logged. 
Default is true.</li>
-<li><strong>bodyMax</strong> (optional) - The max length wich should be 
logged. Default is log all.</li>
-<li><strong>comment</strong> (optional) - The comment which should be logged  
Default is none.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="NotifyPostmaster">
-<p>Description: This mailet forwards the message as an attachment to the James 
postmaster.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>sendingAddress</strong> (optional) - the address from which the 
forwarded email will be 
-sent.  Defaults to the postmaster address.</li>
-<li><strong>notice</strong> (optional) - the text message that will accompany 
the forwarded message.  Defaults 
-to "We were unable to deliver the attached message because of an error in the 
mail server."</li>
-<li><strong>attachStackTrace</strong> (optional) - whether an error stack 
trace is attached to the forwarded message.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="NotifySender">
-<p>Description: This mailet forwards the message as an attachment to the 
original sender.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>sendingAddress</strong> (optional) - the address from which the 
forwarded email will be 
-sent.  Defaults to the postmaster address.</li>
-<li><strong>notice</strong> (optional) - the text message that will accompany 
the forwarded message.  Defaults 
-to "We were unable to deliver the attached message because of an error in the 
mail server."</li>
-<li><strong>attachStackTrace</strong> (optional) - whether an error stack 
trace is attached to the forwarded message.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="Null">
-<p>Description: This mailet ends processing for this mail.</p>
-
-<p>Parameters: None.</p>
-</subsection>
-
-<subsection name="PostmasterAlias">
-<p>Description: Intercepts all mails addressed to postmaster@&lt;domain&gt; 
where &lt;domain&gt; is one
-of the domains managed by this James server and substitutes the configured 
James postmaster address for
-the original recipient address.  This mailet is inserted automatically by 
James at the head of the root
-processor.</p>
-
-<p>Parameters: None.</p>
-</subsection>
-
-<subsection name="Redirect">
-<p>Description: A mailet providing powerful, configurable redirection 
services.<br/>
-      This mailet can produce listserver, forward and notify behaviour, with 
the
-      original message intact, attached, appended or left out altogether.<br/>
-      This built in functionality is controlled by the configuration as 
described
-      <a 
href="apidocs/org/apache/james/transport/mailets/Redirect.html">here</a>.</p>
-<p>It is also intended to be easily subclassed to make providing bespoke 
redirection
-    mailets simple. <br/>
-    By extending it and overriding one or more of its methods new behaviour can
-    be quickly created without the author having to address any other issue 
than
-    the relevant one. For more information see the javadocs
-    <a 
href="apidocs/org/apache/james/transport/mailets/Redirect.html">here</a>.</p>
-
-<p>Parameters: <a 
href="apidocs/org/apache/james/transport/mailets/Redirect.html">See 
javadocs.</a></p>
-</subsection>
-
-<subsection name="RemoteDelivery">
-
-  <p>Manages delivery of messages to recipients on remote SMTP hosts.</p>
-  
-  <p>Parameters:
-    <ul>
-      <li><strong>outgoing</strong> (required) - The name of the queue that 
will hold messages being processed
-      by the RemoteDelivery Mailet.</li>
-      <li><strong>delayTime</strong> (optional) - a non-negative Long value 
that is the time in
-      milliseconds between redelivery attempts for a particular mail.  
Defaults to six hours.</li>
-      <li><strong>maxRetries</strong> (optional) - a non-negative Integer 
value that is number of times
-      the Mailet will attempt to deliver a particular mail.  Defaults to 
five.</li>
-      <li><strong>timeout</strong> (optional) - The SMTP connection timeout 
for SMTP connections generated
-      by this Mailet.  Defaults to 60 seconds.</li>
-      <li><strong>deliveryThreads</strong> (optional) - The number of threads 
this Mailet will use to generate
-      SMTP connections.</li>
-      <li><strong>gateway</strong> (optional) - The host name of the SMTP 
server 
-      to be used as a gateway for this server.  If this value is set, then all 
-      messages will be delivered to the gateway server, regardless of 
recipient 
-      address.  To specify more than one gateway server, add multiple gateway 
tags, 
-      each containing one value.  If more than one server is specified, they 
will be 
-      tried in order until one is successful.  In addition the port may be 
specified 
-      for each gateway in the format &lt;host&gt;:&lt;port&gt;.  If this 
-      value is unset, delivery will occur to SMTP servers resolved by MX 
lookup.</li>
-      <li><strong>gatewayPort</strong> (optional) - The default port number of 
the 
-      SMTP server to be used as a gateway for this server.  This value will be 
-      employed when a gateway is set <em>and</em> the gateway value does not 
specify 
-      a port as described above.</li>
-      <li><strong>gatewayUsername</strong> (optional) - The username to use 
when
-      authenticating to the defined gateway.  This value will be 
-      employed when a gateway is set.</li>
-      <li><strong>gatewayPassword</strong> (optional) - The password to use 
when
-      authenticating to the defined gateway.  This value will be 
-      employed when a gateway is set.</li>
-      <li><strong>bind</strong> (optional) - If present, this value is a 
string 
-      describing the local IP address to which the mailet should be bound 
while 
-      delivering emails. If the tag is absent then the service will bind to 
the 
-      default local address of the machine. This tag is useful for multihomed 
machines.<br/>
-      Note: Currently you must use the same IP address for all of those 
RemoteDelivery 
-      instances where you explicitly supply a bind address.</li>
-      <li><strong>startTLS</strong> (optional) - a boolean value (true/false) 
indicating whether starTLS is
-      on.  Defaults to false.</li>
-      <li><strong>sslEnable</strong> (optional) - a boolean value (true/false) 
indicating whether starTLS is
-      on.  Defaults to false.</li>
-      <li><strong>debug</strong> (optional) - a boolean value (true/false) 
indicating whether debugging is
-      on.  Defaults to false.</li>
-    </ul>
-  </p>
-  
-</subsection>
-
-<subsection name="RemoveAllMailAttributes">
-<p>Description: Removes all attributes on the Mail instance.</p>
-
-<p>Parameters: None.</p>
-</subsection>
-
-<subsection name="RemoveMailAttributes">
-<p>Description: Remove attributes on the Mail instance.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>name</strong> (required) - The name of the attribute to 
remove.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="Resend">
-<p>Description:A mailet providing configurable redirection services. For more 
information see 
-the javadocs <a 
href="apidocs/org/apache/james/transport/mailets/Resend.html">here</a>.</p>
-
-<p>Parameters: <a 
href="apidocs/org/apache/james/transport/mailets/Resend.html">See 
javadocs.</a></p>
-</subsection>
-
-<subsection name="ServerTime">
-<p>Description: This mailet sends a message to the sender of the original mail 
message with a server timestamp.</p>
-
-<p>Parameters: None.</p>
-</subsection>
-
-<subsection name="SetMailAttributes">
-<p>Description: Set attributes on the Mail instance.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>name</strong> (required) - The name of the attribute to set.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="SetMimeHeader">
-<p>Description: Set an MimeHeader on a MimeMessage.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>name</strong> (required) - the name of the header to be added to 
the message.</li>
-<li><strong>value</strong> (required) - the text that will be added as a 
header to the message.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="SMIMECheckSignature">
-<p>Description: Verifies the s/mime signature of a message. The s/mime signing 
ensure that
-the private key owner is the real sender of the message. To be checked by
-this mailet the s/mime signature must contain the actual signature, the
-signer's certificate and optionally a set of certificate that can be used to
-create a chain of trust that starts from the signer's certificate and leads
-to a known trusted certificate.
-</p>
-<p>
-This check is composed by two steps: firstly it's ensured that the signature
-is valid, then it's checked if a chain of trust starting from the signer
-certificate and that leads to a trusted certificate can be created. The first
-check verifies that the the message has not been modified after the signature
-was put and that the signer's certificate was valid at the time of the
-signing. The latter should ensure that the signer is who he declare to be.
-</p>
-
-<p>Parameters: <a 
href="apidocs/org/apache/james/transport/mailets/smime/SMIMECheckSignature.html">See
 javadocs.</a></p>
-</subsection>
-
-<subsection name="SMIMEDecrypt">
-<p>Description: This mailet decrypts a s/mime encrypted message. It takes as 
input an
-encrypted message and it tries to dechiper it using the key specified in its
-configuration. If the decryption is successful the mail will be changed and
-it will contain the decrypted message. The mail attribute
-<code>org.apache.james.SMIMEDecrypt</code> will contain the public
-certificate of the key used in the process. </p>
-
-<p>Parameters: <a 
href="apidocs/org/apache/james/transport/mailets/smime/SMIMEDecrypt.html">See 
javadocs.</a></p>
-</subsection>
-
-<subsection name="SMIMESign">
-<p>Description: Puts a <i>server-side</i> SMIME signature on a message.
-It is a concrete subclass of SMIMEAbstractSign, with very few modifications to 
it.</p>
-<p>A text file with an explanation text is attached to the original message,
-and the resulting message with all its attachments is signed.
-The resulting appearence of the message is almost unchanged: only an extra 
attachment
-and the signature are added.</p>
-
-<p>Parameters: <a 
href="apidocs/org/apache/james/transport/mailets/smime/SMIMESign.html">See 
javadocs.</a></p>
-</subsection>
-
-<subsection name="ToProcessor">
-<p>Description: Redirects processing of the mail message to the specified 
processor.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>processor</strong> (required) - the name of the processor to which 
the message
-is to be redirected.</li>
-<li><strong>noticeText</strong> (optional) - a String value that, if present,
-is set as the error message of the redirected message.  If this value is not
-present, no error message is set.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="ToSenderFolder">
-  <p>
-    Description: Place a copy of the mail message in a folder of the sender. 
It needs to be used in combination
-    with the SenderIsLocal matcher
-  </p>
-  
-  <p>Parameters:
-    <ul>
-      <li><strong>folder</strong> (required) - The folder name of the Sender 
mailbox in which the mail will be copied.</li>
-      <li><strong>consume</strong> (optional) - flag tru or false: will tell 
is the mail will be further processed by the upcoming processor mailets, or 
not</li>
-    </ul>
-  </p>
-  
-<source>
-&lt;mailet match="SenderIsLocal" class="ToSenderFolder"&gt;
-  &lt;folder&gt;Sent&lt;/folder&gt;
-  &lt;consume&gt;false&lt;/consume&gt;
-&lt;/mailet&gt;
-</source>
-  
-</subsection>
-
-<subsection name="ToMultiRepository">
-<p>Description: Receives a Mail from JamesSpoolManager and takes care of 
delivery of the
-message to local inboxes or a specific repository.
- 
-Differently from LocalDelivery this does not lookup the UserRepository This
-simply store the message in a repository named like the local part of the
-recipient address.
- 
-If no repository is specified then this fallback to MailServer.getUserInbox.
-Otherwise you can add your own configuration for the repository.</p>
-<p>Parameters:
-<ul>
-<li><strong>repositoryUrl</strong> (required) - the URL of the repository to 
which the message
-is to be added.</li>
-<li><strong>addDeliveryHeader</strong> (optional) - a String value which can 
be used specify a header which will add to the message. 
-Default is to not add a header.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="ToRecipientFolder">
-  <p>
-    Description: Place a copy of the mail message in a folder of the 
recipient. It receives a Mail from the Queue and 
-      takes care to deliver the message to a defined folder of the 
recipient(s).
-  </p>
-  
-  <p>Parameters:
-    <ul>
-      <li><strong>folder</strong> (required) - The folder name of the 
Recipient mailbox in which the mail will be copied.</li>
-      <li><strong>consume</strong> (optional) - flag true or false: will tell 
is the mail will be further processed by the upcoming processor mailets, or 
not</li>
-    </ul>
-  </p>
-  
-<source>
-&lt;mailet match="RecipientIsLocal" class="ToRecipientFolder"&gt;
-  &lt;folder&gt;Junk&lt;/folder&gt;
-  &lt;consume&gt;false&lt;/consume&gt;
-&lt;/mailet&gt;
-</source>
-</subsection>
-
-<subsection name="ToRepository">
-<p>Places a copy of the message in the specified repository.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>repositoryPath</strong> (required) - the URL of the repository to 
which the message
-is to be added.</li>
-<li><strong>passThrough</strong> (optional) - a boolean value (true/false) 
indicating whether
-processing should continue on the message is on.  If false, the original 
message is GHOSTed.  Defaults to false.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="UseHeaderRecipients">
-<p>Description: Ignores the recipients associated with the Mail interface.  
Instead, it regenerates the
-mail recipients from the MimeMessage headers (To, Cc, Bcc) and inserts a new 
message at the queue root
-these new recipients.  The original message is GHOSTed.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>debug</strong> (optional) - a boolean value (true/false) 
indicating whether debugging is
-on.  Defaults to false.</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="UsersRepositoryAliasingForwarding">
-<p>Receives a Mail from JamesSpoolManager and takes care of delivery of the
-message to local inboxes.</p>
-
-<p>Parameters:
-<ul>
-<li><strong>enableAliases</strong> (optional) - Specify wether the user 
aliases should 
-be looked up or not. Default is false.</li>
-<li><strong>enableForwarding</strong> (optional) -Enable the forwarding. 
Default to 
-false.</li>
-<li><strong>usersRepository</strong> (optional) - Specific users repository
-name. Default to empty. If empty does lookup the default userRepository.
-</li>
-</ul>
-</p>
-</subsection>
-
-<subsection name="WhiteListManager">
-<p>Manages for each local user a "white list" of remote addresses whose 
messages
-should never be blocked as spam.</p>
-<p>The normal behaviour is to check, for a local sender, if a remote recipient
-is already in the list: if not, it will be automatically inserted.
-This is under the interpretation that if a local sender <i>X</i> sends a 
message to a
-remote recipient <i>Y</i>, then later on if a message is sent by <i>Y</i> to 
<i>X</i> it should be
-considered always valid and never blocked; hence <i>Y</i> should be in the 
white list
-of <i>X</i>.</p>
-<p>Another mode of operations is when a local sender sends a message to 
<i>whitelistManagerAddress</i>
-with one of three specific values in the subject, to
-(i) send back a message displaying a list of the addresses in his own list;
-(ii) insert some new addresses in his own list;
-(iii) remove some addresses from his own list.
-In all this cases the message will be ghosted and the postmaster will reply
-to the sender.</p>
-<p> The sender name is always converted to its primary name (handling 
aliases).</p>
-
-<p>Parameters:
-<ul>
-<li><strong>repositoryPath</strong>  - The repository path.</li>
-<li><strong>automaticInsert</strong> (optional) - If true automatically 
inserts the local sender to remote 
-recipients entries in the whitelist. Default is false.</li>
-<li><strong>whitelistManagerAddress</strong> (optional) -  Set this to an 
email address of the "whitelist manager" to send 
-commands to (default is null).</li>
-<li><strong>displayFlag</strong> (optional) - Set this to a unique text that 
you can use (by sending a 
-message to the "whitelist manager" above) to tell the mailet to send back the 
contents of the white list. Default is null.</li>
-<li><strong>insertFlag</strong> (optional) - Set this to a unique text that 
you can use (by sending a message to the "whitelist manager" above)
-to tell the mailet to insert some new remote recipients to the white list. 
Default is null.</li>
-<li><strong>removeFlag</strong> (optional) - Set this to a unique text that 
you can use (by sending a message to the "whitelist manager" above)
-to tell the mailet to remove some remote recipients from the white list. 
Default is null.</li>
-</ul>
-</p>
-</subsection>
-</section>
-</body>
-</document>

http://git-wip-us.apache.org/repos/asf/james-project/blob/6ea664e9/src/site/xdoc/server/dev-provided-matchers.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/dev-provided-matchers.xml 
b/src/site/xdoc/server/dev-provided-matchers.xml
deleted file mode 100644
index ffbe625..0000000
--- a/src/site/xdoc/server/dev-provided-matchers.xml
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.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.    
--->
-<document>
-
-    <properties>
-        <title>Apache James Server 3 - Provided Matchers</title>
-    </properties>
-
-    <body>
-
-        <section name="Matchers">
-
-            <p>James provides a number of implemented Matchers for use by 
James administrators in their
-                configurations.  These are primarily matchers that members of 
the James developer or user
-                communities have found useful in their own configurations.  A 
description of how to configure
-                Matchers and use them in the James SpoolManager can be found 
<a href="config-mailetcontainer.html">here</a>.</p>
-
-            <subsection name="All">
-                <p>Description: This matcher is the trivial one - it matches 
all mails being processed. All recipients are returned.</p>
-                <p>Configuration string: None.</p>
-            </subsection>
-
-            <subsection name="AttachmentFileNameIs">
-                <p>Description: It can be used to refuse emails with SCR, PIF, 
EXE etc. attachments.
-                    It matches mails that has a file attachment with a file 
name meeting one of the supplied filters.
-                    All recipients are returned.</p>
-                <p>Configuration string: A comma or space delimited list of 
file names.
-                    File names may start with a wildcard '*'. Example: 
*.scr,*.bat,*.pif,*.pi,*.com,*.exe
-                    <pre><code>
-                        &lt;mailet match="AttachmentFileNameIs=value, value, 
.." class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="CommandForListserv">
-                <p>Description: The CommandForListserv matcher is used as a 
simple filter to recognize emails that are list server
-                    commands.  It will match any email addressed to the list 
server host, as well as any email that is addressed
-                    to a user named &lt;prefix&gt;-on or &lt;prefix&gt;-off on 
any host.  Only those matching recipients will be returned.</p>
-                <p>Configuration string: An email address of the form 
&lt;prefix&gt;@&lt;host&gt;, where host is the hostname used for the listserver 
and prefix is the command prefix.
-                    <pre><code>
-                        &lt;mailet 
match="CommandForListserv=james...@list.working-dogs.com" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="CommandForListservManager">
-                <p>Description: CommandListservMatcher is the matcher that 
pairs with the CommandListservManager mailet. It checks to see if the request is
-                    intended for the ListservManager, but doesn't guarantee 
that it is a valid command.  Only those matching recipients will be 
returned.</p>
-                <p>Configuration string: An email address.
-                    <pre><code>
-                        &lt;mailet 
match="CommandForListservManager=announce@localhost" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="CompareNumericHeaderValue">
-                <p>Description: Matches mails containing a header with a 
numeric value whose comparison with the specified value is true.
-                    If the header is missing in the message, there will be 
<i>no match</i>. All recipients are returned.</p>
-                <p>Configuration string: The headerName, a comparison operator 
and the numeric headerValue
-                    to compare with, <i>space or tab delimited</i>.
-                    <pre><code>
-                        &lt;mailet match="CompareNumericHeaderValue= 
X-MessageIsSpamProbability &gt; 0.9" class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="FetchedFrom">
-                <p>Description: A matcher intended for use with the FetchMail 
server.  It matches a custom header (X-fetched-from) that is
-                    set by the FetchMail server.  FetchMail sets this header 
to the name of the FetchPOP task which originally fetched
-                    the message.  All recipients are returned.</p>
-                <p>Configuration string: The name of the FetchMail task which 
originally fetched the message.
-                    <pre><code>
-                        &lt;mailet match="FetchedFrom=value" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="FileRegexMatcher">
-                <p>Description: A matcher which can be used to match on a 
attachment when the given regex match. All recipients are returned.</p>
-                <p>Configuration string: A regex for match attachmentname.
-                    <pre><code>
-                        &lt;mailet match="FileRegexMatcher=value" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="HasAttachment">
-                <p>Description: Matches those messages with at list a body 
part with an attachment. Content disposition
-                    is used to detect attachment, as specified by RFC-2183. 
All recipients are returned.</p>
-                <p>Configuration string: None.</p>
-            </subsection>
-
-            <subsection name="HasHabeasWarrantMark">
-                <p>Description: Matches mails that have the Habeas Warrant 
(see http://www.habeas.com for details).  All recipients are returned.</p>
-                <p>Configuration string: None.</p>
-            </subsection>
-
-            <subsection name="HasHeader">
-                <p>Description: Matches mails that have the specified header.  
All recipients are returned.</p>
-                <p>
-                    Configuration string: The name of the header whose 
presence determines the match.
-                    <pre><code>
-                        &lt;mailet match="HasHeader=headerName" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-                <p>
-                    One can additionally specify a header value associated 
with the header name. You can do something like :
-                    <pre><code>
-                        &lt;mailet match="HasHeader=headerName=headerValue" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-                <p>
-                    You can verify several headers at once. They should all be 
matching. To do so, separate your conditions using "+" :
-                    <pre><code>
-                        &lt;mailet 
match="HasHeader=headerName1+headerName2=value" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-                <p>
-                    Note: If the header you are matching against is present 
several time in the received mail, then it is
-                    considered as matching if the specified value is present 
on one line.
-                </p>
-            </subsection>
-
-            <subsection name="HasMailAttribute">
-                <p>Description: Matches mails that have the specified Mail 
Attribute.  All
-                    recipients are returned.</p>
-                <p>Configuration string: The name of the Mail Attribute to 
match. For example:<br/>
-                    <pre><code>
-                        &lt;mailet match="HasMailAttribute=name" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="HasMailAttributeWithValue">
-                <p>Description: Matches mails that have the specified Mail 
Attribute and the
-                    specified MailAttribute value. All recipients are 
returned.</p>
-                <p>MailAttributes are types of Object whereas the value 
specified in the Matcher
-                    condition is of type String. The toString() method is used 
to obtain a String
-                    representation of the Mail Attribute value for matching. 
The
-                    String.equals(String) method tests for a match.</p>
-                <p>Configuration string: The name of the Mail Attribute to be 
matched,  a comma
-                    and then the String value to be matched. For example:<br/>
-                    <pre><code>
-                        &lt;mailet match="HasMailAttributeWithValue=name, 
value" class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="HasMailAttributeWithValueRegex">
-                <p>Description: Matches mails that have the specified Mail 
Attribute and
-                    a MailAttribute value that matches the specified regular 
expression.
-                    All recipients are returned.</p>
-                <p>MailAttributes are types of Object whereas the value 
specified in the Matcher
-                    condition is of type String. The toString() method is used 
to obtain a String
-                    representation of the Mail Attribute value for matching. 
The regular
-                    expression must follow Perl5 syntax.</p>
-                <p>Configuration string: The name of the Mail Attribute to be 
matched,  a comma
-                    and then the regular expression used to match the value 
against. For example:<br/>
-                    <pre><code>
-                        &lt;mailet match="HasMailAttributeWithValueRegex=name, 
regex" class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="HostIs">
-                <p>Description: Matches mails that are sent to email addresses 
on hosts that are in the configuration list.  Only
-                    recipients that are on one of the hosts are returned.</p>
-                <p>Configuration string: A list of host names, comma or space 
delimited.
-                    <pre><code>
-                        &lt;mailet match="HostIs=value, value, .." 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="HostIsLocal">
-                <p>Description: Matches mails that are sent to email addresses 
on local hosts.  Only
-                    recipients that are on one of the local hosts are 
returned.</p>
-                <p>Configuration string: None.</p>
-            </subsection>
-
-            <subsection name="InSpammerBlacklist">
-                <p>Description: Checks the mail against one of a number of 
mail-abuse.org IP lists. All recipients are returned</p>
-                <p>Configuration string: One of three strings - 
"blackholes.mail-abuse.org", "relays.mail-abuse.org", or 
"dialups.mail-abuse.org".</p>
-            </subsection>
-
-            <subsection name="IsInWhiteList">
-                <p>Description: Matches recipients having the mail sender in 
the recipient's private whitelist.
-                    The recipient name is always converted to its primary name 
(handling aliases).</p>
-                <p>Configuration string: The database name containing the 
white list table.</p>
-                <pre><code>
-                    &lt;mailet match="IsInWhiteList=db://maildb" 
class="ToProcessor"&gt;
-                    &lt;processor&gt; transport &lt;/processor&gt;
-                    &lt;/mailet&gt;
-                </code></pre>
-            </subsection>
-
-            <subsection name="IsSingleRecipient">
-                <p>Description: Matches those messages sent to only a single 
recipient.  The single recipient is returned.</p>
-                <p>Configuration string: None.</p>
-            </subsection>
-
-            <subsection name="NESSpamCheck">
-                <p>Description: A matcher derived from a Netscape Mail Server 
spam filter.  If the matcher detects headers that
-                    indicate spam, the message is matched.  All recipients are 
returned.</p>
-                <p>Configuration string: None.</p>
-            </subsection>
-
-            <subsection name="RecipientIs">
-                <p>Description: Matches mails that are sent to one of the 
recipients on a specified list.  Only
-                    matching recipients are returned.</p>
-                <p>Configuration string: A list of recipient addresses, comma, 
tab, or space delimited.
-                    <pre><code>
-                        &lt;mailet match="RecipientIs=value, value, .." 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="RecipientIsLocal">
-                <p>Description: Matches mails that are sent to email addresses 
on local hosts with users that have local accounts.  Only
-                    matching recipients are returned.</p>
-                <p>Configuration string: None.</p>
-            </subsection>
-
-            <subsection name="RecipientIsOverFixedQuota">
-                <p>Description: Matches mails that are send to email addresses 
which are over the given quota. Only
-                    matching recipients are returned.</p>
-                <p>Configuration string: The quota
-                    <pre><code>
-                        &lt;mailet match="RecipientIsOverFixedQuota=10m" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="RecipientIsRegex">
-                <p>Description: Matches mails that are send to email addresses 
which are matched given regex. Only
-                    matching recipients are returned.</p>
-                <p>Configuration string: The quota
-                    <pre><code>
-                        &lt;mailet match="RecipientIsRegex=value" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-
-            <subsection name="RelayLimit">
-                <p>Description: Counts the number of Received headers in the 
mail (each of which represents a server
-                    in the relay chain).  If the number equals or exceeds the 
specified limit, the mail is
-                    matched.  All recipients are returned.</p>
-                <p>Configuration string: a positive integer that is the limit 
on the number of relays.
-                    <pre><code>
-                        &lt;mailet match="RelayLimit=value" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="RemoteAddrInNetwork">
-                <p>Description: Checks the remote address from which the mail 
was received against the configured list.  If the address matches one on the 
list, the matcher considers it a match.
-                    All recipients are returned.</p>
-                <p>Configuration string: A list of domain names, IP addresses, 
or wildcarded IP subnets of any class.  The
-                    list may be comma or space delimited.
-                    <pre><code>
-                        &lt;mailet match="RemoteAddrInNetwork=value, value, 
.." class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="RemoteAddrNotInNetwork">
-                <p>Description: Checks the remote address from which the mail 
was received against the configured list.  If the address doesn't match one on 
the list, the matcher considers it a match.
-                    All recipients are returned.</p>
-                <p>Configuration string: A list of domain names, IP addresses, 
or wildcarded IP subnets of any class.  The
-                    list may be comma or space delimited.
-                    <pre><code>
-                        &lt;mailet match="RemoteAddrNotInNetwork=value, value, 
.." class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="SenderHostIs">
-                <p>Description: Matches mails where the host name in the 
address of the sender cannot be resolved.  All
-                    recipients are returned.</p>
-                <p>Configuration string: None.</p>
-            </subsection>
-
-            <subsection name="SenderInFakeDomain">
-                <p>Description: Matches mails where the host name in the 
address of the sender cannot be resolved.  All
-                    recipients are returned.</p>
-                <p>Configuration string: None.</p>
-            </subsection>
-
-            <subsection name="SenderIs">
-                <p>Description: Matches mails that are sent by one of the 
senders on a specified list.  All
-                    recipients are returned.</p>
-                <p>Configuration string: A list of sender addresses, comma, 
tab, or space delimited.
-                    <pre><code>
-                        &lt;mailet match="SenderIs=value, value, .." 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="SenderIsNull">
-                <p>Description: Matches mails that are sent by a null 
sender.</p>
-                <p>Configuration string: none.
-                    <pre><code>
-                        &lt;mailet match="SenderIsNull" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="SenderIsRegex">
-                <p>Description: Matches mails that are sent by one of the 
senders matched the given regex.
-                    All recipients are returned.</p>
-                <p>Configuration string: A regex.
-                    <pre><code>
-                        &lt;mailet match="SenderIsRegex=value" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="SizeGreaterThan">
-                <p>Description: Matches emails with a total message size 
(headers and body) greater than the specified limit.
-                    All recipients are returned. Specified limit should be 
strictly positive.</p>
-                <p>Configuration string: a positive integer followed by an 'm' 
or a 'k'.  This is the maximum message size permitted
-                    specified in megabytes or kilobytes respectively.
-                    <pre><code>
-                        &lt;mailet match="SizeGreaterThan=1m" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="SMTPAuthSuccessful">
-                <p>Description: Matches mails that are send from an authorized 
sender. All recipients are returned.</p>
-                <p>Configuration string: none.
-                    <pre><code>
-                        &lt;mailet match="SMTPAuthSuccessful" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="SMTPAuthUserIs">
-                <p>Description: Matches mails that are send from one of the 
given authorized senders. All recipients are returned.</p>
-                <p>Configuration string: none.
-                    <pre><code>
-                        &lt;mailet match="SMTPAuthUserIs=value, value, .." 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-
-            <subsection name="SubjectIs">
-                <p>Description: Matches emails with the specified subject.  
All recipients are returned.</p>
-                <p>Configuration string: The string against which mail subject 
headers are matched.
-                    <pre><code>
-                        &lt;mailet match="SubjectIs=value" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="SubjectStartsWith">
-                <p>Description: Matches emails whose subject header starts 
with the specified string.  All recipients are returned.</p>
-                <p>Configuration string: The string against which mail subject 
headers are matched.
-                    <pre><code>
-                        &lt;mailet match="SubjectStartsWith=value" 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-            <subsection name="UserIs">
-                <p>Description: Matches mails that are sent to email addresses 
that have userids that are in the configuration list.  Only
-                    matching recipients are returned.</p>
-                <p>Configuration string: A list of user names, comma or space 
delimited.
-                    <pre><code>
-                        &lt;mailet match="UserIs=value, value, .." 
class=&quot;&lt;any-class&gt;&quot;&gt;
-                    </code></pre>
-                </p>
-            </subsection>
-
-        </section>
-    </body>
-</document>

http://git-wip-us.apache.org/repos/asf/james-project/blob/6ea664e9/src/site/xdoc/server/dev-provided.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/dev-provided.xml 
b/src/site/xdoc/server/dev-provided.xml
index 06435bb..a79a3f3 100644
--- a/src/site/xdoc/server/dev-provided.xml
+++ b/src/site/xdoc/server/dev-provided.xml
@@ -27,15 +27,18 @@
 
 <section name="James Provided Extensions">
 
-  <subsection name="Provided Mailet">
+  <subsection name="Provided Mailets and Matchers">
   
-    <p>See the <a href="dev-provided-mailets.html">provided mailets</a> page 
for more information.</p>
-  
-  </subsection>
- 
-  <subsection name="Provided  Matcher">
-  
-    <p>See the <a href="dev-provided-mailets.html">provided matchers</a> page 
for more information.</p>
+    <p>See the <a href="dev-provided-mailets.html">provided mailets and 
matchers</a> page for more information.</p>
+
+      <!--
+      Page dev-provided-mailets.xml ommited from sources.
+
+      To generate its HTML version run + rename mvn 
org.apache.james:mailetdocs-maven-plugin:3.0.0-RC2-SNAPSHOT:aggregate
+      in james-project. It is in target/site/ folder.
+
+      You then need to ensure page have the rights menu and move it to the 
website server folder.
+      -->
   
   </subsection>
  

http://git-wip-us.apache.org/repos/asf/james-project/blob/6ea664e9/src/site/xdoc/server/feature-mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/feature-mailetcontainer.xml 
b/src/site/xdoc/server/feature-mailetcontainer.xml
index 9461c70..f284413 100644
--- a/src/site/xdoc/server/feature-mailetcontainer.xml
+++ b/src/site/xdoc/server/feature-mailetcontainer.xml
@@ -124,7 +124,9 @@
         <p>James bundles a number of Matchers and Mailets in its distribution. 
 Descriptions of provided matchers 
         can be found <a href="dev-provided-matchers.html">here</a>, while 
descriptions of provided mailets can be found 
         <a href="dev-provided-mailets.html">here</a>.</p>
-        
+
+        <p>You can retrieve the full list of mailets and matchers packaged in 
James <a href="dev-provided-mailets.html">here</a></p>
+
         <p>You can read more on mailets on following web sites:</p>
     
         <ul>
@@ -132,10 +134,7 @@
           <li><a href="http://james.apache.org/mailet/api/index.html";>Mailet 
API</a></li>
           <li><a href="http://james.apache.org/mailet/base/index.html";>Mailet 
Toolkit</a></li>
           <li><a 
href="http://james.apache.org/mailet/crypto/index.html";>Mailet Crypto</a></li>
-          <li><a 
href="http://james.apache.org/mailet/standard/index.html";>Mailet Sieve</a></li>
           <li><a 
href="http://james.apache.org/mailet/standard/index.html";>Mailet 
Standard</a></li>
-          <li><a 
href="http://james.apache.org/mailet/maven-mailetdocs-plugin/index.html";>Mailet 
Docs</a></li>
-          <li><a 
href="/james-server-mailets-function/mailet-report.html">Server Mailets</a></li>
         </ul>
     
      </subsection>


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

Reply via email to