X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fjcr%2Fargeo.cnd;h=48bb997c61f09b794441976011c9736accbf0e3f;hb=afd41f657b0eecb1e9a1db85af8bff0cc7bc4804;hp=532bcdcafafc8fd51d76d717c52f20a58cd3c8ec;hpb=7fe4a16dad045373bb014724733c1bbb175d44b5;p=lgpl%2Fargeo-commons.git

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 532bcdcaf..48bb997c6 100644
--- 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
@@ -1,16 +1,57 @@
-<argeo = 'http://www.argeo.org/argeo'>
+<argeo = 'http://www.argeo.org/ns/argeo'>
 
 // GENERIC TYPES NOT AVAILABLE IN JCR
-[argeo:links] > mix:created, mix:lastModified
+[argeo:link] > mix:created, mix:lastModified
 mixin
 // URI(s)
-- argeo:link (STRING) m *
-
-// HOME DIRECTORIES
-[argeo:home] > nt:unstructured, mix:created, mix:lastModified
-orderable
-+ * (argeo:userHome) *
+- argeo:uri (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:keyring (argeo:pbeSpec)
++ argeo:preferences (argeo:preferenceNode)
+
+[argeo:userProfile] > mix:created, mix:lastModified, mix:title, mix:versionable
+mixin
+- argeo:userID (STRING) m
+
+[argeo:preferenceNode] > mix:lastModified, mix:versionable
+mixin
++ * (argeo:preferenceNode) * version
+
+[argeo:remoteRepository] > nt:unstructured
+- argeo:uri (STRING)
+- argeo:userID (STRING)
++ argeo:password (argeo:encrypted)
+
+// TABULAR CONTENT
+[argeo:table] > nt:file
++ * (argeo:column) *
+
+[argeo:column] > mix:title
+- jcr:requiredType (STRING) = 'STRING'
+
+[argeo:csv] > nt:resource
+
+// CRYPTO
+[argeo:encrypted] > nt:base
+mixin
+// initialization vector used by some algorithms
+- argeo:iv (BINARY)
+
+[argeo:pbeKeySpec] > nt:base
+mixin
+- argeo:secretKeyFactory (STRING)
+- argeo:salt (BINARY)
+- argeo:iterationCount (LONG)
+- argeo:keyLength (LONG)
+- argeo:secretKeyEncryption (STRING)
+
+[argeo:pbeSpec] > argeo:pbeKeySpec
+mixin
+- argeo:cipher (STRING)
+