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=52931218bcbe1c15142c9ec4744b16c6b55c9304;hb=844bc386a1854a29d282a23ffda820ed7a52b74e;hp=51ea14e98d0d0a24b790da8e70a7d1168fb6d665;hpb=86fc845e533e99358ec3de7182ea0c01bcd1c432;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 51ea14e98..52931218b 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,3 +1,18 @@
+/*
+ * 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;
@@ -6,8 +21,10 @@ import java.util.GregorianCalendar;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
+import javax.jcr.Session;
 
 import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.UserJcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.core.execution.PrimitiveAccessor;
 import org.argeo.slc.core.execution.PrimitiveUtils;
@@ -31,23 +48,20 @@ public class SlcJcrUtils implements SlcNames {
 		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 */
@@ -68,11 +82,16 @@ public class SlcJcrUtils implements SlcNames {
 				+ JcrUtils.dateAsPath(now, true) + uuid;
 	}
 
-	/** Create a new execution result path based on the current time */
-	public static String createResultPath(String uuid) {
+	/**
+	 * Create a new execution result path in the user home based on the current
+	 * time
+	 */
+	public static String createResultPath(Session session, String uuid)
+			throws RepositoryException {
 		Calendar now = new GregorianCalendar();
-		return SlcJcrConstants.RESULTS_BASE_PATH + '/'
-				+ JcrUtils.dateAsPath(now, true) + uuid;
+		return UserJcrUtils.getUserHome(session).getPath() + '/'
+				+ SlcNames.SLC_RESULTS + '/' + JcrUtils.dateAsPath(now, true)
+				+ uuid;
 	}
 
 	/**
@@ -174,20 +193,9 @@ public class SlcJcrUtils implements SlcNames {
 					+ node, e);
 		}
 	}
-	
+
 	/** Prevents instantiation */
 	private SlcJcrUtils() {
 
 	}
-
-	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));
-	}
-
 }