[dev] use singole applicaitoncontext

atms-api/src/main/resources/applicationContext-activiti.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <import resource="applicationContext-datasource.xml"/>
-
-    <bean id="transactionManagerWorkflow" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-        <property name="dataSource" ref="dataSource"/>
-    </bean>
-
-    <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
-        <property name="dataSource" ref="dataSource"/>
-        <property name="transactionManager" ref="transactionManagerWorkflow"/>
-        <property name="databaseSchemaUpdate" value="true"/>
-        <property name="jobExecutorActivate" value="true"/>
-        <!-- 以下2个是为了防止生成流程图片时出现乱码 -->
-        <property name="activityFontName" value="宋体"/>
-        <property name="labelFontName" value="宋体"/>
-    </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"/>
-    <bean id="historyService" factory-bean="processEngine"
-          factory-method="getHistoryService"/>
-    <bean id="managementService" factory-bean="processEngine"
-          factory-method="getManagementService"/>
-    <bean id="IdentityService" factory-bean="processEngine"
-          factory-method="getIdentityService"/>
-</beans>
\ No newline at end of file

atms-api/src/main/resources/applicationContext.xml

@@ -99,4 +99,34 @@
     <property name="cacheManager" ref="cacheManagerFactory"/>
   </bean>
 
+  <!-- atms activit for workflow-->
+  <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
+    <property name="dataSource" ref="dataSource"/>
+    <property name="transactionManager" ref="transactionManager"/>
+    <property name="databaseSchemaUpdate" value="true"/>
+    <property name="jobExecutorActivate" value="true"/>
+    <!-- 以下2个是为了防止生成流程图片时出现乱码 -->
+    <property name="activityFontName" value="宋体"/>
+    <property name="labelFontName" value="宋体"/>
+  </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"/>
+  <bean id="historyService" factory-bean="processEngine"
+        factory-method="getHistoryService"/>
+  <bean id="managementService" factory-bean="processEngine"
+        factory-method="getManagementService"/>
+  <bean id="IdentityService" factory-bean="processEngine"
+        factory-method="getIdentityService"/>
+
 </beans>
\ No newline at end of file

atms-api/src/main/webapp/WEB-INF/web.xml

@@ -22,7 +22,6 @@
 		classpath:applicationContext.xml
 		classpath:applicationContext-mvc.xml
 		classpath:applicationContext-security.xml
-		classpath:applicationContext-activiti.xml
 		</param-value>
 	</context-param>