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;h=8d6d96784ab64562ea0e2e78b3647d01c9188b3e;hb=699640c58cc0578beebfc3edd00dac9eed65ee0b;hp=cefc67093e3a9476f716fa85fb39845f2ba0ed44;hpb=934f57060b88a81f0f866a65c77f8c6fb4dcf0ff;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 cefc67093..8d6d96784 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
@@ -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.execution;
 
 import java.util.Arrays;
@@ -22,6 +37,7 @@ import org.argeo.slc.core.execution.RefSpecAttribute;
 import org.argeo.slc.core.execution.RefValueChoice;
 import org.argeo.slc.deploy.ModuleDescriptor;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
+import org.argeo.slc.execution.ExecutionModuleDescriptor;
 import org.argeo.slc.execution.ExecutionModulesListener;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionSpec;
@@ -60,38 +76,62 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener,
 			session = repository.login();
 			clearAgent();
 			if (modulesManager != null) {
+				Node agentNode = session.getNode(agent.getNodePath());
+
 				List<ModuleDescriptor> moduleDescriptors = modulesManager
 						.listModules();
+
+				// scan SLC-ExecutionModule metadata
+				for (ModuleDescriptor md : moduleDescriptors) {
+					if (md.getMetadata().containsKey(
+							ExecutionModuleDescriptor.SLC_EXECUTION_MODULE)) {
+						String moduleNodeName = SlcJcrUtils
+								.getModuleNodeName(md);
+						Node moduleNode = agentNode.hasNode(moduleNodeName) ? agentNode
+								.getNode(moduleNodeName) : agentNode
+								.addNode(moduleNodeName);
+						moduleNode.addMixin(SlcTypes.SLC_EXECUTION_MODULE);
+						moduleNode.setProperty(SLC_NAME, md.getName());
+						moduleNode.setProperty(SLC_VERSION, md.getVersion());
+						moduleNode.setProperty(Property.JCR_TITLE,
+								md.getTitle());
+						moduleNode.setProperty(Property.JCR_DESCRIPTION,
+								md.getDescription());
+						moduleNode.setProperty(SLC_STARTED, md.getStarted());
+					}
+				}
+
+				// scan execution modules property
 				String executionModules = System
 						.getProperty(SLC_EXECUTION_MODULES_PROPERTY);
 				if (executionModules != null) {
-					Node agentNode = session.getNode(agent.getNodePath());
 					for (String executionModule : executionModules.split(",")) {
-						allModules: for (ModuleDescriptor moduleDescriptor : moduleDescriptors) {
+						allModules: for (ModuleDescriptor md : moduleDescriptors) {
 							String moduleNodeName = SlcJcrUtils
-									.getModuleNodeName(moduleDescriptor);
-							if (moduleDescriptor.getName().equals(
-									executionModule)) {
+									.getModuleNodeName(md);
+							if (md.getName().equals(executionModule)) {
 								Node moduleNode = agentNode
 										.hasNode(moduleNodeName) ? agentNode
 										.getNode(moduleNodeName) : agentNode
 										.addNode(moduleNodeName);
 								moduleNode
 										.addMixin(SlcTypes.SLC_EXECUTION_MODULE);
-								moduleNode.setProperty(SLC_NAME,
-										moduleDescriptor.getName());
+								moduleNode.setProperty(SLC_NAME, md.getName());
 								moduleNode.setProperty(SLC_VERSION,
-										moduleDescriptor.getVersion());
+										md.getVersion());
 								moduleNode.setProperty(Property.JCR_TITLE,
-										moduleDescriptor.getTitle());
+										md.getTitle());
 								moduleNode.setProperty(
 										Property.JCR_DESCRIPTION,
-										moduleDescriptor.getDescription());
-								moduleNode.setProperty(SLC_STARTED, false);
+										md.getDescription());
+								moduleNode.setProperty(SLC_STARTED,
+										md.getStarted());
 								break allModules;
 							}
 						}
 					}
+
+					// save if needed
 					if (session.hasPendingChanges())
 						session.save();
 				}
@@ -292,8 +332,14 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener,
 				attrNode.addMixin(SlcTypes.SLC_REF_SPEC_ATTRIBUTE);
 				RefSpecAttribute rsa = (RefSpecAttribute) esa;
 				attrNode.setProperty(SLC_TYPE, rsa.getTargetClassName());
+				Object value = rsa.getValue();
 				if (rsa.getChoices() != null) {
+					Integer index = null;
+					int count = 0;
 					for (RefValueChoice choice : rsa.getChoices()) {
+						String name = choice.getName();
+						if (value != null && name.equals(value.toString()))
+							index = count;
 						Node choiceNode = attrNode.addNode(choice.getName());
 						choiceNode.addMixin(NodeType.MIX_TITLE);
 						choiceNode.setProperty(Property.JCR_TITLE,
@@ -302,7 +348,11 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener,
 								&& !choice.getDescription().trim().equals(""))
 							choiceNode.setProperty(Property.JCR_DESCRIPTION,
 									choice.getDescription());
+						count++;
 					}
+
+					if (index != null)
+						attrNode.setProperty(SLC_VALUE, index);
 				}
 			}
 		}
@@ -315,7 +365,7 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener,
 			Node moduleNode = agentNode.getNode(SlcJcrUtils
 					.getModuleNodeName(module));
 			String relativePath = getExecutionFlowRelativePath(executionFlow);
-			if (!moduleNode.hasNode(relativePath))
+			if (moduleNode.hasNode(relativePath))
 				moduleNode.getNode(relativePath).remove();
 			agentNode.getSession().save();
 		} catch (RepositoryException e) {