diff --git a/pom.xml b/pom.xml index a1ec87b88f..87027f9502 100644 --- a/pom.xml +++ b/pom.xml @@ -477,6 +477,8 @@ /${project.artifactId} + kad + 9999 @@ -497,16 +499,6 @@ - - - org.apache.tomcat.maven - tomcat6-maven-plugin - 2.2 - - /${project.artifactId} - - - org.apache.tomcat.maven diff --git a/src/main/resources/beans/beans-activiti.xml b/src/main/resources/beans/beans-activiti.xml index 3542ec1db7..8ae204b0d7 100644 --- a/src/main/resources/beans/beans-activiti.xml +++ b/src/main/resources/beans/beans-activiti.xml @@ -1,7 +1,12 @@ + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + + + diff --git a/src/main/resources/beans/beans-base.xml b/src/main/resources/beans/beans-base.xml index 1ccd12cc7b..54c910f428 100644 --- a/src/main/resources/beans/beans-base.xml +++ b/src/main/resources/beans/beans-base.xml @@ -14,7 +14,7 @@ + base-package="me.kafeitu.demo.activiti"> \ No newline at end of file