git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
security
/
impl
/
src
/
main
/
java
/
org
/
wamblee
/
security
/
authentication
/
UserAdminInitializer.java
diff --git
a/security/impl/src/main/java/org/wamblee/security/authentication/UserAdminInitializer.java
b/security/impl/src/main/java/org/wamblee/security/authentication/UserAdminInitializer.java
index 2168d891c1522b8bb58b6043b4f7f20258f0149e..3c33319aa58ee3915d65efe80274dc466dfac85d 100644
(file)
--- a/
security/impl/src/main/java/org/wamblee/security/authentication/UserAdminInitializer.java
+++ b/
security/impl/src/main/java/org/wamblee/security/authentication/UserAdminInitializer.java
@@
-17,8
+17,6
@@
package org.wamblee.security.authentication;
import org.apache.log4j.Logger;
import org.apache.log4j.Logger;
-import java.security.NoSuchAlgorithmException;
-
/**
* User administration initializer. It populates the user administration with a
* number of groups and users but only in case no users exist.
/**
* User administration initializer. It populates the user administration with a
* number of groups and users but only in case no users exist.
@@
-34,8
+32,7
@@
public class UserAdminInitializer {
*
*/
public UserAdminInitializer(UserAdministration aAdmin, String[] aUsers,
*
*/
public UserAdminInitializer(UserAdministration aAdmin, String[] aUsers,
- String[] aGroups, String[] aPasswords) throws UserMgtException,
- NoSuchAlgorithmException {
+ String[] aGroups, String[] aPasswords) throws UserMgtException {
if ((aUsers.length != aGroups.length) ||
(aUsers.length != aPasswords.length)) {
throw new IllegalArgumentException(
if ((aUsers.length != aGroups.length) ||
(aUsers.length != aPasswords.length)) {
throw new IllegalArgumentException(
@@
-71,20
+68,16
@@
public class UserAdminInitializer {
String group = aGroups[i];
String password = aPasswords[i];
String group = aGroups[i];
String password = aPasswords[i];
- if (aAdmin.getUser(user) == null) {
- // must create user.
- Group groupObj = aAdmin.getGroup(group);
-
- if (groupObj == null) {
+ if (!aAdmin.checkUser(user)) {
+ if (!(aAdmin.checkGroup(group))) {
// must create group
LOGGER.info("Creating group: " + group);
// must create group
LOGGER.info("Creating group: " + group);
-
groupObj =
aAdmin.createGroup(group);
+ aAdmin.createGroup(group);
}
}
- assert groupObj != null;
-
LOGGER
.info("Creating user: " + user + " password: " + password);
LOGGER
.info("Creating user: " + user + " password: " + password);
- aAdmin.createUser(user, password, groupObj);
+ aAdmin.createUser(user, password);
+ aAdmin.addUserToGroup(user, group);
}
}
}
}
}
}