X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.node.api%2Fsrc%2Forg%2Fargeo%2Fnode%2FNodeConstants.java;h=22afe0065e2e0d220f4e8e917da35b75cc00fd67;hb=6d206b9052689ffa880cd4593bfefa704dc0dd46;hp=bfd979c7f144c0fe237c41bd3e8113faa8ddc9f1;hpb=cf53e939cabed54ee2a3074afcf22417fbdf364d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.node.api/src/org/argeo/node/NodeConstants.java b/org.argeo.node.api/src/org/argeo/node/NodeConstants.java
index bfd979c7f..22afe0065 100644
--- a/org.argeo.node.api/src/org/argeo/node/NodeConstants.java
+++ b/org.argeo.node.api/src/org/argeo/node/NodeConstants.java
@@ -1,23 +1,6 @@
 package org.argeo.node;
 
 public interface NodeConstants {
-	/*
-	 * PIDs
-	 */
-	String NODE_STATE_PID = "org.argeo.node.state";
-	String NODE_DEPLOYMENT_PID = "org.argeo.node.deployment";
-	String NODE_INSTANCE_PID = "org.argeo.node.instance";
-
-	String NODE_USER_ADMIN_PID = "org.argeo.node.userAdmin";
-	String NODE_KEYRING_PID = "org.argeo.node.keyring";
-	String NODE_FS_PROVIDER_PID = "org.argeo.node.fsProvider";
-
-	/*
-	 * FACTORY PIDs
-	 */
-	String NODE_REPOS_FACTORY_PID = "org.argeo.node.repos";
-	String NODE_USER_DIRECTORIES_FACTORY_PID = "org.argeo.node.userDirectories";
-
 	/*
 	 * DN ATTRIBUTES (RFC 4514)
 	 */
@@ -63,14 +46,18 @@ public interface NodeConstants {
 	// user U anonymous = everyone
 	String ROLE_USER = "cn=user," + ROLES_BASEDN;
 	String ROLE_ANONYMOUS = "cn=anonymous," + ROLES_BASEDN;
+	// Account lifecycle
+	String ROLE_REGISTERING = "cn=registering," + ROLES_BASEDN;
 
 	/*
 	 * LOGIN CONTEXTS
 	 */
 	String LOGIN_CONTEXT_NODE = "NODE";
 	String LOGIN_CONTEXT_USER = "USER";
+	String LOGIN_CONTEXT_ANONYMOUS = "ANONYMOUS";
 	String LOGIN_CONTEXT_DATA_ADMIN = "DATA_ADMIN";
 	String LOGIN_CONTEXT_SINGLE_USER = "SINGLE_USER";
+	String LOGIN_CONTEXT_KEYRING = "KEYRING";
 
 	/*
 	 * PATHS
@@ -91,7 +78,7 @@ public interface NodeConstants {
 	String NODE_SERVICE = NODE;
 
 	/*
-	 * FRAMEWORK PROPERTIES
+	 * FIRST INIT FRAMEWORK PROPERTIES
 	 */
 	String NODE_INIT = "argeo.node.init";
 	String I18N_DEFAULT_LOCALE = "argeo.i18n.defaultLocale";
@@ -103,32 +90,23 @@ public interface NodeConstants {
 	// Node
 	/** Properties configuring the node repository */
 	String NODE_REPO_PROP_PREFIX = "argeo.node.repo.";
+	// HTTP
+	String HTTP_PORT = "org.osgi.service.http.port";
+	String HTTP_PORT_SECURE = "org.osgi.service.http.port.secure";
 
 	/*
-	 * LEGACY
+	 * PIDs
 	 */
-	// @Deprecated
-	// String ARGEO_BASE_PATH = "/argeo:system";
-	// @Deprecated
-	// String PEOPLE_BASE_PATH = NodeConstants.ARGEO_BASE_PATH +
-	// "/argeo:people";
-	// @Deprecated
-	// String DATA_MODELS_BASE_PATH = NodeConstants.ARGEO_BASE_PATH +
-	// "/argeo:dataModels";
-	// @Deprecated
-	// String ALIAS_HOME = "home";
-	// standard aliases
-	/**
-	 * Reserved alias for the "node" {@link Repository}, that is, the default
-	 * JCR repository.
+	String NODE_STATE_PID = "org.argeo.node.state";
+	String NODE_DEPLOYMENT_PID = "org.argeo.node.deployment";
+	String NODE_INSTANCE_PID = "org.argeo.node.instance";
+
+	String NODE_KEYRING_PID = "org.argeo.node.keyring";
+	String NODE_FS_PROVIDER_PID = "org.argeo.node.fsProvider";
+
+	/*
+	 * FACTORY PIDs
 	 */
-	// @Deprecated
-	// String ALIAS_NODE = "node";
-	/** Key for a JCR repository URI */
-	// @Deprecated
-	// String JCR_REPOSITORY_URI = "argeo.jcr.repository.uri";
-	// parameters (typically for call to a RepositoryFactory)
-	/** Key for a JCR repository alias */
-	// @Deprecated
-	// String JCR_REPOSITORY_ALIAS = "argeo.jcr.repository.alias";
+	String NODE_REPOS_FACTORY_PID = "org.argeo.node.repos";
+	String NODE_USER_ADMIN_PID = "org.argeo.node.userAdmin";
 }