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=9890fc365313b89e57c70bbb4a0be7d8558fc905;hb=89114859830f6e159a259937375bd063f25f80c9;hp=d644de3ca63177e54f584600270b0fa6e146015c;hpb=6a5737bbf4cd63e00e61a3fd81e6673b5ad9341f;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 d644de3ca..9890fc365 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
@@ -38,10 +38,11 @@ mixin
 - slc:value (UNDEFINED)
 
 [slc:refSpecAttribute] > slc:executionSpecAttribute
+orderable
 mixin
 // typically a class name
 - slc:type (STRING)
-+ slc:value
+- slc:value (UNDEFINED)
 + * (mix:title)
 
 [slc:executionFlow] > nt:unstructured, mix:title
@@ -53,11 +54,33 @@ mixin
 
 // PROCESS
 [slc:process] > nt:unstructured, mix:created, mix:lastModified
+orderable
 - 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
+orderable
 mixin
 // the name of the flow
 // - slc:flow (STRING)
@@ -65,15 +88,35 @@ mixin
 // - 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:testResult] > nt:unstructured, mix:created, mix:lastModified
 - slc:uuid (STRING) ! m
+- slc:testCase (STRING)
 - slc:completed (DATE)
+// Helper to keep a centralize place to have testResultStatus
+// when adding more than one result part to a given testResult 
++ slc:aggregatedStatus (slc:check)
+
+[slc:diffResult] > slc:testResult
++ slc:summary
++ slc:issues
+
+[slc:resultFolder] > nt:unstructured
++ slc:folderStatus (slc:check)
++ * (slc:resultFolder) *
++ * (slc:testResult) *
+
+// base node for user defined and managed result tree
+// simplify UI management
+[slc:myResultRootFolder] > nt:unstructured
++ * (slc:resultFolder) *
++ * (slc:testResult) *
 
 [slc:check] > nt:unstructured
 // true for PASSED, false for FAILED or ERROR
@@ -81,6 +124,7 @@ mixin
 - 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