X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.entity.api%2Fsrc%2Forg%2Fargeo%2Fentity%2Fentity.cnd;h=45be8adee863bbf59498f0f57c4127944e5e39d7;hp=67116cd69ca88a05a9dd225c006930b8d87792cb;hb=8630eb1e679307eb8a8448f80a99cc530402d8d3;hpb=a55bb0dc7e9fbcefb645d34ce24b326d1506a623

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 67116cd..45be8ad 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
+++ b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
@@ -1,28 +1,56 @@
-<ldap = 'http://www.argeo.org/ns/ldap'>
+// Standard namespaces
+<xsd = "http://www.w3.org/2001/XMLSchema">
+<h = "http://www.w3.org/1999/xhtml">
+// see https://www.w3.org/2003/01/geo/
+//<geo = "http://www.w3.org/2003/01/geo/wgs84_pos#">
+
+<ldap = "http://www.argeo.org/ns/ldap">
 <entity = 'http://www.argeo.org/ns/entity'>
 
-[entity:entity] > mix:title, mix:created, mix:lastModified, mix:referenceable
+[entity:entity] > mix:created, mix:referenceable
 mixin
 //- entity:uid (String) m // an implementation dependent UID for each entity
 //- entity:type (String) // the type of this entity
 
-[entity:definition] > entity:composite, mix:title, mix:created, mix:lastModified, mix:referenceable
-mixin
+//
+// ENTITY DEFINITION
+//
+[entity:definition] > entity:composite, mix:created, mix:referenceable
+//- entity:type (String) multiple
 
 [entity:part]
-mixin
 
 [entity:reference]
-mixin
 
 [entity:composite]
-mixin
 orderable
-+ * (entity:part)
-+ * (entity:reference)
-+ * (entity:composite)
+//+ * (entity:part)
+//+ * (entity:reference)
+//+ * (entity:composite)
+
+//
+// TYPOLOGY
+//
+[entity:term]
+orderable
++ * (entity:term) *
+
+[entity:typology] > mix:referenceable, mix:created
+orderable
++ * (entity:term) *
+
+//
+// FORM
+//
+[entity:form]
+mixin
+
+[entity:formSet]
+mixin
 
 // LDAP-LIKE ENTITIES
 // A real person
 [entity:person] > entity:entity
 mixin
+- ldap:sn (String)
+- ldap:givenName (String)