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=9e866dfc79051f37f303cb5239d30bb4f7d3dcb3;hb=ce8f53763eec2a2b9e15e97f2eaa8468b551ea31;hp=45eb26f5cffc70d5a5fd7bae994a23fd3fdd8949;hpb=7361a299b9077a1960694bab93a53449bd1f7a1f;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 45eb26f5c..9e866dfc7 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 Argeo GmbH + * + * 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; @@ -7,6 +22,7 @@ import java.util.List; import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.Property; +import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; @@ -21,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; @@ -43,6 +60,7 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, private ExecutionModulesManager modulesManager; + private Repository repository; /** * We don't use a thread bound session because many different threads will * call this critical component and we don't want to login each time. We @@ -54,51 +72,80 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, * LIFECYCLE */ public void init() { - clearAgent(); - if (modulesManager != null) { - List moduleDescriptors = modulesManager - .listModules(); - String executionModules = System - .getProperty(SLC_EXECUTION_MODULES_PROPERTY); - if (executionModules != null) - try { - Node agentNode = session.getNode(agent.getNodePath()); + try { + session = repository.login(); + clearAgent(); + if (modulesManager != null) { + Node agentNode = session.getNode(agent.getNodePath()); + + List 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) { for (String executionModule : executionModules.split(",")) { - 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; } } } - session.save(); - } catch (RepositoryException e) { - JcrUtils.discardQuietly(session); - throw new SlcException("Cannot initialize modules", e); + + // save if needed + if (session.hasPendingChanges()) + session.save(); } + } + } catch (RepositoryException e) { + JcrUtils.discardQuietly(session); + JcrUtils.logoutQuietly(session); + throw new SlcException("Cannot initialize modules", e); } } - public void dispose() { + public void destroy() { clearAgent(); - session.logout(); + JcrUtils.logoutQuietly(session); } protected synchronized void clearAgent() { @@ -116,8 +163,13 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, /* * EXECUTION MODULES LISTENER */ + public synchronized void executionModuleAdded( ModuleDescriptor moduleDescriptor) { + syncExecutionModule(moduleDescriptor); + } + + protected void syncExecutionModule(ModuleDescriptor moduleDescriptor) { try { Node agentNode = session.getNode(agent.getNodePath()); String moduleNodeName = SlcJcrUtils @@ -132,13 +184,12 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, moduleDescriptor.getTitle()); moduleNode.setProperty(Property.JCR_DESCRIPTION, moduleDescriptor.getDescription()); - moduleNode.setProperty(SLC_STARTED, true); + moduleNode.setProperty(SLC_STARTED, moduleDescriptor.getStarted()); session.save(); } catch (RepositoryException e) { JcrUtils.discardQuietly(session); - throw new SlcException("Cannot add module " + moduleDescriptor, e); + throw new SlcException("Cannot sync module " + moduleDescriptor, e); } - } public synchronized void executionModuleRemoved( @@ -192,8 +243,9 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, String relativePath, ExecutionFlowDescriptor efd) throws RepositoryException { Node flowNode = null; - Iterator names = Arrays.asList(relativePath.split("/")) - .iterator(); + List pathTokens = Arrays.asList(relativePath.split("/")); + + Iterator names = pathTokens.iterator(); // create intermediary paths Node currNode = moduleNode; while (names.hasNext()) { @@ -211,16 +263,23 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, // name, description flowNode.setProperty(SLC_NAME, efd.getName()); - String[] tokens = relativePath.split("/"); - flowNode.setProperty(Property.JCR_TITLE, tokens[tokens.length - 1]); + String endName = pathTokens.get(pathTokens.size() - 1); + flowNode.setProperty(Property.JCR_TITLE, endName); if (efd.getDescription() != null - && efd.getDescription().trim().equals("")) + && !efd.getDescription().trim().equals("")) { flowNode.setProperty(Property.JCR_DESCRIPTION, efd.getDescription()); + } else { + flowNode.setProperty(Property.JCR_DESCRIPTION, endName); + } // execution spec ExecutionSpec executionSpec = efd.getExecutionSpec(); String esName = executionSpec.getName(); - if (!(esName == null || esName.equals(ExecutionSpec.INTERNAL_NAME))) { + if (esName == null || esName.equals(ExecutionSpec.INTERNAL_NAME) + || esName.contains("#")/* automatically generated bean name */) { + // internal spec node + mapExecutionSpec(flowNode, executionSpec); + } else { // reference spec node Node executionSpecsNode = moduleNode.hasNode(SLC_EXECUTION_SPECS) ? moduleNode .getNode(SLC_EXECUTION_SPECS) : moduleNode @@ -235,18 +294,18 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, executionSpec.getDescription()); mapExecutionSpec(executionSpecNode, executionSpec); flowNode.setProperty(SLC_SPEC, executionSpecNode); - } else { - // internal spec node - mapExecutionSpec(flowNode, executionSpec); } // values for (String attr : efd.getValues().keySet()) { ExecutionSpecAttribute esa = executionSpec.getAttributes() .get(attr); + if (!flowNode.hasNode(attr)) + throw new SlcException("No spec node for attribute '" + attr + + "' in flow " + flowNode.getPath()); if (esa instanceof PrimitiveSpecAttribute) { PrimitiveSpecAttribute psa = (PrimitiveSpecAttribute) esa; - Node valueNode = flowNode.addNode(attr); + Node valueNode = flowNode.getNode(attr); valueNode.setProperty(SLC_TYPE, psa.getType()); SlcJcrUtils.setPrimitiveAsProperty(valueNode, SLC_VALUE, (PrimitiveValue) efd.getValues().get(attr)); @@ -281,8 +340,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, @@ -291,7 +356,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); } } } @@ -304,7 +373,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) { @@ -338,9 +407,8 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, this.agent = agent; } - /** Expects a non-shared session with admin authorization */ - public void setSession(Session session) { - this.session = session; + public void setRepository(Repository repository) { + this.repository = repository; } public void setModulesManager(ExecutionModulesManager modulesManager) {