From e367d85c89336a85ca424b8919a7ce5eaf1a5ca3 Mon Sep 17 00:00:00 2001 From: Erik Kimmel <erik.kimmel@inra.fr> Date: Fri, 5 Jul 2019 14:16:00 +0200 Subject: [PATCH] Clean IDE files after a fresh import of the project in IntelliJ. GNP-5426 --- .idea/codeStyles/Project.xml | 18 ------------------ .idea/codeStyles/codeStyleConfig.xml | 6 ------ .idea/compiler.xml | 4 ++-- .idea/gpds.iml | 17 ----------------- .idea/inspectionProfiles/Project_Default.xml | 6 ------ .idea/jsLinters/tslint.xml | 4 ---- .idea/misc.xml | 5 ++--- .idea/modules.xml | 14 ++++++++------ .../{gpds.backend.iml => faidare.backend.iml} | 2 +- ...ckend.main.iml => faidare.backend.main.iml} | 2 +- ...ckend.test.iml => faidare.backend.test.iml} | 6 +++--- .idea/modules/faidare.iml | 12 ++++++++++++ ...{gpds.frontend.iml => faidare.frontend.iml} | 6 +----- .idea/vcs.xml | 1 - backend/src/main/main.iml | 11 +++++++++++ backend/src/test/test.iml | 12 ++++++++++++ 16 files changed, 53 insertions(+), 73 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/gpds.iml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/jsLinters/tslint.xml rename .idea/modules/backend/{gpds.backend.iml => faidare.backend.iml} (87%) rename .idea/modules/backend/{gpds.backend.main.iml => faidare.backend.main.iml} (98%) rename .idea/modules/backend/{gpds.backend.test.iml => faidare.backend.test.iml} (98%) create mode 100644 .idea/modules/faidare.iml rename .idea/modules/frontend/{gpds.frontend.iml => faidare.frontend.iml} (61%) create mode 100644 backend/src/main/main.iml create mode 100644 backend/src/test/test.iml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index ae746ef2..00000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,18 +0,0 @@ -<component name="ProjectCodeStyleConfiguration"> - <code_scheme name="Project" version="173"> - <JSCodeStyleSettings version="0"> - <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" /> - <option name="SPACES_WITHIN_IMPORTS" value="true" /> - </JSCodeStyleSettings> - <TypeScriptCodeStyleSettings version="0"> - <option name="FORCE_SEMICOLON_STYLE" value="true" /> - <option name="USE_DOUBLE_QUOTES" value="false" /> - <option name="FORCE_QUOTE_STYlE" value="true" /> - <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" /> - <option name="SPACES_WITHIN_IMPORTS" value="true" /> - </TypeScriptCodeStyleSettings> - <codeStyleSettings language="TypeScript"> - <option name="RIGHT_MARGIN" value="140" /> - </codeStyleSettings> - </code_scheme> -</component> \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 6e6eec11..00000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,6 +0,0 @@ -<component name="ProjectCodeStyleConfiguration"> - <state> - <option name="USE_PER_PROJECT_SETTINGS" value="true" /> - <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" /> - </state> -</component> \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index e663aa21..677323ac 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,8 +2,8 @@ <project version="4"> <component name="CompilerConfiguration"> <bytecodeTargetLevel> - <module name="gpds.backend.main" target="1.8" /> - <module name="gpds.backend.test" target="1.8" /> + <module name="faidare.backend.main" target="1.8" /> + <module name="faidare.backend.test" target="1.8" /> </bytecodeTargetLevel> </component> </project> \ No newline at end of file diff --git a/.idea/gpds.iml b/.idea/gpds.iml deleted file mode 100644 index 2c7a5660..00000000 --- a/.idea/gpds.iml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id="gpds" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <excludeFolder url="file://$MODULE_DIR$/.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/.idea" /> - <excludeFolder url="file://$MODULE_DIR$/backend/build" /> - <excludeFolder url="file://$MODULE_DIR$/build" /> - <excludeFolder url="file://$MODULE_DIR$/frontend/.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/frontend/dist" /> - <excludeFolder url="file://$MODULE_DIR$/frontend/tmp" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index a291eb15..00000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ -<component name="InspectionProjectProfileManager"> - <profile version="1.0"> - <option name="myName" value="Project Default" /> - <inspection_tool class="TsLint" enabled="true" level="ERROR" enabled_by_default="true" /> - </profile> -</component> diff --git a/.idea/jsLinters/tslint.xml b/.idea/jsLinters/tslint.xml deleted file mode 100644 index 3b034c36..00000000 --- a/.idea/jsLinters/tslint.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="TsLintConfiguration" use-custom-config-file="true" custom-config-file-path="$PROJECT_DIR$/frontend/src/tslint.json" /> -</project> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 975ddc10..e208459b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="JavaScriptSettings"> - <option name="languageLevel" value="ES6" /> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/out" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> </project> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index e9763d12..3b2a562b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,11 +2,13 @@ <project version="4"> <component name="ProjectModuleManager"> <modules> - <module fileurl="file://$PROJECT_DIR$/.idea/gpds.iml" filepath="$PROJECT_DIR$/.idea/gpds.iml" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/backend/gpds.backend.iml" filepath="$PROJECT_DIR$/.idea/modules/backend/gpds.backend.iml" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/backend/gpds.backend.main.iml" filepath="$PROJECT_DIR$/.idea/modules/backend/gpds.backend.main.iml" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/backend/gpds.backend.test.iml" filepath="$PROJECT_DIR$/.idea/modules/backend/gpds.backend.test.iml" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/frontend/gpds.frontend.iml" filepath="$PROJECT_DIR$/.idea/modules/frontend/gpds.frontend.iml" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/faidare.iml" filepath="$PROJECT_DIR$/.idea/modules/faidare.iml" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/backend/faidare.backend.iml" filepath="$PROJECT_DIR$/.idea/modules/backend/faidare.backend.iml" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/backend/faidare.backend.main.iml" filepath="$PROJECT_DIR$/.idea/modules/backend/faidare.backend.main.iml" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/backend/faidare.backend.test.iml" filepath="$PROJECT_DIR$/.idea/modules/backend/faidare.backend.test.iml" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/frontend/faidare.frontend.iml" filepath="$PROJECT_DIR$/.idea/modules/frontend/faidare.frontend.iml" /> + <module fileurl="file://$PROJECT_DIR$/backend/src/main/main.iml" filepath="$PROJECT_DIR$/backend/src/main/main.iml" /> + <module fileurl="file://$PROJECT_DIR$/backend/src/test/test.iml" filepath="$PROJECT_DIR$/backend/src/test/test.iml" /> </modules> </component> -</project> +</project> \ No newline at end of file diff --git a/.idea/modules/backend/gpds.backend.iml b/.idea/modules/backend/faidare.backend.iml similarity index 87% rename from .idea/modules/backend/gpds.backend.iml rename to .idea/modules/backend/faidare.backend.iml index 59529ee0..74f83698 100644 --- a/.idea/modules/backend/gpds.backend.iml +++ b/.idea/modules/backend/faidare.backend.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":backend" external.linked.project.path="$MODULE_DIR$/../../../backend" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="gpds" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":backend" external.linked.project.path="$MODULE_DIR$/../../../backend" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="faidare" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$/../../../backend"> diff --git a/.idea/modules/backend/gpds.backend.main.iml b/.idea/modules/backend/faidare.backend.main.iml similarity index 98% rename from .idea/modules/backend/gpds.backend.main.iml rename to .idea/modules/backend/faidare.backend.main.iml index 394a1953..75e78376 100644 --- a/.idea/modules/backend/gpds.backend.main.iml +++ b/.idea/modules/backend/faidare.backend.main.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":backend:main" external.linked.project.path="$MODULE_DIR$/../../../backend" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="gpds" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":backend:main" external.linked.project.path="$MODULE_DIR$/../../../backend" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="faidare" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="Spring" name="Spring"> <configuration /> diff --git a/.idea/modules/backend/gpds.backend.test.iml b/.idea/modules/backend/faidare.backend.test.iml similarity index 98% rename from .idea/modules/backend/gpds.backend.test.iml rename to .idea/modules/backend/faidare.backend.test.iml index fa6eb121..32d8f78f 100644 --- a/.idea/modules/backend/gpds.backend.test.iml +++ b/.idea/modules/backend/faidare.backend.test.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":backend:test" external.linked.project.path="$MODULE_DIR$/../../../backend" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="gpds" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":backend:test" external.linked.project.path="$MODULE_DIR$/../../../backend" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="faidare" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="Spring" name="Spring"> <configuration /> @@ -20,7 +20,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gpds.backend.main" /> + <orderEntry type="module" module-name="faidare.backend.main" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: org.springframework.boot:spring-boot-configuration-processor:2.1.2.RELEASE" level="project" /> <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-web:2.1.2.RELEASE" level="project" /> <orderEntry type="library" name="Gradle: org.springframework.boot:spring-boot-starter-actuator:2.1.2.RELEASE" level="project" /> @@ -172,5 +172,5 @@ <orderEntry type="library" name="Gradle: org.bouncycastle:bcprov-jdk15on:1.56" level="project" /> <orderEntry type="library" name="Gradle: org.ow2.asm:asm:5.0.4" level="project" /> </component> - <component name="TestModuleProperties" production-module="gpds.backend.main" /> + <component name="TestModuleProperties" production-module="faidare.backend.main" /> </module> \ No newline at end of file diff --git a/.idea/modules/faidare.iml b/.idea/modules/faidare.iml new file mode 100644 index 00000000..eb653de9 --- /dev/null +++ b/.idea/modules/faidare.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id="faidare" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../.."> + <excludeFolder url="file://$MODULE_DIR$/../../.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/../../build" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> \ No newline at end of file diff --git a/.idea/modules/frontend/gpds.frontend.iml b/.idea/modules/frontend/faidare.frontend.iml similarity index 61% rename from .idea/modules/frontend/gpds.frontend.iml rename to .idea/modules/frontend/faidare.frontend.iml index 95dbbe14..5b6e33b6 100644 --- a/.idea/modules/frontend/gpds.frontend.iml +++ b/.idea/modules/frontend/faidare.frontend.iml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":frontend" external.linked.project.path="$MODULE_DIR$/../../../frontend" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="gpds" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":frontend" external.linked.project.path="$MODULE_DIR$/../../../frontend" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="faidare" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$/../../../frontend"> <excludeFolder url="file://$MODULE_DIR$/../../../frontend/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/../../../frontend/build" /> - <excludeFolder url="file://$MODULE_DIR$/../../../frontend/coverage" /> - <excludeFolder url="file://$MODULE_DIR$/../../../frontend/dist" /> - <excludeFolder url="file://$MODULE_DIR$/../../../frontend/karma-junit-tests-report" /> - <excludeFolder url="file://$MODULE_DIR$/../../../frontend/tmp" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 83067447..94a25f7f 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="Git" /> <mapping directory="$PROJECT_DIR$" vcs="Git" /> </component> </project> \ No newline at end of file diff --git a/backend/src/main/main.iml b/backend/src/main/main.iml new file mode 100644 index 00000000..908ad4f5 --- /dev/null +++ b/backend/src/main/main.iml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> \ No newline at end of file diff --git a/backend/src/test/test.iml b/backend/src/test/test.iml new file mode 100644 index 00000000..5ebc6f48 --- /dev/null +++ b/backend/src/test/test.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="true" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="main" /> + </component> +</module> \ No newline at end of file -- GitLab