X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fjcr%2Fslc.cnd;h=36ced22db752977d466c98f4485272363d78fa3d;hb=b3c5eaf56f98afc3e1068c154320b51e10b6424b;hp=3bdf51ce95831c2d6fb30e6ee04c1408bf6f5fb2;hpb=3781dcd363f0f6265fae0ac758fd40cf4254ebc9;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd b/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd
index 3bdf51ce9..36ced22db 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd
+++ b/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd
@@ -23,18 +23,18 @@ mixin
 mixin
 
 [slc:executionSpec] > nt:unstructured, mix:referenceable, mix:title
-- slc:name (STRING)
+- slc:name (STRING) m
 + * (slc:executionSpecAttribute) *
 
 [slc:executionSpecAttribute] > nt:base
 mixin abstract
-- slc:isImmutable (BOOLEAN) m
-- slc:isConstant (BOOLEAN) m
-- slc:isHidden (BOOLEAN) m
+- slc:isImmutable (BOOLEAN) 
+- slc:isConstant (BOOLEAN) 
+- slc:isHidden (BOOLEAN) 
 
 [slc:primitiveSpecAttribute] > slc:executionSpecAttribute
 mixin
-- slc:type (STRING) m
+- slc:type (STRING) 
 - slc:value (UNDEFINED)
 
 [slc:refSpecAttribute] > slc:executionSpecAttribute
@@ -45,23 +45,66 @@ mixin
 + * (mix:title)
 
 [slc:executionFlow] > nt:unstructured, mix:title
-- slc:name (STRING) m
+- slc:name (STRING) ! m
 // if the execution spec is a referenceable node
-- slc:executionSpec (REFERENCE)
+- slc:spec (REFERENCE)
 // if the execution spec is internal (without name)
 + * (slc:executionSpecAttribute) *
 
 // PROCESS
 [slc:process] > nt:unstructured, mix:created, mix:lastModified
-- slc:uuid (STRING) m
+- slc:uuid (STRING) ! m
 - slc:status (STRING) m
 + slc:flow (slc:realizedFlow)
++ slc:log
+
+// The first part of the relative path is the thread name, rest is location
+[slc:logEntry] > nt:unstructured
+abstract
+- slc:message (STRING) !
+- slc:timestamp (STRING)
+
+// Log levels are set via types.
+// Querying one level also queries the higher levels thanks to the inheritance
+// e.g. 'select * from [slc:logWarn]' also returns errors 
+[slc:logTrace] > slc:logEntry
+
+[slc:logDebug] > slc:logTrace
+
+[slc:logInfo] > slc:logDebug
+
+[slc:logWarning] > slc:logInfo
+
+[slc:logError] > slc:logWarning
 
 [slc:realizedFlow] > nt:base
 mixin
+// the name of the flow
+// - slc:flow (STRING)
+// the name of the execution spec
+// - slc:spec (STRING)
 - slc:started (DATE)
 - slc:completed (DATE)
+//- slc:status (STRING)
 + slc:address (nt:address)
 + slc:flow (slc:realizedFlow) *
+// the realized execution spec attributes
++ * (slc:executionSpecAttribute) *
+
+// RESULT
+[slc:result] > nt:unstructured, mix:created, mix:lastModified
+- slc:uuid (STRING) ! m
+- slc:completed (DATE)
 
+[slc:check] > nt:unstructured
+// true for PASSED, false for FAILED or ERROR
+- slc:success (BOOLEAN) ! m
+- slc:message (STRING)
+// ERROR if set, the check could not be performed because of an unexpected exception
+- slc:errorMessage (STRING)
+// to ease transition with legacy approach
++ * (slc:property) *
 
+[slc:property] > nt:unstructured
+- slc:name (STRING) ! m
+- slc:value (STRING) m