X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.spring%2Fsrc%2Forg%2Fargeo%2Fslc%2Fspring%2Fauth%2FSimpleRoleRegistration.java;fp=org.argeo.slc.spring%2Fsrc%2Forg%2Fargeo%2Fslc%2Fspring%2Fauth%2FSimpleRoleRegistration.java;h=0000000000000000000000000000000000000000;hb=ecc22e604e47533c79de9cecdcdeacbc752cbff1;hp=44b7b79af6cce471be0a445d5773edf944841b05;hpb=e07ded4632e53f8b8869763bc1f1f4091361e76e;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/SimpleRoleRegistration.java b/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/SimpleRoleRegistration.java
deleted file mode 100644
index 44b7b79af..000000000
--- a/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/SimpleRoleRegistration.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.argeo.slc.spring.auth;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.InvalidNameException;
-import javax.naming.ldap.LdapName;
-import javax.transaction.UserTransaction;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.SlcException;
-import org.osgi.service.useradmin.Role;
-import org.osgi.service.useradmin.UserAdmin;
-
-/**
- * Register one or many roles via a user admin service. Does nothing if the role
- * is already registered.
- */
-public class SimpleRoleRegistration implements Runnable {
-	private final static Log log = LogFactory
-			.getLog(SimpleRoleRegistration.class);
-
-	private String role;
-	private List<String> roles = new ArrayList<String>();
-	private UserAdmin userAdmin;
-	private UserTransaction userTransaction;
-
-	@Override
-	public void run() {
-		try {
-			userTransaction.begin();
-			if (role != null && !roleExists(role))
-				newRole(toDn(role));
-
-			for (String r : roles)
-				if (!roleExists(r))
-					newRole(toDn(r));
-			userTransaction.commit();
-		} catch (Exception e) {
-			try {
-				userTransaction.rollback();
-			} catch (Exception e1) {
-				log.error("Cannot rollback", e1);
-			}
-			throw new SlcException("Cannot add roles", e);
-		}
-	}
-
-	private boolean roleExists(String role) {
-		return userAdmin.getRole(toDn(role).toString()) != null;
-	}
-
-	protected void newRole(LdapName r) {
-		userAdmin.createRole(r.toString(), Role.GROUP);
-		log.info("Added role " + r + " required by application.");
-	}
-
-	public void register(UserAdmin userAdminService, Map<?, ?> properties) {
-		this.userAdmin = userAdminService;
-		run();
-	}
-
-	protected LdapName toDn(String name) {
-		try {
-			return new LdapName("cn=" + name + ",ou=roles,ou=node");
-		} catch (InvalidNameException e) {
-			throw new SlcException("Badly formatted role name " + name, e);
-		}
-	}
-
-	public void setRole(String role) {
-		this.role = role;
-	}
-
-	public void setRoles(List<String> roles) {
-		this.roles = roles;
-	}
-
-	public void setUserAdmin(UserAdmin userAdminService) {
-		this.userAdmin = userAdminService;
-	}
-
-	public void setUserTransaction(UserTransaction userTransaction) {
-		this.userTransaction = userTransaction;
-	}
-
-}