From 39cf2aefa26655ef9d29efba25aed973e401c461 Mon Sep 17 00:00:00 2001
From: Henry Yan <yanhonglei@gmail.com>
Date: Sun, 27 Dec 2015 15:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4spring=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                     | 12 ++----------
 src/main/resources/beans/beans-activiti.xml |  9 +++++++--
 src/main/resources/beans/beans-base.xml     |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index a1ec87b88f..87027f9502 100644
--- a/pom.xml
+++ b/pom.xml
@@ -477,6 +477,8 @@
                     <webAppConfig>
                         <contextPath>/${project.artifactId}</contextPath>
                     </webAppConfig>
+                    <stopKey>kad</stopKey>
+                    <stopPort>9999</stopPort>
                 </configuration>
             </plugin>
 
@@ -497,16 +499,6 @@
                 </configuration>
             </plugin>
 
-            <!-- tomcat6 -->
-            <plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat6-maven-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <path>/${project.artifactId}</path>
-                </configuration>
-            </plugin>
-
             <!-- tomcat7 -->
             <plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
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 @@
 <?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-4.1.xsd">
+       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">
+
+    <context:component-scan
+            base-package="org.activiti.conf,org.activiti.rest.editor,org.activiti.rest.service">
+        <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
+    </context:component-scan>
 
     <!-- 单例json对象 -->
     <bean id="objectMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/>
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 @@
 
     <!-- 使用annotation 自动注册bean, 并保证@Required、@Autowired的属性被注入 -->
     <context:component-scan
-            base-package="me.kafeitu.demo.activiti,org.activiti.conf,org.activiti.rest.editor,org.activiti.rest.service">
+            base-package="me.kafeitu.demo.activiti">
         <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
     </context:component-scan>
 </beans>
\ No newline at end of file