X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsUserAdmin.java;h=9364ee4a3069bfdfcf905d41ae74ecc21172180b;hb=eb4cc3db3bf141c229f0f7ff929daff108bee6d2;hp=7c4d807746ff481e7bcdd56f7058ecc5d3b8c86c;hpb=b843d903237a2a4192c40d8c933e71137284050b;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
index 7c4d80774..9364ee4a3 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
@@ -56,7 +56,7 @@ import org.osgi.service.useradmin.Role;
  * Aggregates multiple {@link UserDirectory} and integrates them with system
  * roles.
  */
-public class CmsUserAdmin extends AggregatingUserAdmin  {
+public class CmsUserAdmin extends AggregatingUserAdmin {
 	private final static CmsLog log = CmsLog.getLog(CmsUserAdmin.class);
 
 	// GSS API
@@ -77,7 +77,7 @@ public class CmsUserAdmin extends AggregatingUserAdmin  {
 
 	public void stop() {
 	}
-	
+
 	public UserDirectory enableUserDirectory(Dictionary<String, ?> properties) {
 		String uri = (String) properties.get(UserAdminConf.uri.name());
 		Object realm = properties.get(UserAdminConf.realm.name());
@@ -113,7 +113,7 @@ public class CmsUserAdmin extends AggregatingUserAdmin  {
 		addUserDirectory(userDirectory);
 		if (isSystemRolesBaseDn(baseDn)) {
 			addStandardSystemRoles();
-		}	
+		}
 		if (log.isDebugEnabled()) {
 			log.debug("User directory " + userDirectory.getBaseDn() + (u != null ? " [" + u.getScheme() + "]" : "")
 					+ " enabled." + (realm != null ? " " + realm + " realm." : ""));
@@ -121,7 +121,6 @@ public class CmsUserAdmin extends AggregatingUserAdmin  {
 		return userDirectory;
 	}
 
-
 	protected void addStandardSystemRoles() {
 		// we assume UserTransaction is already available (TODO make it more robust)
 		try {
@@ -145,7 +144,6 @@ public class CmsUserAdmin extends AggregatingUserAdmin  {
 		}
 	}
 
-
 	@Override
 	protected void addAbstractSystemRoles(Authorization rawAuthorization, Set<String> sysRoles) {
 		if (rawAuthorization.getName() == null) {
@@ -229,6 +227,13 @@ public class CmsUserAdmin extends AggregatingUserAdmin  {
 	}
 
 	private GSSCredential logInAsAcceptor(Subject subject, String servicePrincipal) {
+		// not static because class is not supported by Android
+		final Oid KERBEROS_OID;
+		try {
+			KERBEROS_OID = new Oid("1.3.6.1.5.5.2");
+		} catch (GSSException e) {
+			throw new IllegalStateException("Cannot create Kerberos OID", e);
+		}
 		// GSS
 		Iterator<KerberosPrincipal> krb5It = subject.getPrincipals(KerberosPrincipal.class).iterator();
 		if (!krb5It.hasNext())
@@ -288,12 +293,4 @@ public class CmsUserAdmin extends AggregatingUserAdmin  {
 	 * STATIC
 	 */
 
-	public final static Oid KERBEROS_OID;
-	static {
-		try {
-			KERBEROS_OID = new Oid("1.3.6.1.5.5.2");
-		} catch (GSSException e) {
-			throw new IllegalStateException("Cannot create Kerberos OID", e);
-		}
-	}
 }