Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r8758c811649f96eaaeb18ef3de1ab340b2433851 -r1179f02836b1cb2d7e24efed438336006896267a Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java =================================================================== diff -u -r5806f7835e004132c37781df113fa0c879287065 -r1179f02836b1cb2d7e24efed438336006896267a --- lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java (.../UniversalLoginModule.java) (revision 5806f7835e004132c37781df113fa0c879287065) +++ lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java (.../UniversalLoginModule.java) (revision 1179f02836b1cb2d7e24efed438336006896267a) @@ -197,9 +197,6 @@ } else { isValid = authenticator.authenticate(username, inputPassword); } - } else if (AuthenticationMethodType.WEB_AUTH.equals(type)) { - WebAuthAuthenticator authenticator = new WebAuthAuthenticator(); - isValid = authenticator.authenticate(username, inputPassword); } else { UniversalLoginModule.log.error("===> Unexpected authentication type: " + type); return false; Fisheye: Tag 1179f02836b1cb2d7e24efed438336006896267a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/security/WebAuthAuthenticator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1179f02836b1cb2d7e24efed438336006896267a refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/security/WebAuthServlet.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040035.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040035.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040035.sql (revision 1179f02836b1cb2d7e24efed438336006896267a) @@ -0,0 +1,10 @@ +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS = 0; + +-- LDEV-3383: Remove Web authentication method +UPDATE lams_user SET authentication_method_id = 1 WHERE authentication_method_id = 2; +DELETE FROM lams_authentication_method WHERE authentication_method_id = 2; + +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java =================================================================== diff -u -ree6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8 -r1179f02836b1cb2d7e24efed438336006896267a --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java (.../AuthenticationMethod.java) (revision ee6a40ada6ae3bea48ecdedc5cad0ce3e7a3f3d8) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java (.../AuthenticationMethod.java) (revision 1179f02836b1cb2d7e24efed438336006896267a) @@ -34,7 +34,6 @@ public class AuthenticationMethod implements Serializable { public static final Integer DB = 1; - public static final Integer WEBAUTH = 2; public static final Integer LDAP = 3; /** identifier field */