package org.argeo.slc.deploy;
import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
import org.argeo.slc.BasicNameVersion;
private static final long serialVersionUID = 4310820315478645419L;
private String title;
private String description;
+ private Map<String, String> metadata = new HashMap<String, String>();
+ private Boolean started = false;
public String getTitle() {
return title;
this.title = label;
}
+ public Map<String, String> getMetadata() {
+ return metadata;
+ }
+
+ public void setMetadata(Map<String, String> metadata) {
+ this.metadata = metadata;
+ }
+
+ public Boolean getStarted() {
+ return started;
+ }
+
+ public void setStarted(Boolean started) {
+ this.started = started;
+ }
+
}
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.jcr.ArgeoNames;
import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.core.execution.PrimitiveSpecAttribute;
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;
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();
}
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
import org.osgi.framework.launch.Framework;
+import org.springframework.context.ApplicationContext;
import org.springframework.osgi.service.importer.OsgiServiceLifecycleListener;
/** Execution modules manager implementation based on an OSGi runtime. */
Bundle bundle = bundlesManager.findRelatedBundle(new OsgiBundle(
nameVersion));
bundlesManager.startSynchronous(bundle);
- } catch (BundleException e) {
+ boolean isSpringInstrumented = bundle.getEntryPaths(
+ "/META-INF/spring").hasMoreElements()
+ || bundle.getHeaders().get("Spring-Context") == null;
+ if (isSpringInstrumented) {
+ // Wait for Spring application context to be ready
+ String filter = "(Bundle-SymbolicName="
+ + bundle.getSymbolicName() + ")";
+ try {
+ bundlesManager.getServiceRefSynchronous(
+ ApplicationContext.class.getName(), filter);
+ } catch (Exception e) {
+ // stop if application context not found
+ bundle.stop();
+ throw e;
+ }
+ }
+ } catch (Exception e) {
throw new SlcException("Cannot start " + nameVersion, e);
}
}
md.setVersion(getHeaderSafe(bdl, Constants.BUNDLE_VERSION));
md.setTitle(getHeaderSafe(bdl, Constants.BUNDLE_NAME));
md.setDescription(getHeaderSafe(bdl, Constants.BUNDLE_DESCRIPTION));
+
+ // copy manifets header to meta data
+ Dictionary<?, ?> headers = bundle.getHeaders();
+ Enumeration<?> keys = headers.keys();
+ while (keys.hasMoreElements()) {
+ Object key = keys.nextElement();
+ Object value = headers.get(key);
+ if (value != null)
+ md.getMetadata().put(key.toString(), value.toString());
+ }
+
+ // check if started
+ if (bundle.getState() == Bundle.ACTIVE
+ || bundle.getState() == Bundle.STARTING)
+ md.setStarted(true);
+ else
+ md.setStarted(false);
}
private String getHeaderSafe(Bundle bundle, Object key) {