X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2FSlcJcrUtils.java;h=df69c93f7752d5c4672b411ff98d9b6b3f448223;hb=2541d68abde22de8b5e1001d6291a1afb2bbcc09;hp=c3cdda7573e421dd7b2408c6775628d8b5fa40c4;hpb=26cd9f658531888bfa9ba69ea5c034839b4c4149;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java index c3cdda757..df69c93f7 100644 --- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java @@ -1,22 +1,40 @@ +/* + * Copyright (C) 2007-2012 Mathieu Baudier + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.argeo.slc.jcr; import java.util.Calendar; import java.util.GregorianCalendar; import javax.jcr.Node; +import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; +import org.argeo.jcr.ArgeoJcrUtils; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.PrimitiveAccessor; import org.argeo.slc.core.execution.PrimitiveUtils; import org.argeo.slc.deploy.ModuleDescriptor; +import org.argeo.slc.test.TestStatus; /** * Utilities around the SLC JCR model. Note that it relies on fixed base paths * (convention over configuration) for optimization purposes. */ -public class SlcJcrUtils { +public class SlcJcrUtils implements SlcNames { public final static Integer AGENT_FACTORY_DEPTH = 3; /** Extracts the path of a flow relative to its execution module */ @@ -29,23 +47,20 @@ public class SlcJcrUtils { return buf.toString(); } - /** Module node name based on module name and version */ - public static String getModuleNodeName(ModuleDescriptor moduleDescriptor) { - return moduleDescriptor.getName() + "_" + moduleDescriptor.getVersion(); - } - - /** Extracts the execution module name of a flow */ - public static String flowExecutionModuleName(String fullFlowPath) { + /** Extracts the path to the related execution module */ + public static String modulePath(String fullFlowPath) { String[] tokens = fullFlowPath.split("/"); - String moduleNodeName = tokens[AGENT_FACTORY_DEPTH + 2]; - return moduleNodeName.substring(0, moduleNodeName.lastIndexOf('_')); + StringBuffer buf = new StringBuffer(fullFlowPath.length()); + for (int i = 0; i < AGENT_FACTORY_DEPTH + 3; i++) { + if (!tokens[i].equals("")) + buf.append('/').append(tokens[i]); + } + return buf.toString(); } - /** Extracts the execution module version of a flow */ - public static String flowExecutionModuleVersion(String fullFlowPath) { - String[] tokens = fullFlowPath.split("/"); - String moduleNodeName = tokens[AGENT_FACTORY_DEPTH + 2]; - return moduleNodeName.substring(moduleNodeName.lastIndexOf('_') + 1); + /** Module node name based on module name and version */ + public static String getModuleNodeName(ModuleDescriptor moduleDescriptor) { + return moduleDescriptor.getName() + "_" + moduleDescriptor.getVersion(); } /** Extracts the agent factory of a flow */ @@ -67,10 +82,10 @@ public class SlcJcrUtils { } /** Create a new execution result path based on the current time */ - public static String createResultPath(String uuid) { + public static String createResultPath(String username, String uuid) { Calendar now = new GregorianCalendar(); - return SlcJcrConstants.RESULTS_BASE_PATH + '/' - + JcrUtils.dateAsPath(now, true) + uuid; + return ArgeoJcrUtils.getUserHomePath(username) + '/' + SlcNames.SLC_RESULTS + + '/' + JcrUtils.dateAsPath(now, true) + uuid; } /** @@ -114,19 +129,67 @@ public class SlcJcrUtils { } } - /** Prevents instantiation */ - private SlcJcrUtils() { - + /** Aggregates the {@link TestStatus} of this sub-tree. */ + public static Integer aggregateTestStatus(Node node) { + try { + Integer status = TestStatus.PASSED; + if (node.isNodeType(SlcTypes.SLC_CHECK)) + if (node.getProperty(SLC_SUCCESS).getBoolean()) + status = TestStatus.PASSED; + else if (node.hasProperty(SLC_ERROR_MESSAGE)) + status = TestStatus.ERROR; + else + status = TestStatus.FAILED; + + NodeIterator it = node.getNodes(); + while (it.hasNext()) { + Integer childStatus = aggregateTestStatus(it.nextNode()); + if (childStatus > status) + status = childStatus; + } + return status; + } catch (Exception e) { + throw new SlcException("Could not aggregate test status from " + + node, e); + } } - public static void main(String[] args) { - String path = "/slc/agents/vm/default/org.argeo_1.2.3/myPath/myFlow"; - System.out.println("Flow relative path: " + flowRelativePath(path)); - System.out.println("Execution Module Name: " - + flowExecutionModuleName(path)); - System.out.println("Execution Module Version: " - + flowExecutionModuleVersion(path)); - System.out.println("Agent Factory path: " + flowAgentFactoryPath(path)); + /** + * Aggregates the {@link TestStatus} of this sub-tree. + * + * @return the same {@link StringBuffer}, for convenience (typically calling + * toString() on it) + */ + public static StringBuffer aggregateTestMessages(Node node, + StringBuffer messages) { + try { + if (node.isNodeType(SlcTypes.SLC_CHECK)) { + if (node.hasProperty(SLC_MESSAGE)) { + if (messages.length() > 0) + messages.append('\n'); + messages.append(node.getProperty(SLC_MESSAGE).getString()); + } + if (node.hasProperty(SLC_ERROR_MESSAGE)) { + if (messages.length() > 0) + messages.append('\n'); + messages.append(node.getProperty(SLC_ERROR_MESSAGE) + .getString()); + } + } + NodeIterator it = node.getNodes(); + while (it.hasNext()) { + Node child = it.nextNode(); + aggregateTestMessages(child, messages); + } + return messages; + } catch (Exception e) { + throw new SlcException("Could not aggregate test messages from " + + node, e); + } } + /** Prevents instantiation */ + private SlcJcrUtils() { + + } }