From 6e513eb5db5b19e6bbce4c68a59c2cb98bdbe8fa Mon Sep 17 00:00:00 2001
From: Calvin <calvinxiu@gmail.com>
Date: Thu, 6 Sep 2012 22:39:46 +0800
Subject: [PATCH] =?UTF-8?q?#87=EF=BC=8C=E5=AE=8C=E5=96=84eclipse=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=94=9F=E6=88=90=E6=97=B6=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                  | 6 +-----
 examples/quickstart/pom.xml | 9 +++++++++
 modules/parent/pom.xml      | 9 +++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a4ec37d8..3b5ee5c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,9 @@
 .classpath
 .project
 .springBeans
+.settings/
 target/
 logs/
 eclipse-local.bat
-org.eclipse.jdt.core.prefs
-org.eclipse.wst.common.component
-org.eclipse.wst.common.project.facet.core.xml
-org.springframework.ide.eclipse.*.prefs
 /examples/showcase/bin/yuicompressor-2.4.7.jar
 /support/local-script/
-.settings/
\ No newline at end of file
diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml
index 58c8e452..11f4404c 100644
--- a/examples/quickstart/pom.xml
+++ b/examples/quickstart/pom.xml
@@ -483,6 +483,15 @@
 					<downloadSources>true</downloadSources>
 					<downloadJavadocs>false</downloadJavadocs>
 					<wtpversion>2.0</wtpversion>
+					<!-- 增加设置项目encoding的文件 -->
+					<additionalConfig>
+						<file>
+							<name>.settings/org.eclipse.core.resources.prefs</name>
+							<content>
+					                <![CDATA[eclipse.preferences.version=1${line.separator}encoding/<project>=${project.build.sourceEncoding}${line.separator}]]>
+							</content>
+						</file>
+					</additionalConfig>
 				</configuration>
 			</plugin>
 			
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml
index 6281aa01..bf25f500 100644
--- a/modules/parent/pom.xml
+++ b/modules/parent/pom.xml
@@ -839,6 +839,15 @@
 					<configuration>
 						<downloadSources>true</downloadSources>
 						<downloadJavadocs>false</downloadJavadocs>
+						<!-- 增加设置项目encoding的文件 -->
+						<additionalConfig>
+							<file>
+								<name>.settings/org.eclipse.core.resources.prefs</name>
+								<content>
+						                <![CDATA[eclipse.preferences.version=1${line.separator}encoding/<project>=${project.build.sourceEncoding}${line.separator}]]>
+								</content>
+							</file>
+						</additionalConfig>						
 					</configuration>
 				</plugin>