X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.api%2Fsrc%2Forg%2Fargeo%2Fnode%2FRepoConf.java;h=be4f6f7f79716c66084f75eb986d0013d1f5fffe;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=39f72c03527cb9d93032c62b079f14edc65f3010;hpb=06acf73a99f0e3908fe8998f1ff08dee109c5562;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.api/src/org/argeo/node/RepoConf.java b/org.argeo.cms.api/src/org/argeo/node/RepoConf.java
index 39f72c035..be4f6f7f7 100644
--- a/org.argeo.cms.api/src/org/argeo/node/RepoConf.java
+++ b/org.argeo.cms.api/src/org/argeo/node/RepoConf.java
@@ -1,10 +1,11 @@
 package org.argeo.node;
 
 /** JCR repository configuration */
-public enum RepoConf {
+public enum RepoConf implements EnumAD {
 	/** Repository type */
 	type("localfs"),
 	/** Default workspace */
+	@Deprecated
 	defaultWorkspace("main"),
 	/** Database URL */
 	dburl(null),
@@ -14,14 +15,14 @@ public enum RepoConf {
 	dbpassword(null),
 
 	/** The identifier (can be an URL locating the repo) */
-	uri(null),
-
+	labeledUri(null),
 	//
 	// JACKRABBIT SPECIFIC
 	//
 	/** Maximum database pool size */
 	maxPoolSize(10),
 	/** Maximum cache size in MB */
+	@Deprecated
 	maxCacheMB(null),
 	/** Bundle cache size in MB */
 	bundleCacheMB(8),
@@ -34,6 +35,12 @@ public enum RepoConf {
 
 	/** The default value. */
 	private Object def;
+	private String oid;
+
+	RepoConf(String oid, Object def) {
+		this.oid = oid;
+		this.def = def;
+	}
 
 	RepoConf(Object def) {
 		this.def = def;
@@ -42,4 +49,18 @@ public enum RepoConf {
 	public Object getDefault() {
 		return def;
 	}
+
+	@Override
+	public String getID() {
+		if (oid != null)
+			return oid;
+		return EnumAD.super.getID();
+	}
+
+	public static class OCD extends EnumOCD<RepoConf> {
+		public OCD(String locale) {
+			super(RepoConf.class, locale);
+		}
+	}
+
 }