serge       2003/01/14 05:58:22

  Modified:    src/java/org/apache/james James.java
               src/java/org/apache/james/core AvalonMailStore.java
               src/java/org/apache/james/fetchpop FetchPOP.java
                        FetchScheduler.java ReaderInputStream.java
               src/java/org/apache/james/mailrepository
                        AvalonMailRepository.java
                        AvalonSpoolRepository.java JDBCMailRepository.java
                        JDBCSpoolRepository.java
               src/java/org/apache/james/transport LinearProcessor.java
               src/java/org/apache/james/transport/mailets
                        AddHabeasWarrantMark.java AddHeader.java
                        GenericListserv.java NotifyPostmaster.java
                        NotifySender.java PostmasterAlias.java
                        ServerTime.java ToProcessor.java
                        UseHeaderRecipients.java
               src/java/org/apache/james/transport/matchers
                        FetchedFrom.java HasHabeasWarrantMark.java
                        HasHeader.java
               src/java/org/apache/james/userrepository
                        UsersFileRepository.java
               src/java/org/apache/james/util/mordred JdbcDataSource.java
  Log:
  HTML encoded various example configurations and other < and > that were intended to 
be visible.
  
  Revision  Changes    Path
  1.43      +2 -2      jakarta-james/src/java/org/apache/james/James.java
  
  Index: James.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/James.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- James.java        14 Jan 2003 13:41:47 -0000      1.42
  +++ James.java        14 Jan 2003 13:58:20 -0000      1.43
  @@ -840,7 +840,7 @@
        * UsersRepository.
        *
        * @param userName String representing user name, that is the portion of
  -     * an email address before the '@<domain>'.
  +     * an email address before the '@&lt;domain&gt;'.
        * @param password String plaintext password
        * @return boolean true if user added succesfully, else false.
        */
  
  
  
  1.21      +3 -3      
