projects
/
gpl
/
argeo-suite.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b068663
)
Introduce entity:relatedTo mixin.
author
Mathieu Baudier <mbaudier@argeo.org>
Wed, 9 Dec 2020 11:32:36 +0000
(12:32 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Wed, 9 Dec 2020 11:32:36 +0000
(12:32 +0100)
org.argeo.entity.api/src/org/argeo/entity/EntityNames.java
patch
|
blob
|
history
org.argeo.entity.api/src/org/argeo/entity/EntityType.java
patch
|
blob
|
history
org.argeo.entity.api/src/org/argeo/entity/entity.cnd
patch
|
blob
|
history
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 4f2edebe636efbfec5e4f7c25e97fa856d8e57be..8e2f1b8ec7576c6f8319bdd8efd54ea21bf4f501 100644
(file)
--- 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 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";
// 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
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 29075fe1a6fcd908e2fab5a699e3faa9b3cb9d28..f208a99bfe9dc7e9655080e90e9ccda534b0461d 100644
(file)
--- 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
/** Types related to entities. */
public enum EntityType implements JcrName {
// entity
- entity, local,
+ entity, local,
relatedTo,
// typology
typologies, terms, term,
// form
// 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 91dcf2589f6823f5cacbba1bb3fbc7efe79e7e6a..0b3127b305115cf16c82412b1f1b23df15825bdb 100644
(file)
--- 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
mixin
- entity:type (String) m
+[entity:relatedTo]
+mixin
++ entity:relatedTo (nt:address) *
+
//
// ENTITY DEFINITION
//
//
// ENTITY DEFINITION
//