From 13cb5e2db313d294a69d0b3792c9b80222ce6c0d Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 25 Feb 2018 14:56:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=83=A8=E7=BD=B2=E5=88=B0to?=
 =?UTF-8?q?mcat=E5=B9=B6=E5=85=BC=E5=AE=B9tomcat7=E4=BB=A5=E4=B8=8A?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parent/pom.xml                                        |  1 +
 web/.settings/.jsdtscope                              |  7 -------
 web/.settings/org.eclipse.jdt.core.prefs              |  5 +++++
 web/.settings/org.eclipse.wst.common.component        | 11 +++++------
 .../org.eclipse.wst.common.project.facet.core.xml     |  4 ++--
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 509a6241..3fde39bf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,6 +41,7 @@
 		
 		<!-- environment setting -->
 		<java.version>1.7</java.version>
+		<servlet-api.version>3.0.1</servlet-api.version>
 		<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
 		<eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs>
 		
diff --git a/web/.settings/.jsdtscope b/web/.settings/.jsdtscope
index 5cee5ac3..22fee43f 100644
--- a/web/.settings/.jsdtscope
+++ b/web/.settings/.jsdtscope
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="WebContent"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
 	<classpathentry kind="output" path=""/>
 </classpath>
diff --git a/web/.settings/org.eclipse.jdt.core.prefs b/web/.settings/org.eclipse.jdt.core.prefs
index 6e80039d..13b3428a 100644
--- a/web/.settings/org.eclipse.jdt.core.prefs
+++ b/web/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component
index 59af4571..2b3efda6 100644
--- a/web/.settings/org.eclipse.wst.common.component
+++ b/web/.settings/org.eclipse.wst.common.component
@@ -15,13 +15,12 @@
         <dependent-module archiveName="jeesite-module-devtools-4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jeesite-module-devtools/jeesite-module-devtools">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-    <property name="context-root" value="jeesite-web"/>
-    <wb-resource deploy-path="/" source-path="src/main/webapp"/>
-    <property name="java-output-path" value="/src/main/webapp/WEB-INF/classes"/>
         <property name="component.exclusion.patterns"/>
-    <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
-    <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <property name="java-output-path" value="/src/main/webapp/WEB-INF/classes"/>
+        <property name="context-root" value="js"/>
+		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
+		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
   </wb-module>
 </project-modules>
diff --git a/web/.settings/org.eclipse.wst.common.project.facet.core.xml b/web/.settings/org.eclipse.wst.common.project.facet.core.xml
index 05642433..9bd9e6f7 100644
--- a/web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <fixed facet="jst.java"/>
   <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="3.1"/>
+  <fixed facet="jst.java"/>
   <installed facet="jst.java" version="1.8"/>
+  <installed facet="jst.web" version="3.0"/>
 </faceted-project>