[jbpm-commits] JBoss JBPM SVN: r6742 - in jbpm3/branches/jbpm-3.2-soa/core/src: test/java/org/jbpm/jbpm1072 and 1 other directory.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-10-05 22:30:07 -0400 (Tue, 05 Oct 2010)
New Revision: 6742

Modified:
   jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
   jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
Log:
remove singleton attribute from jbpm.job.executor bean in default configuration,
allowing JBPM1072Test to launch multiple executors as intended;
JbpmConfiguration records jobExecutor anyway

Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml	2010-10-05 09:27:02 UTC (rev 6741)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml	2010-10-06 02:30:07 UTC (rev 6742)
@@ -88,7 +88,7 @@
     singleton="true" />
 
   <!-- job execution properties -->
-  <bean name="jbpm.job.executor" class="org.jbpm.job.executor.JobExecutor" singleton="true">
+  <bean name="jbpm.job.executor" class="org.jbpm.job.executor.JobExecutor">
     <property name="jbpmConfiguration">
       <ref bean="jbpm.configuration" />
     </property>

Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java	2010-10-05 09:27:02 UTC (rev 6741)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java	2010-10-06 02:30:07 UTC (rev 6742)
@@ -108,10 +108,13 @@
 
   private void startJobExecutors() {
     for (int i = 0; i < jobExecutors.length; i++) {
-      JobExecutor executor = (JobExecutor) JbpmConfiguration.Configs.getObject("jbpm.job.executor");
-      executor.setName(executor.getName() + '/' + i);
-      executor.start();
-      jobExecutors[i] = executor;
+      JobExecutor jobExecutor =
+        (JobExecutor) jbpmContext.getObjectFactory().createObject("jbpm.job.executor");
+      if (i > 0)
+        assert jobExecutor != jobExecutors[i - 1] : "expected " + jobExecutor + " to be unique";
+      jobExecutor.setName(jobExecutor.getName() + '/' + i);
+      jobExecutor.start();
+      jobExecutors[i] = jobExecutor;
     }
   }