Update of
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
In directory james.mmbase.org:/tmp/cvs-serv25363/cloudcontext
Modified Files:
Tag: MMBase-1_8
Authenticate.java
Added Files:
UserProvider.java
Removed Files:
Provider.java
Log Message:
renamed Provider to UserProvider
See also:
http://cvs.mmbase.org/viewcvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext
UserProvider.java is new
Index: Authenticate.java
===================================================================
RCS file:
/var/cvs/applications/cloudcontext/src/org/mmbase/security/implementation/cloudcontext/Authenticate.java,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -b -r1.17.2.1 -r1.17.2.2
--- Authenticate.java 8 Dec 2008 16:31:46 -0000 1.17.2.1
+++ Authenticate.java 22 Dec 2008 15:27:04 -0000 1.17.2.2
@@ -31,7 +31,7 @@
* @author Eduard Witteveen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: Authenticate.java,v 1.17.2.1 2008/12/08 16:31:46 michiel Exp $
+ * @version $Id: Authenticate.java,v 1.17.2.2 2008/12/22 15:27:04 michiel Exp $
*/
public class Authenticate extends Authentication {
private static final Logger log =
Logging.getLoggerInstance(Authenticate.class);
@@ -64,24 +64,19 @@
return (Authenticate)
MMBase.getMMBase().getMMBaseCop().getAuthentication();
}
- public Provider getUserProvider() {
+ public UserProvider getUserProvider() {
return Users.getBuilder();
}
// javadoc inherited
protected void load() throws SecurityException {
- Provider users = getUserProvider();
+ UserProvider users = getUserProvider();
if (users == null) {
String msg = "builders for security not installed, if you are
trying to install the application belonging to this security, please restart
the application after all data has been imported)";
log.fatal(msg);
throw new SecurityException(msg);
}
- if (!users.check()) {
- String msg = "builder mmbaseusers was not configured correctly";
- log.error(msg);
- throw new SecurityException(msg);
- }
ResourceWatcher adminsWatcher = new
ResourceWatcher(MMBaseCopConfig.securityLoader) {
public void onChange(String res) {
@@ -104,13 +99,13 @@
log.trace("login-module: '" + s + "'");
}
MMObjectNode node = null;
- Provider users = getUserProvider();
+ UserProvider users = getUserProvider();
if (users == null) {
String msg = "builders for security not installed, if you are
trying to install the application belonging to this security, please restart
the application after all data has been imported)";
log.fatal(msg);
throw new SecurityException(msg);
}
- allowEncodedPassword = users.allowEncodedPassword();
+ allowEncodedPassword =
org.mmbase.util.Casting.toBoolean(users.getUserBuilder().getInitParameter("allowencodedpassword"));
if ("anonymous".equals(s)) {
node = users.getAnonymousUser();
if (node == null) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
