Fix for Hudson. Also reactivated JobQueryTest as it is probably already fixed before.

modules/activiti-engine/pom.xml

@@ -110,7 +110,6 @@
           <excludes>
             <exclude>**/*TestCase.java</exclude>
             <exclude>**/CompetingJobAcquisitionTest.java</exclude> <!-- http://jira.codehaus.org/browse/ACT-234 -->
-            <exclude>**/JobQueryTest.java</exclude> <!-- http://jira.codehaus.org/browse/ACT-299 -->
             <exclude>**/WSDLImporterTest.java</exclude> <!-- http://jira.codehaus.org/browse/ACT-315 -->
           </excludes>
         </configuration>

modules/activiti-spring/pom.xml

@@ -174,7 +174,6 @@
                 <exclude>**/*TestCase.java</exclude>
                 <exclude>**/ActivitiRuleJunit4Test.java</exclude><!-- Can't run in Spring since ActivitiRule must be used different in Spring -->
 		            <exclude>**/CompetingJobAcquisitionTest.java</exclude> <!-- http://jira.codehaus.org/browse/ACT-234 -->
-		            <exclude>**/JobQueryTest.java</exclude> <!-- http://jira.codehaus.org/browse/ACT-299 -->
                 <exclude>**/WSDLImporterTest.java</exclude> <!-- http://jira.codehaus.org/browse/ACT-315 -->
               </excludes>
             </configuration>

modules/activiti-spring/src/test/resources/org/activiti/spring/test/autodeployment/SpringAutoDeployTest-context.xml

@@ -23,13 +23,17 @@
     <property name="dataSource" ref="dataSource" />
   </bean>
   
-  <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
+  <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
     <property name="databaseType" value="h2" />
     <property name="dataSource" ref="dataSource" />
     <property name="transactionManager" ref="transactionManager" />
     <property name="dbSchemaStrategy" value="create-if-necessary" />
     <property name="jobExecutorActivate" value="false" />
-    <property name="deploymentResources" value="classpath*:/org/activiti/spring/test/autodeployment/autodeploy.*.bpmn20.xml" />
+    <property name="deploymentResources" value="classpath*:/org/activiti/spring/test/autodeployment/autodeploy.*.bpmn20.xml" /> 
+  </bean>
+  
+  <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
+    <property name="processEngineConfiguration" ref="processEngineConfiguration" />
   </bean>
 
   <bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService" />

modules/activiti-spring/src/test/resources/org/activiti/spring/test/autodeployment/SpringAutoDeployTest-no-drop-context.xml

@@ -23,15 +23,19 @@
     <property name="dataSource" ref="dataSource" />
   </bean>
   
-  <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
+  <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
     <property name="databaseType" value="h2" />
     <property name="dataSource" ref="dataSource" />
     <property name="transactionManager" ref="transactionManager" />
-    <property name="dbSchemaStrategy" value="check-version" />
+    <property name="dbSchemaStrategy" value="create-if-necessary" />
     <property name="jobExecutorActivate" value="false" />
     <property name="deploymentResources" value="classpath*:/org/activiti/spring/test/autodeployment/autodeploy.*.bpmn20.xml" />
   </bean>
 
+  <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
+    <property name="processEngineConfiguration" ref="processEngineConfiguration" />
+  </bean>
+  
   <bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService" />
   <bean id="runtimeService" factory-bean="processEngine" factory-method="getRuntimeService" />
   <bean id="taskService" factory-bean="processEngine" factory-method="getTaskService" />

modules/activiti-spring/src/test/resources/org/activiti/spring/test/junit4/springTypicalUsageTest-context.xml

@@ -27,7 +27,8 @@
     <property name="databaseType" value="h2" />
     <property name="dataSource" ref="dataSource" />
     <property name="transactionManager" ref="transactionManager" />
-    <property name="dbSchemaStrategy" value="drop-create" />
+    <property name="dbSchemaStrategy" value="create-if-necessary" />
+    <property name="jobExecutorActivate" value="false" />
   </bean>
   
   <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">

modules/activiti-spring/src/test/resources/org/activiti/spring/test/servicetask/servicetaskSpringTest-context.xml

@@ -38,14 +38,18 @@
     <property name="dataSource" ref="dataSource" />
   </bean>
   
-  <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
+  <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
     <property name="databaseType" value="h2" />
     <property name="dataSource" ref="dataSource" />
     <property name="transactionManager" ref="transactionManager" />
     <property name="dbSchemaStrategy" value="create-if-necessary" />
     <property name="jobExecutorActivate" value="false" />
   </bean>
-
+  
+  <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
+    <property name="processEngineConfiguration" ref="processEngineConfiguration" />
+  </bean>
+  
   <bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService" />
   <bean id="runtimeService" factory-bean="processEngine" factory-method="getRuntimeService" />
   <bean id="taskService" factory-bean="processEngine" factory-method="getTaskService" />

modules/activiti-spring/src/test/resources/org/activiti/spring/test/taskassignment/taskassignment-context.xml

@@ -30,6 +30,7 @@
     <property name="dataSource" ref="dataSource" />
     <property name="transactionManager" ref="transactionManager" />
     <property name="dbSchemaStrategy" value="create-if-necessary" />
+    <property name="jobExecutorActivate" value="false" />
   </bean>
   
   <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">

modules/activiti-spring/src/test/resources/org/activiti/spring/test/transaction/SpringTransactionIntegrationTest-context.xml

@@ -23,12 +23,16 @@
     <property name="dataSource" ref="dataSource" />
   </bean>
   
-  <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
+  <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
     <property name="databaseType" value="h2" />
     <property name="dataSource" ref="dataSource" />
     <property name="transactionManager" ref="transactionManager" />
-    <property name="jobExecutorActivate" value="false" />
     <property name="dbSchemaStrategy" value="create-if-necessary" />
+    <property name="jobExecutorActivate" value="false" />
+  </bean>
+  
+  <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
+    <property name="processEngineConfiguration" ref="processEngineConfiguration" />
   </bean>
   
   <bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService" />