X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.api%2Fsrc%2Forg%2Fargeo%2Fapp%2Fapi%2FEntityNames.java;h=b6240b3126f136bb3f71e9550f4a0ba6cfa8cd3f;hb=dc3be714555e9f6d75eda904c788020125cc762d;hp=77760568f982667f9734f1e9da49367963497586;hpb=942fd932e1f6ed3319575c4c1d944912dfca9fa5;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java b/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
index 7776056..b6240b3 100644
--- a/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
@@ -1,6 +1,6 @@
 package org.argeo.app.api;
 
-import org.argeo.util.naming.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
 
 /** Constants used to name entity structures. */
 public interface EntityNames {
@@ -17,17 +17,17 @@ public interface EntityNames {
 	/** Administrative units. */
 	final String ADM = "adm";
 
-	final String ENTITY_TYPE = "entity:type";
-	// final String ENTITY_UID = "entity:uid";
-	// final String ENTITY_NAME = "entity:name";
+	@Deprecated
+	final String ENTITY_TYPE = EntityName.type.get();
 
 	// GENERIC CONCEPTS
-	/** The language which is relevant. */
-	final String XML_LANG = "xml:lang";
+//	/** The language which is relevant. */
+//	final String XML_LANG = "xml:lang";
 	/** The date which is relevant. */
-	final String ENTITY_DATE = "entity:date";
 	@Deprecated
-	final String ENTITY_RELATED_TO = "entity:relatedTo";
+	final String ENTITY_DATE = EntityName.date.get();
+	@Deprecated
+	final String ENTITY_RELATED_TO = EntityName.relatedTo.get();
 
 	// DEFAULT FOLDER NAMES
 	final String MEDIA = "media";
@@ -35,27 +35,36 @@ public interface EntityNames {
 
 	// LDAP-LIKE ENTITIES
 	@Deprecated
-	final String DISPLAY_NAME = LdapAttrs.displayName.property();
+	final String DISPLAY_NAME = LdapAttr.displayName.get();
 	// Persons
 	@Deprecated
-	final String GIVEN_NAME = LdapAttrs.givenName.property();
+	final String GIVEN_NAME = LdapAttr.givenName.get();
 	@Deprecated
-	final String SURNAME = LdapAttrs.sn.property();
+	final String SURNAME = LdapAttr.sn.get();
 	@Deprecated
-	final String EMAIL = LdapAttrs.mail.property();
+	final String EMAIL = LdapAttr.mail.get();
 	@Deprecated
-	final String OU = LdapAttrs.ou.property();
+	final String OU = LdapAttr.ou.get();
 
 	// WGS84
-	final String GEO_LAT = "geo:lat";
-	final String GEO_LONG = "geo:long";
-	final String GEO_ALT = "geo:alt";
+	@Deprecated
+	final String GEO_LAT = WGS84PosName.lat.get();
+	@Deprecated
+	final String GEO_LONG = WGS84PosName.lon.get();
+	@Deprecated
+	final String GEO_ALT = WGS84PosName.alt.get();
 
 	// SVG
+	@Deprecated
 	final String SVG_WIDTH = "svg:width";
+	@Deprecated
 	final String SVG_HEIGHT = "svg:height";
+	@Deprecated
 	final String SVG_LENGTH = "svg:length";
+	@Deprecated
 	final String SVG_UNIT = "svg:unit";
+	@Deprecated
 	final String SVG_DUR = "svg:dur";
+	@Deprecated
 	final String SVG_DIRECTION = "svg:direction";
 }