Improve entity names

diff --git a/org.argeo.app.api/src/org/argeo/app/api/EntityName.java b/org.argeo.app.api/src/org/argeo/app/api/EntityName.java
index f8906320c7c464559685777846f75c6a13638ac9..43302945b8a64a65f4b5185b99995a5a79d3fd64 100644 (file)
--- a/org.argeo.app.api/src/org/argeo/app/api/EntityName.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityName.java
@@ -4,7 +4,9 @@ import org.argeo.api.acr.QNamed;
 
 /** Names used in the entity namespace http://www.argeo.org/ns/entity. */
 public enum EntityName implements QNamed {
-       type, //
+       type, relatedTo, //
+       // time,
+       date,
        // geography
        minLat, minLon, maxLat, maxLon,
        // geo entities

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 2e33c3487a04e6a2d9c2bd411557aa7103fd9a46..b6240b3126f136bb3f71e9550f4a0ba6cfa8cd3f 100644 (file)
--- a/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
@@ -18,16 +18,16 @@ public interface EntityNames {
        final String ADM = "adm";
 
        @Deprecated
-       final String ENTITY_TYPE = "entity:type";
+       final String ENTITY_TYPE = EntityName.type.get();
 
        // GENERIC CONCEPTS
 //     /** The language which is relevant. */
 //     final String XML_LANG = "xml:lang";
        /** The date which is relevant. */
        @Deprecated
-       final String ENTITY_DATE = "entity:date";
+       final String ENTITY_DATE = EntityName.date.get();
        @Deprecated
-       final String ENTITY_RELATED_TO = "entity:relatedTo";
+       final String ENTITY_RELATED_TO = EntityName.relatedTo.get();
 
        // DEFAULT FOLDER NAMES
        final String MEDIA = "media";
@@ -35,16 +35,16 @@ public interface EntityNames {
 
        // LDAP-LIKE ENTITIES
        @Deprecated
-       final String DISPLAY_NAME = LdapAttr.displayName.property();
+       final String DISPLAY_NAME = LdapAttr.displayName.get();
        // Persons
        @Deprecated
-       final String GIVEN_NAME = LdapAttr.givenName.property();
+       final String GIVEN_NAME = LdapAttr.givenName.get();
        @Deprecated
-       final String SURNAME = LdapAttr.sn.property();
+       final String SURNAME = LdapAttr.sn.get();
        @Deprecated
-       final String EMAIL = LdapAttr.mail.property();
+       final String EMAIL = LdapAttr.mail.get();
        @Deprecated
-       final String OU = LdapAttr.ou.property();
+       final String OU = LdapAttr.ou.get();
 
        // WGS84
        @Deprecated