Merge remote-tracking branch 'remotes/origin/wmj'

# Conflicts: # .idea/artifacts/GDMS_war_exploded.xml # .idea/libraries/com_hynnet_json_lib_2_4.xml # GDMS.iml
6 years ago · edbfb5aaba
parent 0d4b7338bb
commit edbfb5aaba
1 changed files with 10 additions and 0 deletions
--- a/GDMS.iml
+++ b/GDMS.iml
@ -11,6 +11,16 @@
        </webroots>
      </configuration>
    </facet>
+    <facet type="web" name="Web2">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/web/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/web/web" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
  </component>
  <component name="NewModuleRootManager" inherit-compiler-output="true">
    <exclude-output />