Also cache bundle metadata

git-svn-id: https://svn.argeo.org/slc/trunk@2844 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java
index 9fb09bebf588ea6fe071ac31d71b41760b87f4c6..50b76fa4764c06abeb2460a03a0b8b765d41818f 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java
@@ -15,6 +15,9 @@ public class OsgiBundle extends BasicNameVersion implements Module {
 
        private Long internalBundleId;
 
+       private String label;
+       private String description;
+
        public OsgiBundle() {
 
        }
@@ -77,4 +80,20 @@ public class OsgiBundle extends BasicNameVersion implements Module {
                this.internalBundleId = internalBundleId;
        }
 
+       public String getLabel() {
+               return label;
+       }
+
+       public void setLabel(String label) {
+               this.label = label;
+       }
+
+       public String getDescription() {
+               return description;
+       }
+
+       public void setDescription(String description) {
+               this.description = description;
+       }
+
 }

diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
index ca8fabaeee77e830b75dee88aff9ba1223e913b8..b2038b928b859083531119973b9b57bf9485dbbc 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
@@ -12,6 +12,7 @@ import java.util.Set;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.build.BasicNameVersion;
 import org.argeo.slc.core.execution.AbstractExecutionModulesManager;
 import org.argeo.slc.core.execution.DefaultExecutionFlowDescriptorConverter;
 import org.argeo.slc.deploy.ModuleDescriptor;
@@ -48,12 +49,33 @@ public class OsgiExecutionModulesManager extends
        private Boolean useCachedServices = Boolean.parseBoolean(System
                        .getProperty(PROPERTY_CACHE_SERVICES, "true"));
 
-       public ExecutionModuleDescriptor getExecutionModuleDescriptor(
+       public synchronized ExecutionModuleDescriptor getExecutionModuleDescriptor(
                        String moduleName, String version) {
                ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();
-               md.setName(moduleName);
-               md.setVersion(version);
-               setMetadataFromBundle(md, null);
+               if (useCachedServices) {
+                       OsgiBundle osgiBundle = null;
+                       BasicNameVersion nameVersion = new BasicNameVersion(moduleName,
+                                       version);
+                       bundles: for (Iterator<OsgiBundle> iterator = executionContexts
+                                       .keySet().iterator(); iterator.hasNext();) {
+                               OsgiBundle ob = iterator.next();
+                               if (ob.equals(nameVersion)) {
+                                       osgiBundle = ob;
+                                       break bundles;
+                               }
+                       }
+                       if (osgiBundle == null)
+                               throw new SlcException("No execution module registered for "
+                                               + nameVersion);
+                       md.setName(osgiBundle.getName());
+                       md.setVersion(osgiBundle.getVersion());
+                       md.setLabel(osgiBundle.getLabel());
+                       md.setDescription(osgiBundle.getDescription());
+               } else {
+                       md.setName(moduleName);
+                       md.setVersion(version);
+                       setMetadataFromBundle(md, null);
+               }
                ExecutionFlowDescriptorConverter executionFlowDescriptorConverter = getExecutionFlowDescriptorConverter(
                                moduleName, version);
                if (executionFlowDescriptorConverter == null)
@@ -321,6 +343,10 @@ public class OsgiExecutionModulesManager extends
                if (service instanceof ExecutionContext) {
                        ExecutionContext executionContext = (ExecutionContext) service;
                        OsgiBundle osgiBundle = asOsgiBundle(properties);
+                       Bundle bundle = bundlesManager.findRelatedBundle(osgiBundle);
+                       osgiBundle.setLabel(getHeaderSafe(bundle, Constants.BUNDLE_NAME));
+                       osgiBundle.setDescription(getHeaderSafe(bundle,
+                                       Constants.BUNDLE_DESCRIPTION));
                        executionContexts.put(osgiBundle, executionContext);
                        if (log.isTraceEnabled())
                                log.debug("Registered execution context from " + osgiBundle);
@@ -364,10 +390,16 @@ public class OsgiExecutionModulesManager extends
                        ExecutionFlow executionFlow = (ExecutionFlow) service;
                        OsgiBundle osgiBundle = asOsgiBundle(properties);
                        if (executionFlows.containsKey(osgiBundle)) {
-                               executionFlows.get(osgiBundle).remove(executionFlow);
+                               Set flows = executionFlows.get(osgiBundle);
+                               flows.remove(executionFlow);
                                if (log.isTraceEnabled())
                                        log.debug("Removed " + executionFlow + " from "
                                                        + osgiBundle);
+                               if (flows.size() == 0) {
+                                       executionFlows.remove(osgiBundle);
+                                       if (log.isTraceEnabled())
+                                               log.debug("Removed flows set from " + osgiBundle);
+                               }
                        }
                } else if (service instanceof ExecutionFlowDescriptorConverter) {
                        OsgiBundle osgiBundle = asOsgiBundle(properties);