activiti6

awesome-admin.iml

@@ -11,6 +11,7 @@
         </descriptors>
         <webroots>
           <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+          <root url="file://$MODULE_DIR$/overlays/org.activiti.activiti-webapp-rest2-6.0.0" relative="/" />
         </webroots>
         <sourceRoots>
           <root url="file://$MODULE_DIR$/src/main/java" />
@@ -52,6 +53,24 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.3.1" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.31" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: com.alibaba:jconsole:1.8.0">
+        <CLASSES>
+          <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/lib/jconsole.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven: com.alibaba:tools:1.8.0">
+        <CLASSES>
+          <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home/lib/tools.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8" level="project" />
     <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
@@ -87,59 +106,97 @@
     <orderEntry type="library" name="Maven: org.jasig.cas.client:cas-client-core:3.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-engine:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-bpmn-converter:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-process-validation:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-image-generator:5.22.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-engine:6.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.4" level="project" />
+    <orderEntry type="library" name="Maven: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Maven: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Maven: de.odysseus.juel:juel-spi:2.2.7" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-spring:5.22.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-secure-tasks:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.h2database:h2:1.3.176" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-spring:6.0.0" level="project" />
     <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
     <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-explorer:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-crystalball:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: com.h2database:h2:1.3.176" level="project" />
-    <orderEntry type="library" name="Maven: org.imgscalr:imgscalr-lib:4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:2.4.5" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-modeler:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-common-rest:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:3.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:fop:0.94" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.avalon.framework:avalon-framework-api:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.avalon.framework:avalon-framework-impl:4.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.7" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-js:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.7" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-rest:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-simple-workflow:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-bpmn-layout:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: org.tinyjee.jgraphx:jgraphx:1.10.4.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-diagram-rest:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-json-converter:5.22.0" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-bpmn-model:5.22.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-bpmn-model:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-bpmn-converter:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-json-converter:6.0.0" level="project" />
     <orderEntry type="library" name="Maven: math.geom2d:javaGeom:0.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.activiti:activiti-cxf:5.22.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-common-rest:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-rest:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:4.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:4.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:4.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-dmn-api:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-dmn-engine:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mvel:mvel2:2.2.6.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.liquibase:liquibase-core:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-dmn-model:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-dmn-xml-converter:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-dmn-json-converter:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-dmn-rest:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-dmn-engine-configurator:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-form-model:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-form-api:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-form-json-converter:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-form-engine:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-form-engine-configurator:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-camel:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring:2.17.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.camel:camel-core:2.17.1" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-mule:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jms:3.2.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mule.tests:mule-tests-functional:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mule:mule-core:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.stephenc.eaio-uuid:uuid:3.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.stephenc.eaio-grabbag:grabbag:1.8.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:1.1" level="project" />
+    <orderEntry type="library" name="Maven: asm:asm-commons:3.1" level="project" />
+    <orderEntry type="library" name="Maven: asm:asm-tree:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mule.mvel:mule-mvel2:2.1.9-MULE-003" level="project" />
+    <orderEntry type="library" name="Maven: org.jgrapht:jgrapht-jdk1.5:0.7.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mule.common:mule-common:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:antlr-runtime:3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mule.modules:mule-module-spring-config:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mule.modules:mule-module-annotations:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:2.2" level="project" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ftpserver:ftpserver-core:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.0.0-M6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ftpserver:ftplet-api:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.sshd:sshd-core:0.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
+    <orderEntry type="library" name="Maven: commons-dbutils:commons-dbutils:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mule:mule-core:test-jar:tests:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-all:1.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-crystalball:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-app-conf:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-webapp-rest2:war:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-cxf:6.0.0" level="project" />
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-xjc:2.2.11" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-bpmn-layout:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.tinyjee.jgraphx:jgraphx:1.10.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-process-validation:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-image-generator:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti5-engine:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti5-spring:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti5-compatibility:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti5-spring-compatibility:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-jmx:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-app-rest:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:activiti-app-logic:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:content-storage-api:6.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.activiti:content-storage-fs:6.0.0" level="project" />
     <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: org.apache.cxf:cxf-api:2.7.6" level="project" />
@@ -217,8 +274,6 @@
     <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.20" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.13" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.7.0" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.7.0" level="project" />
     <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.6.14" level="project" />
@@ -231,7 +286,6 @@
     <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:3.2.2" level="project" />

pom.xml

@@ -26,7 +26,7 @@
         <ehcache-web.version>2.0.4</ehcache-web.version>
         <shiro.version>1.4.0</shiro.version>
         <sitemesh.version>2.4.2</sitemesh.version>
-        <activiti.version>5.22.0</activiti.version>
+        <activiti.version>6.0.0</activiti.version>
 
         <!-- tools version setting -->
         <slf4j.version>1.7.25</slf4j.version>
