diff --git a/ccm-core/src/com/arsdigita/kernel/security/AccountException.java b/ccm-core/src/com/arsdigita/kernel/security/AccountException.java
index 57afe7c91..646e9bd9b 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/AccountException.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/AccountException.java
@@ -23,10 +23,10 @@ package com.arsdigita.kernel.security;
  * login.  Subclasses define particular errors.
  *
  * @author Sameer Ajmani
+ * @version $Id: AccountException.java 287 2005-02-22 00:29:02Z sskracic $
  **/
 public class AccountException extends KernelLoginException {
 
-    public static final String versionId = "$Id: AccountException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     public AccountException() {
         super();
     }
diff --git a/ccm-core/src/com/arsdigita/kernel/security/AccountExpiredException.java b/ccm-core/src/com/arsdigita/kernel/security/AccountExpiredException.java
index 85ec8afb7..9ca064ec8 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/AccountExpiredException.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/AccountExpiredException.java
@@ -22,10 +22,10 @@ package com.arsdigita.kernel.security;
  * Thrown when an account is accessed while expired.
  *
  * @author Sameer Ajmani
+ * @version $Id: AccountExpiredException.java 287 2005-02-22 00:29:02Z sskracic $
  **/
 public class AccountExpiredException extends AccountException {
 
-    public static final String versionId = "$Id: AccountExpiredException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     public AccountExpiredException() {
         super();
     }
diff --git a/ccm-core/src/com/arsdigita/kernel/security/AccountLockedException.java b/ccm-core/src/com/arsdigita/kernel/security/AccountLockedException.java
index c472732ca..f97def72b 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/AccountLockedException.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/AccountLockedException.java
@@ -22,10 +22,10 @@ package com.arsdigita.kernel.security;
  * Thrown when an account is accessed while locked.
  *
  * @author Sameer Ajmani
- **/
+ * @version $Id: AccountLockedException.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class AccountLockedException extends AccountException {
 
-    public static final String versionId = "$Id: AccountLockedException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     public AccountLockedException() {
         super();
     }
diff --git a/ccm-core/src/com/arsdigita/kernel/security/AdminLoginModule.java b/ccm-core/src/com/arsdigita/kernel/security/AdminLoginModule.java
index 3f1c969ae..8f8c693f8 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/AdminLoginModule.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/AdminLoginModule.java
@@ -38,10 +38,10 @@ import org.apache.log4j.Logger;
  * @author Sameer Ajmani
  *
  * @see UserContext#login(com.arsdigita.kernel.User)
