X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FAuthConstants.java;h=a5a2d49d4a0816455ed4f393bf1046187b24402f;hb=ebd927da42511bb5959000c50a39974c6cfa5f49;hp=d58d7421cd30f576625a674953b5785135992980;hpb=e7934b53bd71a084dc069f6500f7a168a28efdaf;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/AuthConstants.java b/org.argeo.cms/src/org/argeo/cms/auth/AuthConstants.java
index d58d7421c..a5a2d49d4 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/AuthConstants.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/AuthConstants.java
@@ -1,30 +1,55 @@
 package org.argeo.cms.auth;
 
-import org.osgi.service.http.HttpContext;
+import org.argeo.node.NodeConstants;
 
 /** Public properties of the CMS Kernel */
-public interface AuthConstants {
+interface AuthConstants {
+	
+	static final String SHARED_STATE_USERNAME = "javax.security.auth.login.name";
+	static final String SHARED_STATE_PASSWORD = "javax.security.auth.login.password";
+
 	// LOGIN CONTEXTS
-	final static String LOGIN_CONTEXT_USER = "USER";
-	final static String LOGIN_CONTEXT_ANONYMOUS = "ANONYMOUS";
-	final static String LOGIN_CONTEXT_SYSTEM = "SYSTEM";
-	final static String LOGIN_CONTEXT_SINGLE_USER = "SINGLE_USER";
+	/**
+	 * @deprecated Use {@link NodeConstants#LOGIN_CONTEXT_USER} instead
+	 */
+	final static String LOGIN_CONTEXT_USER = NodeConstants.LOGIN_CONTEXT_USER;
+	/**
+	 * @deprecated Use {@link NodeConstants#LOGIN_CONTEXT_ANONYMOUS} instead
+	 */
+//	final static String LOGIN_CONTEXT_ANONYMOUS = NodeConstants.LOGIN_CONTEXT_ANONYMOUS;
+	/**
+	 * @deprecated Use {@link NodeConstants#LOGIN_CONTEXT_DATA_ADMIN} instead
+	 */
+	final static String LOGIN_CONTEXT_DATA_ADMIN = NodeConstants.LOGIN_CONTEXT_DATA_ADMIN;
+	/**
+	 * @deprecated Use {@link NodeConstants#LOGIN_CONTEXT_SINGLE_USER} instead
+	 */
+	final static String LOGIN_CONTEXT_SINGLE_USER = NodeConstants.LOGIN_CONTEXT_SINGLE_USER;
 
 	// RESERVED ROLES
-	public final static String ROLE_KERNEL = "OU=node";
-	public final static String ROLES_BASEDN = "ou=roles,ou=node";
-	public final static String ROLE_ADMIN = "cn=admin," + ROLES_BASEDN;
-	public final static String ROLE_GROUP_ADMIN = "cn=groupAdmin," + ROLES_BASEDN;
-	public final static String ROLE_USER_ADMIN = "cn=userAdmin," + ROLES_BASEDN;
+	// public final static String ROLE_KERNEL = "OU=node";
+	/**
+	 * @deprecated Use {@link NodeConstants#ROLES_BASEDN} instead
+	 */
+	public final static String ROLES_BASEDN = NodeConstants.ROLES_BASEDN;
+	/**
+	 * @deprecated Use {@link NodeConstants#ROLE_ADMIN} instead
+	 */
+	public final static String ROLE_ADMIN = NodeConstants.ROLE_ADMIN;
+	public final static String ROLE_GROUP_ADMIN = "cn=groupAdmin," + NodeConstants.ROLES_BASEDN;
+	/**
+	 * @deprecated Use {@link NodeConstants#ROLE_USER_ADMIN} instead
+	 */
+	public final static String ROLE_USER_ADMIN = NodeConstants.ROLE_USER_ADMIN;
 	// Special system groups that cannot be edited:
 	// user U anonymous = everyone
-	public final static String ROLE_USER = "cn=user," + ROLES_BASEDN;
-	public final static String ROLE_ANONYMOUS = "cn=anonymous," + ROLES_BASEDN;
-
-	// SHARED STATE KEYS
-	// compatible with com.sun.security.auth.module.*LoginModule
-	public static final String SHARED_STATE_USERNAME = "javax.security.auth.login.name";
-	public static final String SHARED_STATE_PASSWORD = "javax.security.auth.login.password";
-	public static final String SHARED_STATE_AUTHORIZATION = HttpContext.AUTHORIZATION;
+	/**
+	 * @deprecated Use {@link NodeConstants#ROLE_USER} instead
+	 */
+	public final static String ROLE_USER = NodeConstants.ROLE_USER;
+	/**
+	 * @deprecated Use {@link NodeConstants#ROLE_ANONYMOUS} instead
+	 */
+	public final static String ROLE_ANONYMOUS = NodeConstants.ROLE_ANONYMOUS;
 
 }