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=618487b572187d0fdc0b025df073dd7dda260cf0;hp=1ef20a7604a670f553b33148225bc87e4ed4a19a;hb=5aeef7f6fe70d741b66a58eb51cdd2f1bcfdfcf1;hpb=04cafe75836841a6c845b8dbc0cc80998442f78f

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 1ef20a7..618487b 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
+++ b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
@@ -1,14 +1,11 @@
-<ldap = 'http://www.argeo.org/ns/ldap'>
-<entity = 'http://www.argeo.org/ns/entity'>
-
-// standard namespaces
+// Standard namespaces
 <xsd = "http://www.w3.org/2001/XMLSchema">
 <h = "http://www.w3.org/1999/xhtml">
-<xforms = "http://www.w3.org/2002/xforms">
-
 // see https://www.w3.org/2003/01/geo/
-<geo = 'http://www.w3.org/2003/01/geo/wgs84_pos#'>
+//<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:created, mix:referenceable
 mixin
@@ -34,38 +31,25 @@ orderable
 //
 // TYPOLOGY
 //
+[entity:typologies]
++ * (entity:terms) = entity:terms
+
 [entity:term]
 orderable
-+ * (entity:term) *
++ * (entity:term) = entity:term *
 
-[entity:typology] > mix:referenceable, mix:created
+[entity:terms] > mix:referenceable
 orderable
-+ * (entity:term) *
++ * (entity:term) = entity:term *
 
 //
-// XML
+// FORM
 //
-[entity:xmlvalue] > mix:language
-- *
-+ jcr:xmltext (entity:xmltext)
-
-[entity:xmltext]
- - jcr:xmlcharacters (String) mandatory
-
-//
-// HTML
-//
-[h:head]
-+ h:title (entity:xmlvalue)
-+ h:base (entity:xmlvalue)
-+ h:style (entity:xmlvalue) multiple
-+ h:meta (entity:xmlvalue) multiple
-+ h:link (entity:xmlvalue) multiple
-+ h:script (entity:xmlvalue) multiple
+[entity:form]
+mixin
 
-[h:html]
-+ h:head (h:head)
-+ h:body (nt:unstructured)
+[entity:formSet]
+mixin
 
 // LDAP-LIKE ENTITIES
 // A real person