jakarta-james/src/java/org/apache/james/core/AvalonMailStore.java
  
  Index: AvalonMailStore.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/core/AvalonMailStore.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- AvalonMailStore.java      14 Jan 2003 13:41:48 -0000      1.20
  +++ AvalonMailStore.java      14 Jan 2003 13:58:20 -0000      1.21
  @@ -186,11 +186,11 @@
        * This method accept a Configuration object as hint and return the
        * corresponding MailRepository.
        * The Configuration must be in the form of:
  -     * <repository destinationURL="[URL of this mail repository]"
  +     * &lt;repository destinationURL="[URL of this mail repository]"
        *             type="[repository type ex. OBJECT or STREAM or MAIL etc.]"
  -     *             model="[repository model ex. PERSISTENT or CACHE etc.]">
  +     *             model="[repository model ex. PERSISTENT or CACHE etc.]"&gt;
        *   [addition configuration]
  -     * </repository>
  +     * &lt;/repository&gt;
        *
        * @param hint the Configuration object used to look up the repository
        *
  
  
  
  1.8       +1 -1      jakarta-james/src/java/org/apache/james/fetchpop/FetchPOP.java
  
  Index: FetchPOP.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/fetchpop/FetchPOP.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FetchPOP.java     14 Jan 2003 13:41:48 -0000      1.7
  +++ FetchPOP.java     14 Jan 2003 13:58:21 -0000      1.8
  @@ -30,7 +30,7 @@
    * A class which fetches mail from a single POP account and inserts it
    * into the incoming spool<br>
    *
  - * <br>$Id$
  + * @version 1.0.0, 18/06/2000
    *
    */
   public class FetchPOP extends AbstractLogEnabled implements Configurable, Target {
  
  
  
  1.7       +1 -1      
jakarta-james/src/java/org/apache/james/fetchpop/FetchScheduler.java
  
  Index: FetchScheduler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/fetchpop/FetchScheduler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FetchScheduler.java       14 Jan 2003 13:41:48 -0000      1.6
  +++ FetchScheduler.java       14 Jan 2003 13:58:21 -0000      1.7
  @@ -26,9 +26,9 @@
   
   /**
    *  A class to instantiate and schedule a set of POP mail fetching tasks<br>
  - * <br>$Id$
    *  @see org.apache.james.fetchpop.FetchPOP#configure(Configuration) FetchPOP
    *
  + * @version 1.0.0, 18/06/2000
    */
   public class FetchScheduler
       extends AbstractLogEnabled
  
  
  
  1.4       +1 -1      
jakarta-james/src/java/org/apache/james/fetchpop/ReaderInputStream.java
  
  Index: ReaderInputStream.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/fetchpop/ReaderInputStream.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ReaderInputStream.java    14 Jan 2003 13:41:48 -0000      1.3
  +++ ReaderInputStream.java    14 Jan 2003 13:58:21 -0000      1.4
  @@ -17,8 +17,8 @@
    *
    *
    * Simple class to allow a cast from a java.io.Reader to a java.io.InputStream<br>
  - * <br>$Id$
    *
  + * @version 1.0.0, 18/06/2000
    */
   public class ReaderInputStream extends InputStream {
       private Reader reader = null;
  
  
  
  1.27      +2 -2      
jakarta-james/src/java/org/apache/james/mailrepository/AvalonMailRepository.java
  
  Index: AvalonMailRepository.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/AvalonMailRepository.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- AvalonMailRepository.java 14 Jan 2003 13:41:48 -0000      1.26
  +++ AvalonMailRepository.java 14 Jan 2003 13:58:21 -0000      1.27
  @@ -38,9 +38,9 @@
    * Implementation of a MailRepository on a FileSystem.
    *
    * Requires a configuration element in the .conf.xml file of the form:
  - *  <repository destinationURL="file://path-to-root-dir-for-repository"
  + *  &lt;repository destinationURL="file://path-to-root-dir-for-repository"
    *              type="MAIL"
  - *              model="SYNCHRONOUS"/>
  + *              model="SYNCHRONOUS"/&gt;
    * Requires a logger called MailRepository.
    *
    * @version 1.0.0, 24/04/1999
  
  
  
  1.12      +2 -2      
jakarta-james/src/java/org/apache/james/mailrepository/AvalonSpoolRepository.java
  
  Index: AvalonSpoolRepository.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/AvalonSpoolRepository.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AvalonSpoolRepository.java        14 Jan 2003 13:41:49 -0000      1.11
  +++ AvalonSpoolRepository.java        14 Jan 2003 13:58:21 -0000      1.12
  @@ -18,9 +18,9 @@
    * Implementation of a MailRepository on a FileSystem.
    *
    * Requires a configuration element in the .conf.xml file of the form:
  - *  <repository destinationURL="file://path-to-root-dir-for-repository"
  + *  &lt;repository destinationURL="file://path-to-root-dir-for-repository"
    *              type="MAIL"
  - *              model="SYNCHRONOUS"/>
  + *              model="SYNCHRONOUS"/&gt;
    * Requires a logger called MailRepository.
    *
    * @version 1.0.0, 24/04/1999
  
  
  
  1.37      +3 -3      
jakarta-james/src/java/org/apache/james/mailrepository/JDBCMailRepository.java
  
  Index: JDBCMailRepository.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/JDBCMailRepository.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- JDBCMailRepository.java   14 Jan 2003 13:41:49 -0000      1.36
  +++ JDBCMailRepository.java   14 Jan 2003 13:58:21 -0000      1.37
  @@ -60,10 +60,10 @@
    * Implementation of a MailRepository on a database.
    *
    * <p>Requires a configuration element in the .conf.xml file of the form:
  - *  <br><repository 
destinationURL="db://<datasource>/<table_name>/<repository_name>"
  + *  <br>&lt;repository 
destinationURL="db://<datasource>/<table_name>/&lt;repository_name&gt;"
    *  <br>            type="MAIL"
  - *  <br>            model="SYNCHRONOUS"/>
  - *  <br></repository>
  + *  <br>            model="SYNCHRONOUS"/&gt;
  + *  <br>&lt;/repository&gt;
    * <p>destinationURL specifies..(Serge??)
    * <br>Type can be SPOOL or MAIL
    * <br>Model is currently not used and may be dropped
  
  
  
  1.18      +6 -6      
jakarta-james/src/java/org/apache/james/mailrepository/JDBCSpoolRepository.java
  
  Index: JDBCSpoolRepository.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/JDBCSpoolRepository.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- JDBCSpoolRepository.java  14 Jan 2003 13:41:49 -0000      1.17
  +++ JDBCSpoolRepository.java  14 Jan 2003 13:58:21 -0000      1.18
  @@ -22,13 +22,13 @@
    * Implementation of a SpoolRepository on a database.
    *
    * <p>Requires a configuration element in the .conf.xml file of the form:
  - *  <br><repository destinationURL="town://path"
  + *  <br>&lt;repository destinationURL="town://path"
    *  <br>            type="MAIL"
  - *  <br>            model="SYNCHRONOUS"/>
  - *  <br>            <driver>sun.jdbc.odbc.JdbcOdbcDriver</conn>
  - *  <br>            <conn>jdbc:odbc:LocalDB</conn>
  - *  <br>            <table>Message</table>
  - *  <br></repository>
  + *  <br>            model="SYNCHRONOUS"/&gt;
  + *  <br>            &lt;driver&gt;sun.jdbc.odbc.JdbcOdbcDriver&lt;/conn&gt;
  + *  <br>            &lt;conn&gt;jdbc:odbc:LocalDB&lt;/conn&gt;
  + *  <br>            &lt;table&gt;Message&lt;/table&gt;
  + *  <br>&lt;/repository&gt;
    * <p>destinationURL specifies..(Serge??)
    * <br>Type can be SPOOL or MAIL
    * <br>Model is currently not used and may be dropped
  
  
  
  1.16      +8 -8      
jakarta-james/src/java/org/apache/james/transport/LinearProcessor.java
  
  Index: LinearProcessor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/LinearProcessor.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- LinearProcessor.java      14 Jan 2003 13:41:55 -0000      1.15
  +++ LinearProcessor.java      14 Jan 2003 13:58:21 -0000      1.16
  @@ -36,14 +36,14 @@
    * the chain of matchers/mailets.
    *
    *  SAMPLE CONFIGURATION
  - *  <processor name="try" onerror="return,log">
  - *      <mailet match="RecipientIsLocal" class="LocalDelivery">
  - *      </mailet>
  - *      <mailet match="All" class="RemoteDelivery">
  - *          <delayTime>21600000</delayTime>
  - *          <maxRetries>5</maxRetries>
  - *      </mailet>
  - *  </processor>
  + *  &lt;processor name="try" onerror="return,log"&gt;
  + *      &lt;mailet match="RecipientIsLocal" class="LocalDelivery"&gt;
  + *      &lt;/mailet&gt;
  + *      &lt;mailet match="All" class="RemoteDelivery"&gt;
  + *          &lt;delayTime&gt;21600000&lt;/delayTime&gt;
  + *          &lt;maxRetries&gt;5&lt;/maxRetries&gt;
  + *      &lt;/mailet&gt;
  + *  &lt;/processor&gt;
    *
    * Note that the 'onerror' attribute is not yet supported.
    */
  
  
  
  1.4       +1 -1      
jakarta-james/src/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java
  
  Index: AddHabeasWarrantMark.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AddHabeasWarrantMark.java 14 Jan 2003 13:41:56 -0000      1.3
  +++ AddHabeasWarrantMark.java 14 Jan 2003 13:58:21 -0000      1.4
  @@ -15,7 +15,7 @@
    * This matcher adds the Hebeas Warrant Mark to a message.
    * For details see: http://www.hebeas.com
    *
  - * Usage: <mailet match="<suitable-matcher>" class="AddHabeasWarrantMark" />
  + * Usage: &lt;mailet match="&lt;suitable-matcher&gt;" class="AddHabeasWarrantMark" 
/&gt;
    *
    * NOTE: Although this mailet is covered by the Apache Software License,
    * the Habeas Warrant Mark is copyright.  A separate license from Habeas
  
  
  
  1.4       +4 -4      
jakarta-james/src/java/org/apache/james/transport/mailets/AddHeader.java
  
  Index: AddHeader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/AddHeader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AddHeader.java    14 Jan 2003 13:41:56 -0000      1.3
  +++ AddHeader.java    14 Jan 2003 13:58:21 -0000      1.4
  @@ -17,10 +17,10 @@
    *
    * Sample configuration:
    *
  - * <mailet match="All" class="AddHeader">
  - *   <name>X-MailetHeader</name>
  - *   <value>TheHeaderValue</value>
  - * </mailet>
  + * &lt;mailet match="All" class="AddHeader"&gt;
  + *   &lt;name&gt;X-MailetHeader&lt;/name&gt;
  + *   &lt;value&gt;TheHeaderValue&lt;/value&gt;
  + * &lt;/mailet&gt;
    *
    * @version 1.0.0, 2002-09-11
    */
  
  
  
  1.14      +7 -7      
jakarta-james/src/java/org/apache/james/transport/mailets/GenericListserv.java
  
  Index: GenericListserv.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/GenericListserv.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- GenericListserv.java      7 Jan 2003 11:06:34 -0000       1.13
  +++ GenericListserv.java      14 Jan 2003 13:58:21 -0000      1.14
  @@ -75,19 +75,19 @@
       }
   
       /**
  -     * This takes the subject string and reduces (normailzes) it.
  +     * <p>This takes the subject string and reduces (normailzes) it.
        * Multiple "Re:" entries are reduced to one, and capitalized.  The
        * prefix is always moved/placed at the beginning of the line, and
        * extra blanks are reduced, so that the output is always of the
  -     * form:
  -     *
  -     * <prefix> + <one-optional-"Re:"> + <remaining subject>
  -     *
  -     * I have done extensive testing of this routine with a standalone
  +     * form:</p>
  +     * <code>
  +     * &lt;prefix&gt; + &lt;one-optional-"Re:"*gt; + &lt;remaining subject&gt;
  +     * </code>
  +     * <p>I have done extensive testing of this routine with a standalone
        * driver, and am leaving the commented out debug messages so that
        * when someone decides to enhance this method, it can be yanked it
        * from this file, embedded it with a test driver, and the comments
  -     * enabled.
  +     * enabled.</p>
        */
   
       static private String normalizeSubject(final String subj, final String prefix) {
  
  
  
  1.12      +5 -5      
jakarta-james/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java
  
  Index: NotifyPostmaster.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/NotifyPostmaster.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- NotifyPostmaster.java     14 Jan 2003 13:41:56 -0000      1.11
  +++ NotifyPostmaster.java     14 Jan 2003 13:58:21 -0000      1.12
  @@ -36,11 +36,11 @@
    * message.  If you do not specify one, it will use the postmaster's address
    *
    * Sample configuration:
  - * <mailet match="All" class="NotifyPostmaster">
  - *   <sendingAddress>nobounce@localhost</sendingAddress>
  - *   <attachStackTrace>true</attachStackTrace>
  - *   <notice>Notice attached to the message (optional)</notice>
  - * </mailet>
  + * &lt;mailet match="All" class="NotifyPostmaster"&gt;
  + *   &lt;sendingAddress&gt;nobounce@localhost&lt;/sendingAddress&gt;
  + *   &lt;attachStackTrace&gt;true&lt;/attachStackTrace&gt;
  + *   &lt;notice&gt;Notice attached to the message (optional)&lt;/notice&gt;
  + * &lt;/mailet&gt;
    *
    */
   public class NotifyPostmaster extends GenericMailet {
  
  
  
  1.13      +5 -5      
jakarta-james/src/java/org/apache/james/transport/mailets/NotifySender.java
  
  Index: NotifySender.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/NotifySender.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- NotifySender.java 14 Jan 2003 13:41:56 -0000      1.12
  +++ NotifySender.java 14 Jan 2003 13:58:21 -0000      1.13
  @@ -35,11 +35,11 @@
    * message.  If you do not specify one, it will use the postmaster's address
    *
    * Sample configuration:
  - * <mailet match="All" class="NotifySender">
  - *   <sendingAddress>nobounce@localhost</sendingAddress>
  - *   <attachStackTrace>true</attachStackTrace>
  - *   <notice>Notice attached to the message (optional)</notice>
  - * </mailet>
  + * &lt;mailet match="All" class="NotifySender">
  + *   &lt;sendingAddress&gt;nobounce@localhost&lt;/sendingAddress&gt;
  + *   &lt;attachStackTrace&gt;true&lt;/attachStackTrace&gt;
  + *   &lt;notice&gt;Notice attached to the message (optional)&lt;/notice&gt;
  + * &lt;/mailet&gt;
    *
    */
   public class NotifySender extends GenericMailet {
  
  
  
  1.7       +1 -1      
jakarta-james/src/java/org/apache/james/transport/mailets/PostmasterAlias.java
  
  Index: PostmasterAlias.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/PostmasterAlias.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PostmasterAlias.java      14 Jan 2003 13:41:56 -0000      1.6
  +++ PostmasterAlias.java      14 Jan 2003 13:58:21 -0000      1.7
  @@ -21,7 +21,7 @@
   /**
    * Rewrites recipient addresses to make sure email for the postmaster is
    * always handled.  This mailet is silently inserted at the top of the root
  - * spool processor.  All recipients mapped to postmaster@<servernames> are
  + * spool processor.  All recipients mapped to postmaster@&lt;servernames&gt; are
    * changed to the postmaster account as specified in the server conf.
    *
    */
  
  
  
  1.8       +2 -2      
jakarta-james/src/java/org/apache/james/transport/mailets/ServerTime.java
  
  Index: ServerTime.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/ServerTime.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ServerTime.java   14 Jan 2003 13:41:56 -0000      1.7
  +++ ServerTime.java   14 Jan 2003 13:58:21 -0000      1.8
  @@ -20,8 +20,8 @@
   
   /**
    * Returns the current time for the mail server.  Sample configuration:
  - * <mailet match="[EMAIL PROTECTED]" class="ServerTime">
  - * </mailet>
  + * &lt;mailet match="[EMAIL PROTECTED]" class="ServerTime"&gt;
  + * &lt;/mailet&gt;
    *
    */
   public class ServerTime extends GenericMailet {
  
  
  
  1.9       +4 -4      
jakarta-james/src/java/org/apache/james/transport/mailets/ToProcessor.java
  
  Index: ToProcessor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/ToProcessor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ToProcessor.java  14 Jan 2003 13:41:56 -0000      1.8
  +++ ToProcessor.java  14 Jan 2003 13:58:21 -0000      1.9
  @@ -17,10 +17,10 @@
    * This mailet redirects the mail to the named processor
    *
    * Sample configuration:
  - * <mailet match="All" class="ToProcessor">
  - *   <processor>spam</processor>
  - *   <notice>Notice attached to the message (optional)</notice>
  - * </mailet>
  + * &lt;mailet match="All" class="ToProcessor"&gt;
  + *   &lt;processor&gt;spam&lt;/processor&gt;
  + *   &lt;notice&gt;Notice attached to the message (optional)&lt;/notice&gt;
  + * &lt;/mailet&gt;
    *
    */
   public class ToProcessor extends GenericMailet {
  
  
  
  1.9       +3 -3      
jakarta-james/src/java/org/apache/james/transport/mailets/UseHeaderRecipients.java
  
  Index: UseHeaderRecipients.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/UseHeaderRecipients.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- UseHeaderRecipients.java  14 Jan 2003 13:41:56 -0000      1.8
  +++ UseHeaderRecipients.java  14 Jan 2003 13:58:21 -0000      1.9
  @@ -34,9 +34,9 @@
    *
    * <p>e.g.</p>
    * <pre>
  - *    <mailet match="RecipientIs=forwarded@myhost"
  - *            class="UseHeaderRecipients">
  - *    </mailet>
  + *    &lt;mailet match="RecipientIs=forwarded@myhost"
  + *            class="UseHeaderRecipients"&gt;
  + *    &lt;/mailet&gt;
    * </pre>
    *
    * @version 1.0.0, 24/11/2000
  
  
  
  1.5       +1 -1      
jakarta-james/src/java/org/apache/james/transport/matchers/FetchedFrom.java
  
  Index: FetchedFrom.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/FetchedFrom.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FetchedFrom.java  14 Jan 2003 13:41:58 -0000      1.4
  +++ FetchedFrom.java  14 Jan 2003 13:58:22 -0000      1.5
  @@ -19,7 +19,7 @@
    * This is used to match all mail fetched from a specific pop account.
    * Once the condition is met the header is stripped from the message to prevent 
looping if the mail is re-inserted into the spool.
    *
  - * $Id$
  + * $version
    */
   
   public class FetchedFrom extends GenericMatcher {
  
  
  
  1.4       +3 -3      
jakarta-james/src/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java
  
  Index: HasHabeasWarrantMark.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HasHabeasWarrantMark.java 14 Jan 2003 13:41:58 -0000      1.3
  +++ HasHabeasWarrantMark.java 14 Jan 2003 13:58:22 -0000      1.4
  @@ -20,9 +20,9 @@
    *
    * Usage: Place this matcher
    *
  - * <mailet match="HasHabeasWarrantMark" class="ToProcessor">
  - *     <processor> transport </processor>
  - * </mailet>
  + * &lt;mailet match="HasHabeasWarrantMark" class="ToProcessor"&gt;
  + *     &lt;processor&gt; transport &lt;/processor&gt;
  + * &lt;/mailet&gt;
    *
    * in the root processs before the DNSRBL block lists (the InSpammerBlacklist 
matcher).
    *
  
  
  
  1.3       +2 -2      
jakarta-james/src/java/org/apache/james/transport/matchers/HasHeader.java
  
  Index: HasHeader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/HasHeader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HasHeader.java    14 Jan 2003 13:41:58 -0000      1.2
  +++ HasHeader.java    14 Jan 2003 13:58:22 -0000      1.3
  @@ -13,12 +13,12 @@
   import java.util.Collection;
   
   /**
  - * use: <mailet match="HasHeader=<header>" class="..." />
  + * use: &lt;mailet match="HasHeader=&lt;header&gt;" class="..." /&gt;
    *
    * This matcher simply checks to see if the header named is present.
    * If complements the AddHeader mailet.
    *
  - * TODO: support lists of headers and values, e.g, match="{<header>[=value]}+"
  + * TODO: support lists of headers and values, e.g, match="{&lt;header&gt;[=value]}+"
    *       [will require a complete rewrite from the current trivial one-liner]
    *
    */
  
  
  
  1.14      +3 -3      
jakarta-james/src/java/org/apache/james/userrepository/UsersFileRepository.java
  
  Index: UsersFileRepository.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/userrepository/UsersFileRepository.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- UsersFileRepository.java  14 Jan 2003 13:42:00 -0000      1.13
  +++ UsersFileRepository.java  14 Jan 2003 13:58:22 -0000      1.14
  @@ -29,9 +29,9 @@
    * Implementation of a Repository to store users on the File System.
    *
    * Requires a configuration element in the .conf.xml file of the form:
  - *  <repository destinationURL="file://path-to-root-dir-for-repository"
  + *  &lt;repository destinationURL="file://path-to-root-dir-for-repository"
    *              type="USERS"
  - *              model="SYNCHRONOUS"/>
  + *              model="SYNCHRONOUS"/&gt;
    * Requires a logger called UsersRepository.
    *
    *
  
  
  
  1.20      +2 -2      
jakarta-james/src/java/org/apache/james/util/mordred/JdbcDataSource.java
  
  Index: JdbcDataSource.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/util/mordred/JdbcDataSource.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- JdbcDataSource.java       14 Jan 2003 13:42:07 -0000      1.19
  +++ JdbcDataSource.java       14 Jan 2003 13:58:22 -0000      1.20
  @@ -25,7 +25,7 @@
   
   /**
    * <p>
  - * This is a <b>reliable</b> DataSource implementation, based on the pooling logic 
written for <a
  + * This is a reliable DataSource implementation, based on the pooling logic written 
for <a
    * href="http://share.whichever.com/";>Town</a> and the configuration found in 
Avalon's excalibur
    * code.
    * </p>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to