Index: src/java/org/apache/james/mailrepository/AvalonMailRepository.java
===================================================================
--- src/java/org/apache/james/mailrepository/AvalonMailRepository.java	(revision 448505)
+++ src/java/org/apache/james/mailrepository/AvalonMailRepository.java	(working copy)
@@ -159,7 +159,6 @@
 
     /**
      * @param mc
-     * @param key
      * @throws MessagingException
      * @throws IOException
      */
Index: src/java/org/apache/james/mailrepository/javamail/UIDPlusFolderMailRepository.java
===================================================================
--- src/java/org/apache/james/mailrepository/javamail/UIDPlusFolderMailRepository.java	(revision 448505)
+++ src/java/org/apache/james/mailrepository/javamail/UIDPlusFolderMailRepository.java	(working copy)
@@ -157,7 +157,6 @@
 
     /**
      * lazy loads UidToKeyBidiMap
-     * @return
      */
     protected UidToKeyBidiMap getUidToKeyBidiMap() {
         if (uidToKeyBidiMap == null) {
Index: src/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
===================================================================
--- src/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java	(revision 448505)
+++ src/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java	(working copy)
@@ -346,10 +346,10 @@
      * used by getFolderGateKeeper to get the right FolderInterface implementation
      * 
      * @param folder JavaMail folder
-     * @return 
      * @throws NoSuchMethodException if the Folder is not suitable
      */
     protected  abstract FolderInterface createAdapter(Folder folder) throws NoSuchMethodException;
+    
     /**
      * Lazy-load FolderGateKeeper with inbox folder. Inbox folder is created if
      * not present
Index: src/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java
===================================================================
--- src/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java	(revision 448505)
+++ src/java/org/apache/james/mailrepository/javamail/HashJavamailStoreMailRepository.java	(working copy)
@@ -337,8 +337,6 @@
 
     /**
      * lazy loads KeyToMsgMap
-     * 
-     * @return
      */
     protected KeyToMsgMap getKeyToMsgMap() {
         if (keyToMsgMap == null) {
@@ -445,7 +443,7 @@
          * 
          * @param key
          *            key of message
-         * @param decrease
+         * @param decrement
          *            if true, all message number greater than this are
          *            decremented
          */
Index: src/java/org/apache/james/mailrepository/javamail/FolderGateKeeperImpl.java
===================================================================
--- src/java/org/apache/james/mailrepository/javamail/FolderGateKeeperImpl.java	(revision 448505)
+++ src/java/org/apache/james/mailrepository/javamail/FolderGateKeeperImpl.java	(working copy)
@@ -29,7 +29,7 @@
  * offers access to an underlaying Folder and manages open/close operations.<br>
  * The FolderGateKeeper can be handed over to different threads.
  * 
- * @sse FolderGateKeeper
+ * @see FolderGateKeeper
  *
  */
 public class FolderGateKeeperImpl implements FolderGateKeeper {
Index: src/java/org/apache/james/mailrepository/MBoxMailRepository.java
===================================================================
--- src/java/org/apache/james/mailrepository/MBoxMailRepository.java	(revision 448505)
+++ src/java/org/apache/james/mailrepository/MBoxMailRepository.java	(working copy)
@@ -768,7 +768,6 @@
     /**
      * Not implemented
      * @param key
-     * @return
      */
     public boolean lock(String key) {
         return false;
@@ -777,7 +776,6 @@
     /**
      * Not implemented
      * @param key
-     * @return
      */
     public boolean unlock(String key) {
         return false;
Index: src/java/org/apache/james/services/MailetLoader.java
===================================================================
--- src/java/org/apache/james/services/MailetLoader.java	(revision 448505)
+++ src/java/org/apache/james/services/MailetLoader.java	(working copy)
@@ -37,9 +37,7 @@
      * Get a new Mailet with the specified name acting
      * in the specified context.
      *
-     * @param matchName the name of the mailet to be loaded
-     * @param context the MailetContext to be passed to the new
-     *                mailet
+     * @param mailetName the name of the mailet to be loaded
      * @throws MessagingException if an error occurs
      */
     public Mailet getMailet(String mailetName, Configuration configuration)
Index: src/java/org/apache/james/services/MailServer.java
===================================================================
--- src/java/org/apache/james/services/MailServer.java	(revision 448505)
+++ src/java/org/apache/james/services/MailServer.java	(working copy)
@@ -102,7 +102,7 @@
      * Retrieve the primary mailbox for userName. For POP3 style stores this
      * is their (sole) mailbox.
      *
-     * @param sender - the name of the user
+     * @param userName - the name of the user
      * @return a reference to an initialised mailbox
      */
     MailRepository getUserInbox(String userName);
@@ -118,7 +118,7 @@
      * Adds a new user to the mail system with userName. For POP3 style stores
      * this may only involve adding the user to the UsersStore.
      *
-     * @param sender - the name of the user
+     * @param userName - the name of the user
      * @return a reference to an initialised mailbox
      * 
      * @deprecated addUser should not be considered a property of a MailServer
Index: src/java/org/apache/james/services/MatcherLoader.java
===================================================================
--- src/java/org/apache/james/services/MatcherLoader.java	(revision 448505)
+++ src/java/org/apache/james/services/MatcherLoader.java	(working copy)
@@ -37,8 +37,6 @@
      * in the specified context.
      *
      * @param matchName the name of the matcher to be loaded
-     * @param context the MailetContext to be passed to the new
-     *                matcher
      * @throws MessagingException if an error occurs
      */
     public Matcher getMatcher(String matchName) throws MessagingException;
Index: src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
===================================================================
--- src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java	(revision 448505)
+++ src/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java	(working copy)
@@ -169,7 +169,7 @@
     }
     
     /**
-     * @return
+     * Gets the messages wrapped by this proxy.
      */
     public MimeMessage getWrappedMessage() {
         return refCount.getWrapped();
Index: src/java/org/apache/james/core/MailImpl.java
===================================================================
--- src/java/org/apache/james/core/MailImpl.java	(revision 448505)
+++ src/java/org/apache/james/core/MailImpl.java	(working copy)
@@ -563,7 +563,6 @@
      * explicitly with retriving Mail attributes as a Serializable
      * Note: This method is not exposed in the Mail interface,
      * it is for internal use by James only.
-     * @return Serializable of the entire attributes collection
      * @since 2.2.0
      **/
     public void setAttributesRaw (HashMap attr)
Index: src/java/org/apache/james/core/MailHeaders.java
===================================================================
--- src/java/org/apache/james/core/MailHeaders.java	(revision 448505)
+++ src/java/org/apache/james/core/MailHeaders.java	(working copy)
@@ -66,7 +66,7 @@
     /**
      * Write the headers to an output stream
      *
-     * @param writer the stream to which to write the headers
+     * @param out the stream to which to write the headers
      */
     public void writeTo(OutputStream out) {
         PrintStream pout;
Index: src/java/org/apache/james/core/MailetConfigImpl.java
===================================================================
--- src/java/org/apache/james/core/MailetConfigImpl.java	(revision 448505)
+++ src/java/org/apache/james/core/MailetConfigImpl.java	(working copy)
@@ -136,9 +136,7 @@
     }
 
     /**
-     * Get the mailet's Avalon Configuration object.
-     *
-     * @return the Configuration for the mailet
+     * Sets the mailet's Avalon Configuration object.
      */
     public void setMailetContext(MailetContext newContext) {
         mailetContext = newContext;
Index: src/java/org/apache/james/core/MimeMessageUtil.java
===================================================================
--- src/java/org/apache/james/core/MimeMessageUtil.java	(revision 448505)
+++ src/java/org/apache/james/core/MimeMessageUtil.java	(working copy)
@@ -189,11 +189,6 @@
 
     /**
      * Write the message headers to the given outputstream
-     * 
-     * @param message
-     * @param headerOs
-     * @param ignoreList
-     * @throws MessagingException
      */
     public static void writeHeadersTo(Enumeration headers, OutputStream headerOs) throws MessagingException {
         PrintWriter hos = new InternetPrintWriter(new BufferedWriter(new OutputStreamWriter(headerOs), 512), true);
@@ -208,7 +203,6 @@
     /**
      * @param message
      * @param ignoreList
-     * @return
      * @throws MessagingException
      */
     public static InputStream getHeadersInputStream(MimeMessage message, String[] ignoreList) throws MessagingException {
Index: src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java
===================================================================
--- src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java	(revision 448505)
+++ src/java/org/apache/james/transport/matchers/GenericRegexMatcher.java	(working copy)
@@ -41,7 +41,6 @@
  * could subclass match(), and call it as necessary during message
  * processing (e.g., if a file of expressions changed). 
  *
- * @
  */
 
 abstract public class GenericRegexMatcher extends GenericMatcher {
Index: src/java/org/apache/james/transport/mailets/DSNBounce.java
===================================================================
--- src/java/org/apache/james/transport/mailets/DSNBounce.java	(revision 448505)
+++ src/java/org/apache/james/transport/mailets/DSNBounce.java	(working copy)
@@ -449,7 +449,8 @@
      * This method should use the status attribute when the
      * SMTP-handler somewhen provides it
      *
-     * @param MessagingException
+     * @param me exception from which the status code will 
+     * be guessed
      * @return status code
      */
     protected String getStatus(MessagingException me) {
@@ -547,7 +548,7 @@
 
     /**
      * Utility method for getting the error message from the (nested) exception.
-     * @param MessagingException
+     * @param me the exception from which the message should be extracted
      * @return error message
      */
     protected String getErrorMsg(MessagingException me) {
Index: src/java/org/apache/james/transport/mailets/LogMessage.java
===================================================================
--- src/java/org/apache/james/transport/mailets/LogMessage.java	(revision 448505)
+++ src/java/org/apache/james/transport/mailets/LogMessage.java	(working copy)
@@ -69,7 +69,7 @@
     /**
      * Log a particular message
      *
-     * @param mail the mail to process
+     * @param genericmail the mail to process
      */
     public void service(Mail genericmail) {
         MailImpl mail = (MailImpl)genericmail;
Index: src/java/org/apache/james/transport/mailets/smime/Sign.java
===================================================================
--- src/java/org/apache/james/transport/mailets/smime/Sign.java	(revision 448505)
+++ src/java/org/apache/james/transport/mailets/smime/Sign.java	(working copy)
@@ -37,9 +37,9 @@
  * 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>The kind of signuture depends on the value of the &lt;keyHolderClass&gt; init parameter.
+ *<p>The kind of signature depends on the value of the &lt;keyHolderClass&gt; init parameter.
  *
- *  <P>Handles the following init parameters (will comment only the differences from {@link SMIMEAbstractSign}):</P>
+ *  <P>Handles the following init parameters (will comment only the differences from {@link AbstractSign}):</P>
  * <ul>
  * <li>&lt;keyHolderClass&gt;: Sets the class of the KeyHolder object that will handle the cryptography functions,
  * for example org.apache.james.security.SMIMEKeyHolder for SMIME.</li>
Index: src/java/org/apache/james/transport/mailets/smime/AbstractSign.java
===================================================================
--- src/java/org/apache/james/transport/mailets/smime/AbstractSign.java	(revision 448505)
+++ src/java/org/apache/james/transport/mailets/smime/AbstractSign.java	(working copy)
@@ -204,7 +204,7 @@
     
     /**
      * Setter for property keyHolderClass.
-     * @param signerName New value of property keyHolderClass.
+     * @param keyHolderClass New value of property keyHolderClass.
      */
     public void setKeyHolderClass(Class keyHolderClass) {
         this.keyHolderClass = keyHolderClass;
Index: src/java/org/apache/james/transport/mailets/smime/SMIMESign.java
===================================================================
--- src/java/org/apache/james/transport/mailets/smime/SMIMESign.java	(revision 448505)
+++ src/java/org/apache/james/transport/mailets/smime/SMIMESign.java	(working copy)
@@ -35,7 +35,7 @@
  * It is a concrete subclass of {@link Sign}, with very few modifications to it,
  * to specialize for SMIME.</p>
  *
- *  <P>Handles the following init parameters (will comment only the differences from {@link SMIMEAbstractSign}):</P>
+ *  <P>Handles the following init parameters (will comment only the differences from {@link Sign}):</P>
  * <ul>
  * <li>&lt;debug&gt;.</li>
  * <li>&lt;keyStoreFileName&gt;.</li>
Index: src/java/org/apache/james/transport/mailets/FromRepository.java
===================================================================
--- src/java/org/apache/james/transport/mailets/FromRepository.java	(revision 448505)
+++ src/java/org/apache/james/transport/mailets/FromRepository.java	(working copy)
@@ -99,7 +99,7 @@
     /**
      * Spool mail from a particular repository.
      *
-     * @param triggering e-mail (eventually parameterize via the
+     * @param trigger e-mail (eventually parameterize via the
      * trigger message)
      */
     public void service(Mail trigger) throws MessagingException {
Index: src/java/org/apache/james/fetchmail/MessageProcessor.java
===================================================================
--- src/java/org/apache/james/fetchmail/MessageProcessor.java	(revision 448505)
+++ src/java/org/apache/james/fetchmail/MessageProcessor.java	(working copy)
@@ -509,7 +509,7 @@
     
     /**
      * Method rejectMaxMessageSizeExceeded.
-     * @param message size
+     * @param messageSize size
      * @throws MessagingException
      */
     protected void rejectMaxMessageSizeExceeded(int messageSize)
@@ -1352,7 +1352,7 @@
 
     /**
      * Adds any  required error messages to a <code>Mail</code>. 
-     * @param aMail a Mail instance
+     * @param mail a Mail instance
      */
     protected void addErrorMessages(Mail mail) throws MessagingException
     {
Index: src/java/org/apache/james/security/SMIMEKeyHolder.java
===================================================================
--- src/java/org/apache/james/security/SMIMEKeyHolder.java	(revision 448505)
+++ src/java/org/apache/james/security/SMIMEKeyHolder.java	(working copy)
@@ -281,7 +281,7 @@
      * Extracts the signer <I>email address</I> (EMAILADDRESS=) from an <CODE>X509Certificate</CODE> <I>distinguished name</I>.
      * @param certificate The certificate to extract the information from.
      * @return The requested information.
-     * @see getSignerDistinguishedName(X509Certificate)
+     * @see #getSignerDistinguishedName(X509Certificate)
      */    
     public static String getSignerAddress(X509Certificate certificate) {
         
@@ -292,7 +292,7 @@
     /**
      * Getter for property signerDistinguishedName.
      * @return Value of property signerDistinguishedName.
-     * @see getSignerDistinguishedName(X509Certificate)
+     * @see #getSignerDistinguishedName(X509Certificate)
      */
     public String getSignerDistinguishedName() {
         return getSignerDistinguishedName(getCertificate());
@@ -301,7 +301,7 @@
     /**
      * Getter for property signerCN.
      * @return Value of property signerCN.
-     * @see getSignerCN(X509Certificate)
+     * @see #getSignerCN(X509Certificate)
      */
     public String getSignerCN() {
         return getSignerCN(getCertificate());
@@ -310,7 +310,7 @@
      /**
      * Getter for property signerAddress.
      * @return Value of property signerMailAddress.
-     * @see getSignerAddress(X509Certificate)
+     * @see #getSignerAddress(X509Certificate)
      */
     public String getSignerAddress() {
         return getSignerAddress(getCertificate());
Index: src/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java
===================================================================
--- src/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java	(revision 448505)
+++ src/java/org/apache/james/smtpserver/core/filter/fastfail/GreylistHandler.java	(working copy)
@@ -267,7 +267,7 @@
      * Setup the autowhitelist lifetime for which we should whitelist a triplet.
      * After this lifetime the record will be deleted
      * 
-     * @param autoWhiteListTime
+     * @param autoWhiteListLifeTime
      *            The lifeTime 
      */
     public void setAutoWhiteListLifeTime(String autoWhiteListLifeTime) {
Index: src/java/org/apache/james/smtpserver/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java
===================================================================
--- src/java/org/apache/james/smtpserver/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java	(revision 448505)
+++ src/java/org/apache/james/smtpserver/core/filter/fastfail/ReverseEqualsEhloHeloHandler.java	(working copy)
@@ -85,7 +85,7 @@
     /**
      * Set to true if Auth users should be included in the EHLO/HELO check
      * 
-     * @param checkAuthNetworks
+     * @param checkAuthUsers
      *            Set to true to enable
      */
     public void setCheckAuthUsers(boolean checkAuthUsers) {
Index: src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
===================================================================
--- src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java	(revision 448505)
+++ src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java	(working copy)
@@ -88,7 +88,7 @@
     /**
      * Set to true if Auth users should be included in the EHLO/HELO check
      * 
-     * @param checkAuthNetworks
+     * @param checkAuthUsers
      *            Set to true to enable
      */
     public void setCheckAuthUsers(boolean checkAuthUsers) {
Index: src/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractVirtualUserTableHandler.java
===================================================================
--- src/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractVirtualUserTableHandler.java	(revision 448505)
+++ src/java/org/apache/james/smtpserver/core/filter/fastfail/AbstractVirtualUserTableHandler.java	(working copy)
@@ -117,7 +117,7 @@
      * if no mapping should be performed. Multiple recipients may be specified by delineating
      * the mapped string with commas, semi-colons or colons.
      * 
-     * @param recipientsMap the mapping of virtual to real recipients, as 
+     * @param recipient the mapping of virtual to real recipients, as 
      *    <code>MailAddress</code>es to <code>String</code>s.
      */
     protected abstract String mapRecipients(MailAddress recipient);
Index: src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java
===================================================================
--- src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java	(revision 448505)
+++ src/java/org/apache/james/smtpserver/core/filter/fastfail/ValidRcptHandler.java	(working copy)
@@ -92,7 +92,7 @@
     /**
      * Set the domains for which every rcpt will be accepted. 
      * 
-     * @param recip The valid domains. Commaseperated list
+     * @param dom The valid domains. Comma seperated list
      */
     public void setValidDomains(String dom) {
         StringTokenizer st = new StringTokenizer(dom, ", ", false);
Index: src/java/org/apache/james/smtpserver/core/POP3BeforeSMTPHandler.java
===================================================================
--- src/java/org/apache/james/smtpserver/core/POP3BeforeSMTPHandler.java	(revision 448505)
+++ src/java/org/apache/james/smtpserver/core/POP3BeforeSMTPHandler.java	(working copy)
@@ -58,7 +58,7 @@
     /**
      * Set the time after which an ipAddresses should be handled as expired
      * 
-     * @param expireTime
+     * @param rawExpireTime
      *            The time
      */
     public void setExpireTime(String rawExpireTime) {
Index: src/java/org/apache/james/smtpserver/SMTPSession.java
===================================================================
--- src/java/org/apache/james/smtpserver/SMTPSession.java	(revision 448505)
+++ src/java/org/apache/james/smtpserver/SMTPSession.java	(working copy)
@@ -201,7 +201,7 @@
     /**
      * Sets the user name associated with this SMTP interaction.
      *
-     * @param userID the user name
+     * @param user the user name
      */
     void setUser(String user);
 
Index: src/java/org/apache/james/util/JDBCBayesianAnalyzer.java
===================================================================
--- src/java/org/apache/james/util/JDBCBayesianAnalyzer.java	(revision 448505)
+++ src/java/org/apache/james/util/JDBCBayesianAnalyzer.java	(working copy)
@@ -358,8 +358,7 @@
      * Initializes the sql query environment from the SqlResources file.
      * Will look for conf/sqlResources.xml.
      * @param conn The connection for accessing the database
-     * @param mailetContext The current mailet context,
-     * for finding the conf/sqlResources.xml file
+     * @param file Name of the file containing the string definitions
      * @throws Exception If any error occurs
      */
     public void initSqlQueries(Connection conn, String file) throws Exception {
Index: src/java/org/apache/james/util/XMLResources.java
===================================================================
--- src/java/org/apache/james/util/XMLResources.java	(revision 448505)
+++ src/java/org/apache/james/util/XMLResources.java	(working copy)
@@ -361,7 +361,7 @@
     /**
      * Returns a named string, replacing parameters with the values set.
      * 
-     * @param name          the name of the String resource required.
+     * @param str          the name of the String resource required.
      * @param parameters    a map of parameters (name-value string pairs) which are
      *                      replaced where found in the input strings
      * @return the requested resource
Index: src/java/org/apache/james/userrepository/AbstractUsersRepository.java
===================================================================
--- src/java/org/apache/james/userrepository/AbstractUsersRepository.java	(revision 448505)
+++ src/java/org/apache/james/userrepository/AbstractUsersRepository.java	(working copy)
@@ -185,7 +185,7 @@
     /**
      * Removes a user from the repository
      *
-     * @param user the user to be removed
+     * @param name the user to be removed
      */
     public void removeUser(String name) {
         User user = getUserByName(name);
