Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r7a815b7881b2560fac7061af2227f6f9561ae925 -rff6c2a177e3f332066a0786518de3a7418fa4d6e Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java =================================================================== diff -u -r5e39743e8bd500d0e121cf4c95b9c9fc77eb80fc -rff6c2a177e3f332066a0786518de3a7418fa4d6e --- lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java (.../UniversalLoginModule.java) (revision 5e39743e8bd500d0e121cf4c95b9c9fc77eb80fc) +++ lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java (.../UniversalLoginModule.java) (revision ff6c2a177e3f332066a0786518de3a7418fa4d6e) @@ -216,10 +216,6 @@ isValid = authenticator.authenticate(username, inputPassword); } - } else if (AuthenticationMethodType.WEB_AUTH.equals(type)) { - WebAuthAuthenticator authenticator = new WebAuthAuthenticator(); - isValid = authenticator.authenticate(username, - inputPassword); } else { log.error("===> Unexpected authentication type: " + type); Fisheye: Tag ff6c2a177e3f332066a0786518de3a7418fa4d6e 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 ff6c2a177e3f332066a0786518de3a7418fa4d6e 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 ff6c2a177e3f332066a0786518de3a7418fa4d6e) @@ -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 -rff6c2a177e3f332066a0786518de3a7418fa4d6e --- 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 ff6c2a177e3f332066a0786518de3a7418fa4d6e) @@ -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 */