From 3963d714e628a2ac4585bfa665e1895064a41da1 Mon Sep 17 00:00:00 2001
From: zenghao <zenghao2010@sina.com>
Date: Sun, 11 Sep 2016 21:40:41 +0800
Subject: [PATCH] =?UTF-8?q?1.0.0=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.settings/org.eclipse.core.resources.prefs    |  6 ------
 .../.settings/org.eclipse.jdt.core.prefs          |  8 --------
 .../.settings/org.eclipse.m2e.core.prefs          |  4 ----
 .../.settings/org.eclipse.wst.common.component    | 15 ---------------
 .../org.eclipse.wst.common.project.facet.core.xml |  7 -------
 .../.settings/org.eclipse.wst.validation.prefs    |  2 --
 6 files changed, 42 deletions(-)
 delete mode 100644 roncoo-pay-web-merchant/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 roncoo-pay-web-merchant/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 roncoo-pay-web-merchant/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 roncoo-pay-web-merchant/.settings/org.eclipse.wst.common.component
 delete mode 100644 roncoo-pay-web-merchant/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 roncoo-pay-web-merchant/.settings/org.eclipse.wst.validation.prefs

diff --git a/roncoo-pay-web-merchant/.settings/org.eclipse.core.resources.prefs b/roncoo-pay-web-merchant/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index e0deee0..0000000
--- a/roncoo-pay-web-merchant/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/main/webapp/jsp/trade/order.jsp=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/roncoo-pay-web-merchant/.settings/org.eclipse.jdt.core.prefs b/roncoo-pay-web-merchant/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 443e085..0000000
--- a/roncoo-pay-web-merchant/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/roncoo-pay-web-merchant/.settings/org.eclipse.m2e.core.prefs b/roncoo-pay-web-merchant/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/roncoo-pay-web-merchant/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/roncoo-pay-web-merchant/.settings/org.eclipse.wst.common.component b/roncoo-pay-web-merchant/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 959e028..0000000
--- a/roncoo-pay-web-merchant/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="roncoo-pay-web-merchant">
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="roncoo-pay-common-core-0.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/roncoo-pay-common-core/roncoo-pay-common-core">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="roncoo-pay-service-0.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/roncoo-pay-service/roncoo-pay-service">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="roncoo-pay-web-merchant"/>
-        <property name="java-output-path" value="/roncoo-pay-web-merchant/target/classes"/>
-    </wb-module>
-</project-modules>
diff --git a/roncoo-pay-web-merchant/.settings/org.eclipse.wst.common.project.facet.core.xml b/roncoo-pay-web-merchant/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index c6144e8..0000000
--- a/roncoo-pay-web-merchant/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.7"/>
-  <installed facet="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>
diff --git a/roncoo-pay-web-merchant/.settings/org.eclipse.wst.validation.prefs b/roncoo-pay-web-merchant/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8c..0000000
--- a/roncoo-pay-web-merchant/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1