From 8347556c9afb8e7ff128722ded5aa3f198b31079 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 9 Dec 2020 12:32:36 +0100 Subject: [PATCH] Introduce entity:relatedTo mixin. --- org.argeo.entity.api/src/org/argeo/entity/EntityNames.java | 5 +++-- org.argeo.entity.api/src/org/argeo/entity/EntityType.java | 2 +- org.argeo.entity.api/src/org/argeo/entity/entity.cnd | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java b/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java index 4f2edeb..8e2f1b8 100644 --- a/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java +++ b/org.argeo.entity.api/src/org/argeo/entity/EntityNames.java @@ -18,14 +18,15 @@ public interface EntityNames { final String ADM = "adm"; final String ENTITY_TYPE = "entity:type"; - final String ENTITY_UID = "entity:uid"; - final String ENTITY_NAME = "entity:name"; + //final String ENTITY_UID = "entity:uid"; + //final String ENTITY_NAME = "entity:name"; // GENERIC CONCEPTS /** 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"; // LDAP-LIKE ENTITIES diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityType.java b/org.argeo.entity.api/src/org/argeo/entity/EntityType.java index 29075fe..f208a99 100644 --- a/org.argeo.entity.api/src/org/argeo/entity/EntityType.java +++ b/org.argeo.entity.api/src/org/argeo/entity/EntityType.java @@ -3,7 +3,7 @@ package org.argeo.entity; /** Types related to entities. */ public enum EntityType implements JcrName { // entity - entity, local, + entity, local, relatedTo, // typology typologies, terms, term, // form diff --git a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd index 91dcf25..0b3127b 100644 --- a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd +++ b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd @@ -15,6 +15,10 @@ mixin mixin - entity:type (String) m +[entity:relatedTo] +mixin ++ entity:relatedTo (nt:address) * + // // ENTITY DEFINITION // -- 2.30.2