From d8a7f5aa854e09826ac8bbe7432fa20be3767bf3 Mon Sep 17 00:00:00 2001
From: SammyIsConfused <samantha.fisher@edalex.com>
Date: Wed, 16 Jan 2019 17:09:06 +1100
Subject: [PATCH] Change .gitignore to include parts of .idea folder (#710)

* Change .gitignore to include parts of .idea folder
* Moved to .idea folder and remove modules.xml as its sbt that will create that

#709
---
 .gitignore                           |  2 +-
 .idea/.gitignore                     | 34 +++++++++++++++++++
 .idea/codeStyles/Project.xml         | 14 ++++++++
 .idea/codeStyles/codeStyleConfig.xml |  5 +++
 .idea/compiler.xml                   | 41 +++++++++++++++++++++++
 .idea/encodings.xml                  |  4 +++
 .idea/misc.xml                       |  9 +++++
 .idea/sbt.xml                        | 50 ++++++++++++++++++++++++++++
 .idea/typescript-compiler.xml        |  6 ++++
 9 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/sbt.xml
 create mode 100644 .idea/typescript-compiler.xml

diff --git a/.gitignore b/.gitignore
index 488b38628c..1120564b7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 *.pyc
 *.pmd
 *.iml
-.idea
+
 target/
 build.conf
 generated.keystore
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000000..aad594658d
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,34 @@
+### Intellij ###
+## https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems
+
+/artifacts/
+/httpRequests/
+
+# User-specific stuff:
+/workspace.xml
+/tasks.xml
+/dictionaries
+/vcs.xml
+/jsLibraryMappings.xml
+
+# Sensitive or high-churn files:
+/dataSources.ids
+/dataSources.xml
+/dataSources.local.xml
+/dataSources/
+/sqlDataSources.xml
+/dynamic.xml
+/uiDesigner.xml
+
+## And seeing SBT projects also regenerates .iml module files
+## lets ignore them all:
+/modules/
+/modules.xml
+
+/libraries/
+/sonarlint/
+/scala_compiler.xml
+/hydra.xml
+/inspectionProfiles/Project_Default.xml
+
+### Intellij - END ###
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000000..a0f56d16df
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,14 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="JAVA">
+      <option name="BRACE_STYLE" value="2" />
+      <option name="CLASS_BRACE_STYLE" value="2" />
+      <option name="METHOD_BRACE_STYLE" value="2" />
+      <option name="LAMBDA_BRACE_STYLE" value="2" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="WHILE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000000..79ee123c2b
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000000..2cfc0682b0
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="8">
+      <module name="adminConsoleJar" target="8" />
+      <module name="adminTool" target="8" />
+      <module name="allPlugins" target="8" />
+      <module name="com_equella_admin" target="8" />
+      <module name="com_equella_base" target="8" />
+      <module name="com_equella_core" target="8" />
+      <module name="com_equella_oai" target="8" />
+      <module name="com_equella_reporting" target="8" />
+      <module name="com_equella_serverbase" target="8" />
+      <module name="com_equella_srw" target="8" />
+      <module name="com_equella_z3950" target="8" />
+      <module name="com_tle_common_applet" target="8" />
+      <module name="com_tle_common_inplaceeditor" target="8" />
+      <module name="com_tle_core_guice" target="8" />
+      <module name="com_tle_core_security" target="8" />
+      <module name="com_tle_log4j" target="8" />
+      <module name="com_tle_platform_common" target="8" />
+      <module name="com_tle_platform_equella" target="8" />
+      <module name="com_tle_platform_swing" target="8" />
+      <module name="com_tle_web_adminconsole" target="8" />
+      <module name="com_tle_web_filemanager_applet" target="8" />
+      <module name="com_tle_web_sections" target="8" />
+      <module name="com_tle_webstart_admin" target="8" />
+      <module name="conversion" target="8" />
+      <module name="Equella" target="8" />
+      <module name="equellaserver" target="8" />
+      <module name="filemanagerApplet" target="8" />
+      <module name="inplaceEditorJar" target="8" />
+      <module name="Installer" target="8" />
+      <module name="learningedge_config" target="8" />
+      <module name="org_eclipse_birt_osgi" target="8" />
+      <module name="org_hibernate" target="8" />
+      <module name="UpgradeInstallation" target="8" />
+      <module name="UpgradeManager" target="8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000000..15a15b218a
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000..7cc891e377
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="JSX" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/classes" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/sbt.xml b/.idea/sbt.xml
new file mode 100644
index 0000000000..027b46dd70
--- /dev/null
+++ b/.idea/sbt.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ScalaSbtSettings">
+    <option name="linkedExternalProjectsSettings">
+      <SbtProjectSettings>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/Dev/learningedge-config" />
+            <option value="$PROJECT_DIR$/Installer" />
+            <option value="$PROJECT_DIR$/Platform/Plugins/com.tle.core.guice" />
+            <option value="$PROJECT_DIR$/Platform/Plugins/com.tle.platform.common" />
+            <option value="$PROJECT_DIR$/Platform/Plugins/com.tle.web.sections" />
+            <option value="$PROJECT_DIR$/Source/Plugins" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Admin/com.tle.web.adminconsole" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Admin/com.tle.web.adminconsole/jarsrc" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Admin/com.tle.webstart.admin" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Applet/com.tle.common.applet" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Applet/com.tle.common.inplaceeditor" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Applet/com.tle.web.filemanager.applet" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Applet/com.tle.web.filemanager.applet/appletsrc" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Birt/org.eclipse.birt.osgi" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.admin" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.base" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.core" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.core/jarsrc" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.reporting" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.serverbase" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Generic/org.hibernate" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Logging/com.tle.log4j" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Platform/com.tle.platform.equella" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Platform/com.tle.platform.swing" />
+            <option value="$PROJECT_DIR$/Source/Plugins/RemoteRepositories/com.equella.oai" />
+            <option value="$PROJECT_DIR$/Source/Plugins/RemoteRepositories/com.equella.srw" />
+            <option value="$PROJECT_DIR$/Source/Plugins/RemoteRepositories/com.equella.z3950" />
+            <option value="$PROJECT_DIR$/Source/Plugins/Security/com.tle.core.security" />
+            <option value="$PROJECT_DIR$/Source/Server/adminTool" />
+            <option value="$PROJECT_DIR$/Source/Server/conversion" />
+            <option value="$PROJECT_DIR$/Source/Server/equellaserver" />
+            <option value="$PROJECT_DIR$/Source/Tools/UpgradeInstallation" />
+            <option value="$PROJECT_DIR$/Source/Tools/UpgradeManager" />
+            <option value="$PROJECT_DIR$/project" />
+          </set>
+        </option>
+        <option name="sbtVersion" value="1.1.1" />
+      </SbtProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/typescript-compiler.xml b/.idea/typescript-compiler.xml
new file mode 100644
index 0000000000..1a2fb332ee
--- /dev/null
+++ b/.idea/typescript-compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="TypeScriptCompiler">
+    <option name="recompileOnChanges" value="true" />
+  </component>
+</project>
\ No newline at end of file