diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/AuthorityGranter.java b/core/src/main/java/org/acegisecurity/providers/jaas/AuthorityGranter.java
index 155b278cf4..c0e18f3cb7 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/AuthorityGranter.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/AuthorityGranter.java
@@ -5,8 +5,9 @@ import java.security.Principal;
 /**
  * Insert comments here...
  * <br>
- * User: raykrueger@users.sourceforge.net<br>
- * Date: Jul 15, 2004<br>
+ *
+ * @author Ray Krueger
+ * @version $Id$
  */
 public interface AuthorityGranter {
     public String grant(Principal principal);
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/JAASAuthenticationCallbackHandler.java b/core/src/main/java/org/acegisecurity/providers/jaas/JAASAuthenticationCallbackHandler.java
index 4a9c40e48c..f8da0609e7 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/JAASAuthenticationCallbackHandler.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/JAASAuthenticationCallbackHandler.java
@@ -2,7 +2,6 @@ package net.sf.acegisecurity.providers.jaas;
 
 import net.sf.acegisecurity.Authentication;
 
-import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import java.io.IOException;
@@ -10,11 +9,13 @@ import java.io.IOException;
 /**
  * Insert comments here...
  * <br>
- * User: raykrueger@users.sourceforge.net<br>
- * Date: Jul 15, 2004<br>
+ *
+ * @author Ray Krueger
+ * @version $Id$
  */
 public interface JAASAuthenticationCallbackHandler {
     void setAuthentication(Authentication auth);
+
     void handle(Callback callback) throws IOException, UnsupportedCallbackException;
 
 }
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/JAASGrantedAuthority.java b/core/src/main/java/org/acegisecurity/providers/jaas/JAASGrantedAuthority.java
index e66f0a538b..16ffb178b2 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/JAASGrantedAuthority.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/JAASGrantedAuthority.java
@@ -7,8 +7,9 @@ import java.security.Principal;
 /**
  * Insert comments here...
  * <br>
- * User: raykrueger@users.sourceforge.net<br>
- * Date: Jul 15, 2004<br>
+ *
+ * @author Ray Krueger
+ * @version $Id$
  */
 public class JAASGrantedAuthority extends GrantedAuthorityImpl {
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/JAASNameCallbackHandler.java b/core/src/main/java/org/acegisecurity/providers/jaas/JAASNameCallbackHandler.java
index 2f179e3ad3..a5488fce9d 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/JAASNameCallbackHandler.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/JAASNameCallbackHandler.java
@@ -1,7 +1,6 @@
 package net.sf.acegisecurity.providers.jaas;
 
 import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.providers.jaas.JAASAuthenticationCallbackHandler;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.NameCallback;
@@ -11,8 +10,9 @@ import java.io.IOException;
 /**
  * Insert comments here...
  * <br>
- * User: raykrueger@users.sourceforge.net<br>
- * Date: Jul 15, 2004<br>
+ *
+ * @author Ray Krueger
+ * @version $Id$
  */
 public class JAASNameCallbackHandler implements JAASAuthenticationCallbackHandler {
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/JAASPasswordCallbackHandler.java b/core/src/main/java/org/acegisecurity/providers/jaas/JAASPasswordCallbackHandler.java
index 1e683bdda9..0ff89124ec 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/JAASPasswordCallbackHandler.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/JAASPasswordCallbackHandler.java
@@ -1,7 +1,6 @@
 package net.sf.acegisecurity.providers.jaas;
 
 import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.providers.jaas.JAASAuthenticationCallbackHandler;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.PasswordCallback;
@@ -11,8 +10,9 @@ import java.io.IOException;
 /**
  * Insert comments here...
  * <br>
- * User: raykrueger@users.sourceforge.net<br>
- * Date: Jul 15, 2004<br>
+ *
+ * @author Ray Krueger
+ * @version $Id$
  */
 public class JAASPasswordCallbackHandler implements JAASAuthenticationCallbackHandler {
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationEvent.java b/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationEvent.java
index d562a23cbf..257d499a8a 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationEvent.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationEvent.java
@@ -6,8 +6,9 @@ import org.springframework.context.ApplicationEvent;
 /**
  * Insert comments here...
  * <br>
- * User: raykrueger@users.sourceforge.net<br>
- * Date: Jul 15, 2004<br>
+ *
+ * @author Ray Krueger
+ * @version $Id$
  */
 public abstract class JAASAuthenticationEvent extends ApplicationEvent {
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationFailedEvent.java b/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationFailedEvent.java
index 4d031ceb01..857c48d596 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationFailedEvent.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationFailedEvent.java
@@ -1,13 +1,13 @@
 package net.sf.acegisecurity.providers.jaas.event;
 
 import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.providers.jaas.event.JAASAuthenticationEvent;
 
 /**
  * Insert comments here...
  * <br>
- * User: raykrueger@users.sourceforge.net<br>
- * Date: Jul 15, 2004<br>
+ *
+ * @author Ray Krueger
+ * @version $Id$
  */
 public class JAASAuthenticationFailedEvent extends JAASAuthenticationEvent {
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationSuccessEvent.java b/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationSuccessEvent.java
index 589bfd09a7..0f4a85f315 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationSuccessEvent.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/event/JAASAuthenticationSuccessEvent.java
@@ -1,13 +1,13 @@
 package net.sf.acegisecurity.providers.jaas.event;
 
 import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.providers.jaas.event.JAASAuthenticationEvent;
 
 /**
  * Insert comments here...
  * <br>
- * User: raykrueger@users.sourceforge.net<br>
- * Date: Jul 15, 2004<br>
+ *
+ * @author Ray Krueger
+ * @version $Id$
  */
 public class JAASAuthenticationSuccessEvent extends JAASAuthenticationEvent {
 
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/JAASAuthenticationProviderTests.java b/core/src/test/java/org/acegisecurity/providers/jaas/JAASAuthenticationProviderTests.java
index 92322ab0cf..44215b4256 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/JAASAuthenticationProviderTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/jaas/JAASAuthenticationProviderTests.java
@@ -14,8 +14,9 @@ import java.util.List;
 /**
  * Insert comments here...
  * <br>
- * User: raykrueger@users.sourceforge.net<br>
- * Date: Jul 16, 2004<br>
+ *
+ * @author Ray Krueger
+ * @version $Id$
  */
 public class JAASAuthenticationProviderTests extends TestCase {
 
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/TestAuthorityGranter.java b/core/src/test/java/org/acegisecurity/providers/jaas/TestAuthorityGranter.java
index a014cd99e3..860ad61604 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/TestAuthorityGranter.java
+++ b/core/src/test/java/org/acegisecurity/providers/jaas/TestAuthorityGranter.java
@@ -1,14 +1,13 @@
 package net.sf.acegisecurity.providers.jaas;
 
-import net.sf.acegisecurity.providers.jaas.AuthorityGranter;
-
 import java.security.Principal;
 
 /**
  * Insert comments here...
  * <br>
- * User: raykrueger@users.sourceforge.net<br>
- * Date: Jul 16, 2004<br>
+ * 
+ * @author Ray Krueger
+ * @version $Id$
  */
 public class TestAuthorityGranter implements AuthorityGranter {
     public String grant(Principal principal) {
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/TestCallbackHandler.java b/core/src/test/java/org/acegisecurity/providers/jaas/TestCallbackHandler.java
index d831b42c2c..199174d77e 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/TestCallbackHandler.java
+++ b/core/src/test/java/org/acegisecurity/providers/jaas/TestCallbackHandler.java
@@ -1,7 +1,6 @@
 package net.sf.acegisecurity.providers.jaas;
 
 import net.sf.acegisecurity.Authentication;
-import net.sf.acegisecurity.providers.jaas.JAASAuthenticationCallbackHandler;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.TextInputCallback;
@@ -11,8 +10,9 @@ import java.io.IOException;
 /**
  * Insert comments here...
  * <br>
- * User: raykrueger@users.sourceforge.net<br>
- * Date: Jul 16, 2004<br>
+ *
+ * @author Ray Krueger
+ * @version $Id$
  */
 public class TestCallbackHandler implements JAASAuthenticationCallbackHandler {
 
diff --git a/core/src/test/java/org/acegisecurity/providers/jaas/TestLoginModule.java b/core/src/test/java/org/acegisecurity/providers/jaas/TestLoginModule.java
index c187b685cf..dfdcdbbc30 100644
--- a/core/src/test/java/org/acegisecurity/providers/jaas/TestLoginModule.java
+++ b/core/src/test/java/org/acegisecurity/providers/jaas/TestLoginModule.java
@@ -10,8 +10,9 @@ import java.util.Map;
 /**
  * Insert comments here...
  * <br>
- * @author raykrueger@users.sourceforge.net<br>
- * Date: Jul 16, 2004<br>
+ *
+ * @author Ray Krueger
+ * @version $Id$
  */
 public class TestLoginModule implements LoginModule {