@@ -439,6 +439,11 @@
             <artifactId>activiti-engine</artifactId>
             <version>${activiti.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-secure-tasks</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-spring</artifactId>
@@ -446,26 +451,22 @@
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
-            <artifactId>activiti-explorer</artifactId>
+            <artifactId>activiti-bpmn-model</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-bpmn-converter</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-json-converter</artifactId>
             <version>${activiti.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>vaadin</artifactId>
-                    <groupId>com.vaadin</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>dcharts-widget</artifactId>
-                    <groupId>org.vaadin.addons</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>activiti-simple-workflow</artifactId>
-                    <groupId>org.activiti</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
-            <artifactId>activiti-modeler</artifactId>
+            <artifactId>activiti-common-rest</artifactId>
             <version>${activiti.version}</version>
         </dependency>
         <dependency>
@@ -475,19 +476,162 @@
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
-            <artifactId>activiti-diagram-rest</artifactId>
+            <artifactId>activiti-dmn-api</artifactId>
             <version>${activiti.version}</version>
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
-            <artifactId>activiti-json-converter</artifactId>
+            <artifactId>activiti-dmn-engine</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-dmn-model</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-dmn-xml-converter</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-dmn-json-converter</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-dmn-rest</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-dmn-engine-configurator</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-form-model</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-form-api</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-form-json-converter</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-form-engine</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-form-engine-configurator</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-camel</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-mule</artifactId>
             <version>${activiti.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-crystalball</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-app-conf</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-webapp-rest2</artifactId>
+            <version>${activiti.version}</version>
+            <type>war</type>
+        </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-cxf</artifactId>
             <version>${activiti.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-bpmn-layout</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-process-validation</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-image-generator</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti5-engine</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti5-spring</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti5-compatibility</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti5-spring-compatibility</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-jmx</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-app-rest</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-app-rest</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-app-logic</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>content-storage-api</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>content-storage-fs</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+
+
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>

src/main/resources/spring/applicationContext.xml

@@ -22,34 +22,8 @@
 
     <import resource="classpath:spring/appDataSource.xml"/>
     <import resource="classpath:spring/appWebService.xml"/>
+    <import resource="classpath:spring/shiro.xml"/>
 
-    <!-- 配置一个shiro框架的过滤器工厂bean，用于创建shiro框架的过滤器 -->
-    <bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean" >
-        <property name="securityManager" ref="securityManager"/>
-        <property name="filters">
-            <util:map>
-                <entry key="shiroCrossFilter" value-ref="shiroCrossFilter"/>
-            </util:map>
-        </property>
-        <property name="loginUrl" value="/#/login"/>
-        <property name="unauthorizedUrl" value="/unauthorized.jsp"/>
-    </bean>
-
-    <bean id="shiroCrossFilter" class="com.izouma.awesomeadmin.shiro.ShiroCrossFilter"/>
-
-    <!-- 注册安全管理器 -->
-    <bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
-        <!-- 注入realm到安全管理器进行密码匹配 -->
-        <property name="realm" ref="BosRealm"/>
-    </bean>
-    <!-- 自定义的realm -->
-    <bean id="BosRealm" class="com.izouma.awesomeadmin.shiro.Bos_realm"/>
-
-
-    <context:component-scan
-            base-package="org.activiti.conf,org.activiti.rest.editor">
-        <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
-    </context:component-scan>
 
     <!-- 单例json对象 -->
     <bean id="objectMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/>
@@ -62,7 +36,6 @@
         <property name="dataSource" ref="dataSource"/>
         <property name="transactionManager" ref="transactionManager"/>
         <property name="databaseSchemaUpdate" value="true"/>
-        <property name="jobExecutorActivate" value="true"/>
     </bean>
 
     <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">

src/main/resources/spring/shiro.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+    <!-- 配置一个shiro框架的过滤器工厂bean，用于创建shiro框架的过滤器 -->
+    <bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
+        <property name="securityManager" ref="securityManager"/>
+        <property name="filters">
+            <util:map>
+                <entry key="shiroCrossFilter" value-ref="shiroCrossFilter"/>
+            </util:map>
+        </property>
+        <property name="loginUrl" value="/#/login"/>
+        <property name="unauthorizedUrl" value="/unauthorized.jsp"/>
+    </bean>
+
+    <bean id="shiroCrossFilter" class="com.izouma.awesomeadmin.shiro.ShiroCrossFilter"/>
+
+    <!-- 注册安全管理器 -->
+    <bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
+        <!-- 注入realm到安全管理器进行密码匹配 -->
+        <property name="realm" ref="BosRealm"/>
+    </bean>
+    <!-- 自定义的realm -->
+    <bean id="BosRealm" class="com.izouma.awesomeadmin.shiro.Bos_realm"/>
+</beans>

src/main/resources/spring/spring-mvc-modeler.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
-
-    <!-- 自动扫描且只扫描@Controller -->
-    <context:component-scan base-package="org.activiti.rest.editor,org.activiti.rest.diagram">
-        <context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
-    </context:component-scan>
-
-    <mvc:annotation-driven/>
-    <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
-</beans>

src/main/resources/spring/spring-mvc-rest.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
-
-    <!-- 自动扫描且只扫描@Controller -->
-    <context:component-scan base-package="org.activiti.rest">
-        <context:include-filter type="annotation" expression="org.springframework.stereotype.Controller" />
-    </context:component-scan>
-
-    <mvc:annotation-driven />
-    <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
-</beans>

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

@@ -71,32 +71,8 @@
         <servlet-name>my-dispatcher</servlet-name>
         <url-pattern>/</url-pattern>
     </servlet-mapping>
-    <servlet>
-        <servlet-name>ModelRestServlet</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <init-param>
-            <param-name>contextConfigLocation</param-name>
-            <param-value>classpath:spring/spring-mvc-modeler.xml</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>ModelRestServlet</servlet-name>
-        <url-pattern>/service/*</url-pattern>
-    </servlet-mapping>
-    <servlet>
-        <servlet-name>RestServlet</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <init-param>
-            <param-name>contextConfigLocation</param-name>
-            <param-value>classpath:spring/spring-mvc-rest.xml</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>RestServlet</servlet-name>
-        <url-pattern>/rest/*</url-pattern>
-    </servlet-mapping>
+
+
     <filter>
         <filter-name>cors</filter-name>
         <filter-class>com.izouma.awesomeadmin.interceptor.CrossFilter</filter-class>