From 37682f9bc1dec479dd6841136ab64e44464c5566 Mon Sep 17 00:00:00 2001
From: wan <2499498893@qq.com>
Date: Wed, 16 Jan 2019 10:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/artifacts/gdms_Web_exploded.xml |  1 -
 .idea/libraries/lib.xml               | 10 --------
 GDMS.iml                              | 34 ++++-----------------------
 3 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 .idea/libraries/lib.xml

diff --git a/.idea/artifacts/gdms_Web_exploded.xml b/.idea/artifacts/gdms_Web_exploded.xml
index b9e2056..5930894 100644
--- a/.idea/artifacts/gdms_Web_exploded.xml
+++ b/.idea/artifacts/gdms_Web_exploded.xml
@@ -6,7 +6,6 @@
         <element id="directory" name="classes" />
         <element id="directory" name="lib">
           <element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar" />
-          <element id="library" level="project" name="lib" />
         </element>
       </element>
     </root>
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
deleted file mode 100644
index 2310603..0000000
--- a/.idea/libraries/lib.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="lib">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/web/WEB-INF/lib" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/web/WEB-INF/lib" recursive="false" />
-  </library>
-</component>
\ No newline at end of file
diff --git a/GDMS.iml b/GDMS.iml
index 40139c3..54dddf7 100644
--- a/GDMS.iml
+++ b/GDMS.iml
@@ -4,46 +4,22 @@
     <facet type="web" name="Web">
       <configuration>
         <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/WEB-INF/web.xml" />
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/out/artifacts/GDMS_war_exploded/WEB-INF/classes/conf/web.xml" />
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/out/artifacts/GDMS_war_exploded/WEB-INF/classes/conf/web/WEB-INF/web.xml" />
         </descriptors>
         <webroots>
-          <root url="file://$MODULE_DIR$/web" relative="/" />
+          <root url="file://$MODULE_DIR$/out/artifacts/GDMS_war_exploded/WEB-INF/classes/conf" relative="/WEB-INF" />
         </webroots>
-        <sourceRoots />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/src/servlet" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="file://C:/Program Files/Apache Software Foundation/Tomcat 8.5" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://C:/Program Files/Apache Software Foundation/Tomcat 8.5/webapps/docs/appdev/sample/src" />
-          <root url="file://C:/Program Files/Apache Software Foundation/Tomcat 8.5/work/Catalina/localhost/ROOT" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="library" exported="" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="mariadb-java-client-2.3.0" level="project" />
   </component>
 </module>
\ No newline at end of file