X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.support.osgi%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fosgi%2FMultipleServiceExporterPostProcessor.java;h=e8e2bda399659f149a98edd1c7a22034f7cbc3bf;hb=b7d8fda867d99f7c6c59a4e3083d2319b043752c;hp=b9e39f86cc6d87ce95b72a5206d1193d41e9f47f;hpb=ee6c3543a0ff9403420ce6a9c647723269f14331;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/MultipleServiceExporterPostProcessor.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/MultipleServiceExporterPostProcessor.java index b9e39f86c..e8e2bda39 100644 --- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/MultipleServiceExporterPostProcessor.java +++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/MultipleServiceExporterPostProcessor.java @@ -6,6 +6,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.argeo.slc.SlcException; import org.springframework.beans.BeansException; import org.springframework.beans.MutablePropertyValues; @@ -13,15 +15,24 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.RootBeanDefinition; +import org.springframework.core.Ordered; +import org.springframework.osgi.service.exporter.support.ExportContextClassLoader; import org.springframework.osgi.service.exporter.support.OsgiServiceFactoryBean; @SuppressWarnings(value = { "unchecked" }) public class MultipleServiceExporterPostProcessor implements - BeanFactoryPostProcessor { + BeanFactoryPostProcessor, Ordered { + private final static Log log = LogFactory + .getLog(MultipleServiceExporterPostProcessor.class); + private List interfaces = new ArrayList(); private Class osgiServiceFactoryClass = OsgiServiceFactoryBean.class; + private Boolean useServiceProviderContextClassLoader = false; + + private int order = Ordered.LOWEST_PRECEDENCE; + public void postProcessBeanFactory( ConfigurableListableBeanFactory beanFactory) throws BeansException { if (!(beanFactory instanceof BeanDefinitionRegistry)) { @@ -29,6 +40,8 @@ public class MultipleServiceExporterPostProcessor implements + BeanDefinitionRegistry.class); } + long begin = System.currentTimeMillis(); + // Merge all beans implementing these interfaces Set beanNames = new HashSet(); for (Class clss : interfaces) { @@ -41,11 +54,25 @@ public class MultipleServiceExporterPostProcessor implements MutablePropertyValues mpv = new MutablePropertyValues(); mpv.addPropertyValue("interfaces", interfaces.toArray()); mpv.addPropertyValue("targetBeanName", beanName); + if (useServiceProviderContextClassLoader) + mpv.addPropertyValue("contextClassLoader", + ExportContextClassLoader.SERVICE_PROVIDER); RootBeanDefinition bd = new RootBeanDefinition( osgiServiceFactoryClass, mpv); + + String exporterBeanName = "osgiService." + beanName; + if (log.isTraceEnabled()) + log.debug("Registering OSGi service exporter " + + exporterBeanName); ((BeanDefinitionRegistry) beanFactory).registerBeanDefinition( - "osgiService." + beanName, bd); + exporterBeanName, bd); } + + long end = System.currentTimeMillis(); + if (log.isTraceEnabled()) + log.debug("Multiple services exported in " + (end - begin) + + " ms in bundle."); + } public void setInterfaces(List interfaces) { @@ -56,4 +83,17 @@ public class MultipleServiceExporterPostProcessor implements this.osgiServiceFactoryClass = osgiServiceFactoryClass; } + public int getOrder() { + return order; + } + + public void setOrder(int order) { + this.order = order; + } + + public void setUseServiceProviderContextClassLoader( + Boolean useServiceProviderContextClassLoader) { + this.useServiceProviderContextClassLoader = useServiceProviderContextClassLoader; + } + }