X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2Fexecution%2FJcrExecutionModulesListener.java;fp=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2Fexecution%2FJcrExecutionModulesListener.java;h=f63acb5c06faac9f5a21054014fccba7314816c0;hb=9d9c630a744a1d8394da90bd083461dffb03b178;hp=541d366bf78b2b74fb27b3d422f77ccd4530a265;hpb=cc3f2374eec87ada10328330250765e641c0983a;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java
index 541d366bf..f63acb5c0 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java
@@ -243,11 +243,6 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener,
 			String relativePath, ExecutionFlowDescriptor efd)
 			throws RepositoryException {
 		Node flowNode = null;
-		// if (relativePath.startsWith("/"))
-		// relativePath = relativePath.substring(1);
-		// if (relativePath.endsWith("/"))
-		// relativePath = relativePath.substring(0, relativePath.length() - 1);
-
 		Iterator<String> names = Arrays.asList(relativePath.split("/"))
 				.iterator();
 		// create intermediary paths
@@ -388,9 +383,12 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener,
 	 * UTILITIES
 	 */
 	/** @return the relative path, never starts with '/' */
+	@SuppressWarnings("deprecation")
 	protected String getExecutionFlowRelativePath(
 			ExecutionFlowDescriptor executionFlow) {
-		String relativePath = executionFlow.getName();
+		String relativePath = executionFlow.getPath() == null ? executionFlow
+				.getName() : executionFlow.getPath() + '/'
+				+ executionFlow.getName();
 		// we assume that it is more than one char long
 		if (relativePath.charAt(0) == '/')
 			relativePath = relativePath.substring(1);