X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.node.api%2Fsrc%2Forg%2Fargeo%2Fnode%2FNodeConstants.java;h=72083e8e72354c39f945065b5a8e865836237d7c;hb=ebd927da42511bb5959000c50a39974c6cfa5f49;hp=42676f5fac6b06283168ed8ec790cb368e5387e8;hpb=79a227ecbb3d99595a129602e2e65a74427d9d09;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 42676f5fa..72083e8e7 100644
--- a/org.argeo.node.api/src/org/argeo/node/NodeConstants.java
+++ b/org.argeo.node.api/src/org/argeo/node/NodeConstants.java
@@ -8,7 +8,6 @@ public interface NodeConstants {
 	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";
 
@@ -16,7 +15,7 @@ public interface NodeConstants {
 	 * FACTORY PIDs
 	 */
 	String NODE_REPOS_FACTORY_PID = "org.argeo.node.repos";
-	String NODE_USER_DIRECTORIES_FACTORY_PID = "org.argeo.node.userDirectories";
+	String NODE_USER_ADMIN_PID = "org.argeo.node.userAdmin";
 
 	/*
 	 * DN ATTRIBUTES (RFC 4514)
@@ -67,25 +66,31 @@ public interface NodeConstants {
 	/*
 	 * 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";
-	
+
 	/*
 	 * PATHS
 	 */
 	String PATH_DATA = "/data";
 	String PATH_JCR = "/jcr";
-	String PATH_JCR_PUB = "/pub";
-	
+	String PATH_FILES = "/files";
+	// String PATH_JCR_PUB = "/pub";
+
 	/*
 	 * FILE SYSTEMS
 	 */
-	String SCHEME_NODE = "node";
+	String SCHEME_NODE = NODE;
 
 	/*
-	 * FRAMEWORK PROPERTIES
+	 * KERBEROS
+	 */
+	String NODE_SERVICE = NODE;
+
+	/*
+	 * FIRST INIT FRAMEWORK PROPERTIES
 	 */
 	String NODE_INIT = "argeo.node.init";
 	String I18N_DEFAULT_LOCALE = "argeo.i18n.defaultLocale";
@@ -97,32 +102,7 @@ public interface NodeConstants {
 	// Node
 	/** Properties configuring the node repository */
 	String NODE_REPO_PROP_PREFIX = "argeo.node.repo.";
-
-	/*
-	 * LEGACY
-	 */
-	// @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.
-	 */
-	// @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";
+	// HTTP
+	String HTTP_PORT = "org.osgi.service.http.port";
+	String HTTP_PORT_SECURE = "org.osgi.service.http.port.secure";
 }