Restructure JCR repository wrappers

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.jcr / src / main / resources / org / argeo / jcr / argeo.cnd

diff --git a/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd b/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd
index dbf9a927fbdca5750049c9df7db971beb5ba652d..1ae7a1e776670715a69f66eea316fa30bc7c3461 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd
+++ b/server/runtime/org.argeo.server.jcr/src/main/resources/org/argeo/jcr/argeo.cnd
@@ -9,19 +9,28 @@ mixin
 [argeo:references] > nt:unstructured
 - * (REFERENCE) *
 
+// DATA MODEL
+[argeo:dataModel] > mix:created, mix:lastModified, mix:versionable
+mixin
+- argeo:uri (STRING) m
+- argeo:dataModelVersion (STRING) m
+
 // USER NODES
 // user should be lower case, between 3 and 15 characters long
 [argeo:userHome] > mix:created, mix:lastModified
 mixin
 - argeo:userID (STRING) m
-+ argeo:profile (argeo:userProfile)
+- argeo:remoteRoles (STRING) *
 + argeo:keyring (argeo:pbeSpec)
 + argeo:preferences (argeo:preferenceNode)
 
 [argeo:userProfile] > mix:created, mix:lastModified, mix:title, mix:versionable
 mixin
 - argeo:userID (STRING) m
-- argeo:remoteRoles (STRING) *
+- argeo:enabled (BOOLEAN)
+- argeo:accountNonExpired (BOOLEAN)
+- argeo:accountNonLocked (BOOLEAN)
+- argeo:credentialsNonExpired (BOOLEAN)
 
 [argeo:preferenceNode] > mix:lastModified, mix:versionable
 mixin