From d81b0749a637ff6eca319b31ed76ca0e8c948f6e Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Mon, 7 Mar 2016 19:47:56 +0800
Subject: [PATCH] =?UTF-8?q?Jetty=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6?=
 =?UTF-8?q?=E5=99=A8=EF=BC=8C=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ationcontext-base.xml => applicationcontext-xxl-job.xml} | 1 +
 xxl-job-client-demo/src/main/webapp/WEB-INF/web.xml         | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename xxl-job-client-demo/src/main/resources/{applicationcontext-base.xml => applicationcontext-xxl-job.xml} (94%)

diff --git a/xxl-job-client-demo/src/main/resources/applicationcontext-base.xml b/xxl-job-client-demo/src/main/resources/applicationcontext-xxl-job.xml
similarity index 94%
rename from xxl-job-client-demo/src/main/resources/applicationcontext-base.xml
rename to xxl-job-client-demo/src/main/resources/applicationcontext-xxl-job.xml
index 52e9cdc3..d48de3dd 100644
--- a/xxl-job-client-demo/src/main/resources/applicationcontext-base.xml
+++ b/xxl-job-client-demo/src/main/resources/applicationcontext-xxl-job.xml
@@ -11,6 +11,7 @@
 
 	<context:component-scan base-package="com.xxl.job.service" />
 
+	<!-- Jetty任务执行器 -->
 	<bean id="xxlJobJettyServer" class="com.xxl.job.client.netcom.jetty.XxlJobJettyServer" init-method="start">
 		<property name="port" value="9999" />
 	</bean>
diff --git a/xxl-job-client-demo/src/main/webapp/WEB-INF/web.xml b/xxl-job-client-demo/src/main/webapp/WEB-INF/web.xml
index 33ab3dac..1c00c952 100644
--- a/xxl-job-client-demo/src/main/webapp/WEB-INF/web.xml
+++ b/xxl-job-client-demo/src/main/webapp/WEB-INF/web.xml
@@ -20,7 +20,8 @@
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 	
-	<!-- Xxl Job Servlet -->
+	<!-- Servlet任务执行器，推荐使用Jetty任务执行器 -->
+	<!-- 
 	<servlet>
 		<servlet-name>XxlJobServlet</servlet-name>
 		<servlet-class>com.xxl.job.client.netcom.servlet.XxlJobServlet</servlet-class>
@@ -29,7 +30,8 @@
 	<servlet-mapping>
 		<servlet-name>XxlJobServlet</servlet-name>
 		<url-pattern>/xxlJobServlet</url-pattern>
-	</servlet-mapping>
+	</servlet-mapping> 
+	-->
 	
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>