- **/
+ * @version $Id: AdminLoginModule.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class AdminLoginModule implements LoginModule {
 
-    public static final String versionId = "$Id: AdminLoginModule.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     private static final Logger s_log =
         Logger.getLogger(AdminLoginModule.class.getName());
 
diff --git a/ccm-core/src/com/arsdigita/kernel/security/CookieLoginModule.java b/ccm-core/src/com/arsdigita/kernel/security/CookieLoginModule.java
index a4a6eb323..bbe28382b 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/CookieLoginModule.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/CookieLoginModule.java
@@ -24,10 +24,10 @@ import org.apache.log4j.Logger;
  * Logs in a user if the user has a valid authentication cookie.
  *
  * @author Sameer Ajmani
- **/
+ * @version $Id: CookieLoginModule.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class CookieLoginModule extends UserLoginModule {
 
-    public static final String versionId = "$Id: CookieLoginModule.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     private static final Logger s_log =
         Logger.getLogger(CookieLoginModule.class.getName());
 
diff --git a/ccm-core/src/com/arsdigita/kernel/security/CredentialEncodingException.java b/ccm-core/src/com/arsdigita/kernel/security/CredentialEncodingException.java
index 5dd3cd2d3..e103865a5 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/CredentialEncodingException.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/CredentialEncodingException.java
@@ -22,10 +22,10 @@ package com.arsdigita.kernel.security;
  * Thrown when there is an error encoding a credential.
  *
  * @author Sameer Ajmani
- **/
+ * @version $Id: CredentialEncodingException.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class CredentialEncodingException extends CredentialException {
 
-    public static final String versionId = "$Id: CredentialEncodingException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     public CredentialEncodingException() {
         super();
     }
diff --git a/ccm-core/src/com/arsdigita/kernel/security/CredentialException.java b/ccm-core/src/com/arsdigita/kernel/security/CredentialException.java
index 70dc72c4b..086026fb3 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/CredentialException.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/CredentialException.java
@@ -23,10 +23,10 @@ package com.arsdigita.kernel.security;
  * credential during login.  Subclasses define particular errors.
  *
  * @author Sameer Ajmani
- **/
+ * @version $Id: CredentialException.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class CredentialException extends KernelLoginException {
 
-    public static final String versionId = "$Id: CredentialException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     public CredentialException() {
         super();
     }
diff --git a/ccm-core/src/com/arsdigita/kernel/security/CredentialExpiredException.java b/ccm-core/src/com/arsdigita/kernel/security/CredentialExpiredException.java
index 8c22be03a..5b34e2f86 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/CredentialExpiredException.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/CredentialExpiredException.java
@@ -22,10 +22,10 @@ package com.arsdigita.kernel.security;
  * Thrown when a credential has expired.
  *
  * @author Sameer Ajmani
+ * @version $Id: CredentialExpiredException.java 287 2005-02-22 00:29:02Z sskracic $
  **/
 public class CredentialExpiredException extends CredentialException {
 
-    public static final String versionId = "$Id: CredentialExpiredException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     public CredentialExpiredException() {
         super();
     }
diff --git a/ccm-core/src/com/arsdigita/kernel/security/CredentialLoginModule.java b/ccm-core/src/com/arsdigita/kernel/security/CredentialLoginModule.java
index 4d3392bb2..aa6cdc80a 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/CredentialLoginModule.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/CredentialLoginModule.java
@@ -50,10 +50,10 @@ import com.arsdigita.kernel.Kernel;
  * @see CredentialManager
  *
  * @author Sameer Ajmani
- **/
+ * @version $Id: CredentialLoginModule.java 718 2005-08-18 15:34:42Z apevec $
+ */
 public abstract class CredentialLoginModule implements LoginModule {
 
-    public static final String versionId = "$Id: CredentialLoginModule.java 718 2005-08-18 15:34:42Z apevec $ by $Author: apevec $, $DateTime: 2004/08/16 18:10:38 $";
     private static final Logger s_log =
         Logger.getLogger(CredentialLoginModule.class.getName());
 
diff --git a/ccm-core/src/com/arsdigita/kernel/security/CredentialManager.java b/ccm-core/src/com/arsdigita/kernel/security/CredentialManager.java
index 68f316606..8810f841f 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/CredentialManager.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/CredentialManager.java
@@ -33,26 +33,27 @@ import org.apache.log4j.Logger;
  * @see CredentialLoginModule
  *
  * @author Sameer Ajmani
- **/
+ * @version $Id: CredentialManager.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public abstract class CredentialManager {
 
-    public static final String versionId = "$Id: CredentialManager.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
+    /** Logging instance */
     private static final Logger s_log =
         Logger.getLogger(URLManager.class.getName());
 
-    // the login module associated with this manager
+    /** The login module associated with this manager  */
     private CredentialLoginModule m_module;
 
     /**
      * Constructs a new <code>CredentialManager</code>.
-     **/
+     */
     protected CredentialManager() {
     }
 
     /**
      * Returns the <code>CredentialLoginModule</code> associated with this
      * <code>CredentialManager</code>.
-     **/
+     */
     protected CredentialLoginModule getModule() {
         return m_module;
     }
@@ -63,7 +64,7 @@ public abstract class CredentialManager {
      *
      * @param module the <code>CredentialLoginModule</code> associated with
      * this <code>CredentialManager</code>.
-     **/
+     */
     protected void initialize(CredentialLoginModule module,
                               Subject subject,
                               CallbackHandler handler,
@@ -81,7 +82,7 @@ public abstract class CredentialManager {
      * @throws CredentialNotFoundException if credential does not exist.
      *
      * @throws LoginException if an error occurs.
-     **/
+     */
     protected abstract String getValue()
         throws LoginException;
 
@@ -93,7 +94,7 @@ public abstract class CredentialManager {
      * @return true if <code>setValue()</code> should be called
      *
      * @throws LoginException if an error occurs.
-     **/
+     */
     protected abstract boolean shouldSetValue(String value)
         throws LoginException;
 
@@ -104,7 +105,7 @@ public abstract class CredentialManager {
      * @param value the new value for the credential
      *
      * @throws LoginException if an error occurs.
-     **/
+     */
     protected abstract void setValue(String value)
         throws LoginException;
 
@@ -113,7 +114,7 @@ public abstract class CredentialManager {
      * <code>getModule().getCredentialName()</code>.
      *
      * @throws LoginException if an error occurs.
-     **/
+     */
     protected abstract void deleteValue()
         throws LoginException;
 }
diff --git a/ccm-core/src/com/arsdigita/kernel/security/CredentialNotFoundException.java b/ccm-core/src/com/arsdigita/kernel/security/CredentialNotFoundException.java
index a562a0370..23b0cba4a 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/CredentialNotFoundException.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/CredentialNotFoundException.java
@@ -22,10 +22,10 @@ package com.arsdigita.kernel.security;
  * Thrown when a credential is not found.
  *
  * @author Sameer Ajmani
- **/
+ * @version $Id: CredentialNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class CredentialNotFoundException extends CredentialException {
 
-    public static final String versionId = "$Id: CredentialNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     public CredentialNotFoundException() {
         super();
     }
diff --git a/ccm-core/src/com/arsdigita/kernel/security/CredentialNotYetValidException.java b/ccm-core/src/com/arsdigita/kernel/security/CredentialNotYetValidException.java
index 2fa909960..0b2565062 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/CredentialNotYetValidException.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/CredentialNotYetValidException.java
@@ -22,10 +22,10 @@ package com.arsdigita.kernel.security;
  * Thrown when a credential is not yet valid.
  *
  * @author Sameer Ajmani
- **/
+ * @version $Id: CredentialNotYetValidException.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class CredentialNotYetValidException extends CredentialException {
 
-    public static final String versionId = "$Id: CredentialNotYetValidException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     public CredentialNotYetValidException() {
         super();
     }
diff --git a/ccm-core/src/com/arsdigita/kernel/security/CredentialParsingException.java b/ccm-core/src/com/arsdigita/kernel/security/CredentialParsingException.java
index 71411b86b..9c6c2fb66 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/CredentialParsingException.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/CredentialParsingException.java
@@ -22,10 +22,10 @@ package com.arsdigita.kernel.security;
  * Thrown when there is an error parsing a credential.
  *
  * @author Sameer Ajmani
- **/
+ * @version $Id: CredentialParsingException.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class CredentialParsingException extends CredentialException {
 
-    public static final String versionId = "$Id: CredentialParsingException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
     public CredentialParsingException() {
         super();
     }
diff --git a/ccm-core/src/com/arsdigita/kernel/security/DefaultSecurityHelper.java b/ccm-core/src/com/arsdigita/kernel/security/DefaultSecurityHelper.java
index ddef34c84..d903e0d9d 100755
--- a/ccm-core/src/com/arsdigita/kernel/security/DefaultSecurityHelper.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/DefaultSecurityHelper.java
@@ -26,10 +26,10 @@ import javax.servlet.http.HttpServletRequest;
  *
  * @author Sameer Ajmani
  * @see SecurityHelper
- **/
+ * @version $Id: DefaultSecurityHelper.java 709 2005-08-17 10:03:23Z apevec $
+ */
 public class DefaultSecurityHelper implements SecurityHelper {
 
-    public static final String versionId = "$Id: DefaultSecurityHelper.java 709 2005-08-17 10:03:23Z apevec $ by $Author: apevec $, $DateTime: 2004/08/16 18:10:38 $";
     /**
      * Determines whether the request is secure by calling
      * <code>req.isSecure()</code>.