From 2a68a1b57459112b2d13880544ea5da250f08180 Mon Sep 17 00:00:00 2001 From: nscuro Date: Tue, 25 Jul 2023 19:47:12 +0200 Subject: [PATCH 1/2] Use IntelliJ standard directory for run configurations Signed-off-by: nscuro --- .dockerignore | 1 - .gitignore | 7 +++++-- .../runConfigurations}/Build API Server Image.run.xml | 0 {.run => .idea/runConfigurations}/Build API Server.run.xml | 0 .../runConfigurations}/Build Bundled Image.run.xml | 0 {.run => .idea/runConfigurations}/Build Bundled.run.xml | 0 .../runConfigurations}/Compose (w_ MSSQL).run.xml | 0 .../runConfigurations}/Compose (w_ Postgres).run.xml | 0 .../runConfigurations}/DataNucleus Enhance.run.xml | 0 .../runConfigurations}/Jetty with H2 Console.run.xml | 0 {.run => .idea/runConfigurations}/Jetty.run.xml | 0 {.run => .idea/runConfigurations}/Test.run.xml | 0 DEVELOPING.md | 4 ++-- 13 files changed, 7 insertions(+), 5 deletions(-) rename {.run => .idea/runConfigurations}/Build API Server Image.run.xml (100%) rename {.run => .idea/runConfigurations}/Build API Server.run.xml (100%) rename {.run => .idea/runConfigurations}/Build Bundled Image.run.xml (100%) rename {.run => .idea/runConfigurations}/Build Bundled.run.xml (100%) rename {.run => .idea/runConfigurations}/Compose (w_ MSSQL).run.xml (100%) rename {.run => .idea/runConfigurations}/Compose (w_ Postgres).run.xml (100%) rename {.run => .idea/runConfigurations}/DataNucleus Enhance.run.xml (100%) rename {.run => .idea/runConfigurations}/Jetty with H2 Console.run.xml (100%) rename {.run => .idea/runConfigurations}/Jetty.run.xml (100%) rename {.run => .idea/runConfigurations}/Test.run.xml (100%) diff --git a/.dockerignore b/.dockerignore index dac4bc9d91..73cd897d7e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,5 @@ .github/ .idea/ -.run/ docs/ scripts/ src/ diff --git a/.gitignore b/.gitignore index d73962f835..38d75a7f06 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,11 @@ docs/Gemfile.lock target/ .classpath .project -.idea/ .vscode/ # windows -~ \ No newline at end of file +~ + +# IntelliJ +.idea/* +!.idea/runConfigurations/ \ No newline at end of file diff --git a/.run/Build API Server Image.run.xml b/.idea/runConfigurations/Build API Server Image.run.xml similarity index 100% rename from .run/Build API Server Image.run.xml rename to .idea/runConfigurations/Build API Server Image.run.xml diff --git a/.run/Build API Server.run.xml b/.idea/runConfigurations/Build API Server.run.xml similarity index 100% rename from .run/Build API Server.run.xml rename to .idea/runConfigurations/Build API Server.run.xml diff --git a/.run/Build Bundled Image.run.xml b/.idea/runConfigurations/Build Bundled Image.run.xml similarity index 100% rename from .run/Build Bundled Image.run.xml rename to .idea/runConfigurations/Build Bundled Image.run.xml diff --git a/.run/Build Bundled.run.xml b/.idea/runConfigurations/Build Bundled.run.xml similarity index 100% rename from .run/Build Bundled.run.xml rename to .idea/runConfigurations/Build Bundled.run.xml diff --git a/.run/Compose (w_ MSSQL).run.xml b/.idea/runConfigurations/Compose (w_ MSSQL).run.xml similarity index 100% rename from .run/Compose (w_ MSSQL).run.xml rename to .idea/runConfigurations/Compose (w_ MSSQL).run.xml diff --git a/.run/Compose (w_ Postgres).run.xml b/.idea/runConfigurations/Compose (w_ Postgres).run.xml similarity index 100% rename from .run/Compose (w_ Postgres).run.xml rename to .idea/runConfigurations/Compose (w_ Postgres).run.xml diff --git a/.run/DataNucleus Enhance.run.xml b/.idea/runConfigurations/DataNucleus Enhance.run.xml similarity index 100% rename from .run/DataNucleus Enhance.run.xml rename to .idea/runConfigurations/DataNucleus Enhance.run.xml diff --git a/.run/Jetty with H2 Console.run.xml b/.idea/runConfigurations/Jetty with H2 Console.run.xml similarity index 100% rename from .run/Jetty with H2 Console.run.xml rename to .idea/runConfigurations/Jetty with H2 Console.run.xml diff --git a/.run/Jetty.run.xml b/.idea/runConfigurations/Jetty.run.xml similarity index 100% rename from .run/Jetty.run.xml rename to .idea/runConfigurations/Jetty.run.xml diff --git a/.run/Test.run.xml b/.idea/runConfigurations/Test.run.xml similarity index 100% rename from .run/Test.run.xml rename to .idea/runConfigurations/Test.run.xml diff --git a/DEVELOPING.md b/DEVELOPING.md index 2f26c975ea..c69bc57be7 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -24,7 +24,7 @@ There are a few things you'll need on your journey: * Docker (optional) > We provide common [run configurations](https://www.jetbrains.com/help/idea/run-debug-configuration.html) for IntelliJ -> in the [`.run`](./.run) directory for convenience. IntelliJ will automatically pick those up when you open this repository. +> in the [`.idea/runConfigurations`](./.idea/runConfigurations) directory for convenience. IntelliJ will automatically pick those up when you open this repository. ## Core Technologies @@ -84,7 +84,7 @@ mvn jetty:run -P enhance -Dlogback.configurationFile=src/main/docker/logback.xml > Note that the `bundle-ui` profile has no effect using this method. > It works only for the API server, not the bundled distribution. -The above command is also suitable for debugging. For IntelliJ, simply *Debug* the [Jetty](./.run/Jetty.run.xml) run configuration. +The above command is also suitable for debugging. For IntelliJ, simply *Debug* the [Jetty](./.idea/runConfigurations/Jetty.run.xml) run configuration. ### Inspecting the database From bf2d848f079fedfc30d22fa7476216a6fd3c8c8f Mon Sep 17 00:00:00 2001 From: nscuro Date: Tue, 25 Jul 2023 19:47:39 +0200 Subject: [PATCH 2/2] Add IntelliJ project icon Signed-off-by: nscuro --- .gitignore | 1 + .idea/icon.svg | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 .idea/icon.svg diff --git a/.gitignore b/.gitignore index 38d75a7f06..6d373cb939 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ target/ # IntelliJ .idea/* +!.idea/icon.svg !.idea/runConfigurations/ \ No newline at end of file diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 0000000000..f76a7e8959 --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + +