resolution of Bug 242: ExecutionFlowGenerator implements Ordered instead of PriorityO...

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/generator/ExecutionFlowGenerator.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/generator/ExecutionFlowGenerator.java
index db1d276d7975fe705daeddae28920648bb893ca7..0269e72994b4cad5202c9997546fd221664a7cc7 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/generator/ExecutionFlowGenerator.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/generator/ExecutionFlowGenerator.java
@@ -15,7 +15,6 @@ import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;\r
 import org.springframework.beans.factory.support.GenericBeanDefinition;\r
 import org.springframework.core.Ordered;\r
-import org.springframework.core.PriorityOrdered;\r
 \r
 /**\r
  * Generates <code>ExecutionFlows</code> and <code>Runnables</code> as\r
@@ -27,7 +26,7 @@ import org.springframework.core.PriorityOrdered;
  * and outputs of a <code>RunnableFactory</code>.\r
  */\r
 public class ExecutionFlowGenerator implements BeanFactoryPostProcessor,\r
-               PriorityOrdered {\r
+               Ordered {\r
        \r
        private final Log log = LogFactory.getLog(getClass());\r
 \r
@@ -65,6 +64,8 @@ public class ExecutionFlowGenerator implements BeanFactoryPostProcessor,
         * <code>RunnableCallFlowDescriptor</code>\r
         */\r
        private String flowBeanNamesPrefix = "";\r
+       \r
+       private int order = Ordered.HIGHEST_PRECEDENCE;\r
                \r
        public void postProcessBeanFactory(\r
                        ConfigurableListableBeanFactory beanFactory) throws BeansException {\r
@@ -136,7 +137,11 @@ public class ExecutionFlowGenerator implements BeanFactoryPostProcessor,
        }\r
        \r
        public int getOrder() {\r
-               return Ordered.HIGHEST_PRECEDENCE;\r
+               return order;\r
+       }\r
+\r
+       public void setOrder(int order) {\r
+               this.order = order;\r
        }\r
 \r
        public void setSource(ExecutionFlowGeneratorSource source) {\r

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 f5d0a3853c46e70e34159b37bae3c30b970d05c8..e8e2bda399659f149a98edd1c7a22034f7cbc3bf 100644 (file)
--- 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
@@ -16,13 +16,12 @@ 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.core.PriorityOrdered;
 import org.springframework.osgi.service.exporter.support.ExportContextClassLoader;
 import org.springframework.osgi.service.exporter.support.OsgiServiceFactoryBean;
 
 @SuppressWarnings(value = { "unchecked" })
 public class MultipleServiceExporterPostProcessor implements
-               BeanFactoryPostProcessor, PriorityOrdered {
+               BeanFactoryPostProcessor, Ordered {
        private final static Log log = LogFactory
                        .getLog(MultipleServiceExporterPostProcessor.class);
 
@@ -31,6 +30,8 @@ public class MultipleServiceExporterPostProcessor implements
        private Class osgiServiceFactoryClass = OsgiServiceFactoryBean.class;
 
        private Boolean useServiceProviderContextClassLoader = false;
+       
+       private int order = Ordered.LOWEST_PRECEDENCE;
 
        public void postProcessBeanFactory(
                        ConfigurableListableBeanFactory beanFactory) throws BeansException {
@@ -83,7 +84,11 @@ public class MultipleServiceExporterPostProcessor implements
        }
 
        public int getOrder() {
-               return Ordered.LOWEST_PRECEDENCE;
+               return order;
+       }
+
+       public void setOrder(int order) {
+               this.order = order;
        }
 
        public void setUseServiceProviderContextClassLoader(