diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/file/PlanFiles.java b/Plan/common/src/main/java/com/djrapitops/plan/system/file/PlanFiles.java index f2d561988..7a46ed807 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/file/PlanFiles.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/file/PlanFiles.java @@ -91,11 +91,11 @@ public class PlanFiles implements SubSystem { /** * Get a file in the jar as a {@link Resource}. * - * @param resourceName Path to the file inside jar/assets/ folder. + * @param resourceName Path to the file inside jar/assets/plan/ folder. * @return a {@link Resource} for accessing the resource. */ public Resource getResourceFromJar(String resourceName) { - return new JarResource("assets/" + resourceName, () -> plugin.getResource("assets/" + resourceName)); + return new JarResource("assets/plan/" + resourceName, () -> plugin.getResource("assets/plan/" + resourceName)); } /** diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ConfigSystem.java b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ConfigSystem.java index 6572b8ca3..128dd0171 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ConfigSystem.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ConfigSystem.java @@ -84,7 +84,7 @@ public abstract class ConfigSystem implements SubSystem { setDebugMode(); } } catch (IOException e) { - throw new EnableException("Failed to save default config.", e); + throw new EnableException("Failed to save default config: " + e.getMessage(), e); } theme.enable(); } diff --git a/Plan/common/src/main/resources/assets/DefaultServerInfoFile.yml b/Plan/common/src/main/resources/assets/plan/DefaultServerInfoFile.yml similarity index 100% rename from Plan/common/src/main/resources/assets/DefaultServerInfoFile.yml rename to Plan/common/src/main/resources/assets/plan/DefaultServerInfoFile.yml diff --git a/Plan/common/src/main/resources/assets/bungeeconfig.yml b/Plan/common/src/main/resources/assets/plan/bungeeconfig.yml similarity index 100% rename from Plan/common/src/main/resources/assets/bungeeconfig.yml rename to Plan/common/src/main/resources/assets/plan/bungeeconfig.yml diff --git a/Plan/common/src/main/resources/assets/config.yml b/Plan/common/src/main/resources/assets/plan/config.yml similarity index 100% rename from Plan/common/src/main/resources/assets/config.yml rename to Plan/common/src/main/resources/assets/plan/config.yml diff --git a/Plan/common/src/main/resources/assets/locale/locale_CN.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_CN.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_CN.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_CN.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_CZ.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_CZ.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_CZ.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_CZ.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_DE.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_DE.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_DE.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_DE.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_EN.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_EN.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_EN.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_EN.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_FI.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_FI.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_FI.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_FI.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_FR.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_FR.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_FR.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_FR.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_FR_old.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_FR_old.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_FR_old.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_FR_old.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_GA.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_GA.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_GA.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_GA.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_IT.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_IT.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_IT.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_IT.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_IT_old.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_IT_old.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_IT_old.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_IT_old.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_NL.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_NL.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_NL.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_NL.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_NO.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_NO.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_NO.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_NO.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_PL.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_PL.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_PL.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_PL.txt diff --git a/Plan/common/src/main/resources/assets/locale/locale_PT.txt b/Plan/common/src/main/resources/assets/plan/locale/locale_PT.txt similarity index 100% rename from Plan/common/src/main/resources/assets/locale/locale_PT.txt rename to Plan/common/src/main/resources/assets/plan/locale/locale_PT.txt diff --git a/Plan/common/src/main/resources/assets/themes/greyscale.yml b/Plan/common/src/main/resources/assets/plan/themes/greyscale.yml similarity index 100% rename from Plan/common/src/main/resources/assets/themes/greyscale.yml rename to Plan/common/src/main/resources/assets/plan/themes/greyscale.yml diff --git a/Plan/common/src/main/resources/assets/themes/mute.yml b/Plan/common/src/main/resources/assets/plan/themes/mute.yml similarity index 100% rename from Plan/common/src/main/resources/assets/themes/mute.yml rename to Plan/common/src/main/resources/assets/plan/themes/mute.yml diff --git a/Plan/common/src/main/resources/assets/themes/pastel.yml b/Plan/common/src/main/resources/assets/plan/themes/pastel.yml similarity index 100% rename from Plan/common/src/main/resources/assets/themes/pastel.yml rename to Plan/common/src/main/resources/assets/plan/themes/pastel.yml diff --git a/Plan/common/src/main/resources/assets/themes/sepia.yml b/Plan/common/src/main/resources/assets/plan/themes/sepia.yml similarity index 100% rename from Plan/common/src/main/resources/assets/themes/sepia.yml rename to Plan/common/src/main/resources/assets/plan/themes/sepia.yml diff --git a/Plan/common/src/main/resources/assets/themes/soft.yml b/Plan/common/src/main/resources/assets/plan/themes/soft.yml similarity index 100% rename from Plan/common/src/main/resources/assets/themes/soft.yml rename to Plan/common/src/main/resources/assets/plan/themes/soft.yml diff --git a/Plan/common/src/main/resources/assets/themes/theme.yml b/Plan/common/src/main/resources/assets/plan/themes/theme.yml similarity index 100% rename from Plan/common/src/main/resources/assets/themes/theme.yml rename to Plan/common/src/main/resources/assets/plan/themes/theme.yml diff --git a/Plan/common/src/main/resources/assets/web/css/main.css b/Plan/common/src/main/resources/assets/plan/web/css/main.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/css/main.css rename to Plan/common/src/main/resources/assets/plan/web/css/main.css diff --git a/Plan/common/src/main/resources/assets/web/css/materialize.css b/Plan/common/src/main/resources/assets/plan/web/css/materialize.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/css/materialize.css rename to Plan/common/src/main/resources/assets/plan/web/css/materialize.css diff --git a/Plan/common/src/main/resources/assets/web/css/style.css b/Plan/common/src/main/resources/assets/plan/web/css/style.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/css/style.css rename to Plan/common/src/main/resources/assets/plan/web/css/style.css diff --git a/Plan/common/src/main/resources/assets/web/css/style.min.css b/Plan/common/src/main/resources/assets/plan/web/css/style.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/css/style.min.css rename to Plan/common/src/main/resources/assets/plan/web/css/style.min.css diff --git a/Plan/common/src/main/resources/assets/web/css/themes/all-themes.css b/Plan/common/src/main/resources/assets/plan/web/css/themes/all-themes.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/css/themes/all-themes.css rename to Plan/common/src/main/resources/assets/plan/web/css/themes/all-themes.css diff --git a/Plan/common/src/main/resources/assets/web/css/themes/all-themes.min.css b/Plan/common/src/main/resources/assets/plan/web/css/themes/all-themes.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/css/themes/all-themes.min.css rename to Plan/common/src/main/resources/assets/plan/web/css/themes/all-themes.min.css diff --git a/Plan/common/src/main/resources/assets/web/error.html b/Plan/common/src/main/resources/assets/plan/web/error.html similarity index 100% rename from Plan/common/src/main/resources/assets/web/error.html rename to Plan/common/src/main/resources/assets/plan/web/error.html diff --git a/Plan/common/src/main/resources/assets/web/favicon.ico b/Plan/common/src/main/resources/assets/plan/web/favicon.ico similarity index 100% rename from Plan/common/src/main/resources/assets/web/favicon.ico rename to Plan/common/src/main/resources/assets/plan/web/favicon.ico diff --git a/Plan/common/src/main/resources/assets/web/js/admin.js b/Plan/common/src/main/resources/assets/plan/web/js/admin.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/admin.js rename to Plan/common/src/main/resources/assets/plan/web/js/admin.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/activityPie.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/activityPie.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/activityPie.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/activityPie.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/diskGraph.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/diskGraph.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/diskGraph.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/diskGraph.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/healthGauge.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/healthGauge.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/healthGauge.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/healthGauge.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/horizontalBarGraph.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/horizontalBarGraph.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/horizontalBarGraph.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/horizontalBarGraph.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/lineGraph.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/lineGraph.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/lineGraph.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/lineGraph.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/onlineActivityCalendar.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/onlineActivityCalendar.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/onlineActivityCalendar.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/onlineActivityCalendar.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/performanceGraph.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/performanceGraph.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/performanceGraph.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/performanceGraph.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/playerGraph.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/playerGraph.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/playerGraph.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/playerGraph.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/playerGraphNoNav.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/playerGraphNoNav.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/playerGraphNoNav.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/playerGraphNoNav.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/punchCard.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/punchCard.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/punchCard.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/punchCard.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/resourceGraph.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/resourceGraph.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/resourceGraph.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/resourceGraph.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/serverPie.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/serverPie.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/serverPie.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/serverPie.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/sessionCalendar.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/sessionCalendar.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/sessionCalendar.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/sessionCalendar.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/stackGraph.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/stackGraph.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/stackGraph.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/stackGraph.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/tpsGraph.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/tpsGraph.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/tpsGraph.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/tpsGraph.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/worldGraph.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/worldGraph.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/worldGraph.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/worldGraph.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/worldMap.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/worldMap.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/worldMap.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/worldMap.js diff --git a/Plan/common/src/main/resources/assets/web/js/charts/worldPie.js b/Plan/common/src/main/resources/assets/plan/web/js/charts/worldPie.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/charts/worldPie.js rename to Plan/common/src/main/resources/assets/plan/web/js/charts/worldPie.js diff --git a/Plan/common/src/main/resources/assets/web/js/demo.js b/Plan/common/src/main/resources/assets/plan/web/js/demo.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/demo.js rename to Plan/common/src/main/resources/assets/plan/web/js/demo.js diff --git a/Plan/common/src/main/resources/assets/web/js/helpers.js b/Plan/common/src/main/resources/assets/plan/web/js/helpers.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/helpers.js rename to Plan/common/src/main/resources/assets/plan/web/js/helpers.js diff --git a/Plan/common/src/main/resources/assets/web/js/script.js b/Plan/common/src/main/resources/assets/plan/web/js/script.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/js/script.js rename to Plan/common/src/main/resources/assets/plan/web/js/script.js diff --git a/Plan/common/src/main/resources/assets/web/network.html b/Plan/common/src/main/resources/assets/plan/web/network.html similarity index 100% rename from Plan/common/src/main/resources/assets/web/network.html rename to Plan/common/src/main/resources/assets/plan/web/network.html diff --git a/Plan/common/src/main/resources/assets/web/player.html b/Plan/common/src/main/resources/assets/plan/web/player.html similarity index 100% rename from Plan/common/src/main/resources/assets/web/player.html rename to Plan/common/src/main/resources/assets/plan/web/player.html diff --git a/Plan/common/src/main/resources/assets/web/players.html b/Plan/common/src/main/resources/assets/plan/web/players.html similarity index 100% rename from Plan/common/src/main/resources/assets/web/players.html rename to Plan/common/src/main/resources/assets/plan/web/players.html diff --git a/Plan/common/src/main/resources/assets/web/plugins/animate-css/animate.css b/Plan/common/src/main/resources/assets/plan/web/plugins/animate-css/animate.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/animate-css/animate.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/animate-css/animate.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/animate-css/animate.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/animate-css/animate.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/animate-css/animate.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/animate-css/animate.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/autosize/autosize.js b/Plan/common/src/main/resources/assets/plan/web/plugins/autosize/autosize.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/autosize/autosize.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/autosize/autosize.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/autosize/autosize.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/autosize/autosize.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/autosize/autosize.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/autosize/autosize.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker.css b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.eot b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.eot similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.eot rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.eot diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.svg b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.svg similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.svg rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.svg diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.ttf b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.ttf similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.ttf rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.ttf diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff2 b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff2 similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff2 rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/font/Material-Design-Icons.woff2 diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-notify/bootstrap-notify.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-notify/bootstrap-notify.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-notify/bootstrap-notify.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-notify/bootstrap-notify.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-notify/bootstrap-notify.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-notify/bootstrap-notify.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-notify/bootstrap-notify.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-notify/bootstrap-notify.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.css b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/css/bootstrap-select.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/css/bootstrap-select.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.css.map b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/css/bootstrap-select.css.map similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.css.map rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/css/bootstrap-select.css.map diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/css/bootstrap-select.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/css/bootstrap-select.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/css/bootstrap-select.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/js/bootstrap-select.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/js/bootstrap-select.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.js.map b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/js/bootstrap-select.js.map similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.js.map rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/js/bootstrap-select.js.map diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/js/bootstrap-select.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-select/js/bootstrap-select.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-select/js/bootstrap-select.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-angular.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-typeahead.css b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-typeahead.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-typeahead.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput-typeahead.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap-tagsinput/bootstrap-tagsinput.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap-theme.css b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/css/bootstrap-theme.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap-theme.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/css/bootstrap-theme.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap-theme.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap-theme.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/css/bootstrap-theme.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap.css b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/css/bootstrap.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/css/bootstrap.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/css/bootstrap.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/css/bootstrap.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/css/bootstrap.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/bootstrap.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/js/bootstrap.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/bootstrap.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/js/bootstrap.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/bootstrap.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/js/bootstrap.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/bootstrap.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/js/bootstrap.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/npm.js b/Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/js/npm.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/bootstrap/js/npm.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/bootstrap/js/npm.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/fullcalendar/fullcalendar.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/fullcalendar/fullcalendar.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/fullcalendar/fullcalendar.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/fullcalendar/fullcalendar.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/fullcalendar/fullcalendar.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/fullcalendar/fullcalendar.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/fullcalendar/fullcalendar.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/fullcalendar/fullcalendar.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-cookie/jquery.cookie.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-cookie/jquery.cookie.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-cookie/jquery.cookie.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-cookie/jquery.cookie.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-countto/jquery.countTo.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-countto/jquery.countTo.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-countto/jquery.countTo.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-countto/jquery.countTo.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/jquery.dataTables.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/jquery.dataTables.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/jquery.dataTables.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/jquery.dataTables.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.css b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/css/dataTables.bootstrap.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/Sorting icons.psd b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/Sorting icons.psd similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/Sorting icons.psd rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/Sorting icons.psd diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/favicon.ico b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/favicon.ico similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/favicon.ico rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/favicon.ico diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc.png b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc.png similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc.png rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc.png diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc_disabled.png b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc_disabled.png similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc_disabled.png rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/sort_asc_disabled.png diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_both.png b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/sort_both.png similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_both.png rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/sort_both.png diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc.png b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc.png similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc.png rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc.png diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc_disabled.png b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc_disabled.png similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc_disabled.png rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/images/sort_desc_disabled.png diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.date.extensions.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.date.extensions.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.date.extensions.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.date.extensions.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.dependencyLib.jquery.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.dependencyLib.jquery.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.dependencyLib.jquery.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.dependencyLib.jquery.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.extensions.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.extensions.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.extensions.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.extensions.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.numeric.extensions.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.numeric.extensions.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.numeric.extensions.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.numeric.extensions.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.phone.extensions.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.phone.extensions.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.phone.extensions.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.phone.extensions.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.regex.extensions.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.regex.extensions.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/inputmask.regex.extensions.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/inputmask.regex.extensions.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/jquery.inputmask.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/jquery.inputmask.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/inputmask/jquery.inputmask.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/inputmask/jquery.inputmask.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/jquery.inputmask.bundle.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/jquery.inputmask.bundle.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-inputmask/jquery.inputmask.bundle.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-inputmask/jquery.inputmask.bundle.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-knob/jquery.knob.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-knob/jquery.knob.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-knob/jquery.knob.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-knob/jquery.knob.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-slimscroll/jquery.slimscroll.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-slimscroll/jquery.slimscroll.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-slimscroll/jquery.slimscroll.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-slimscroll/jquery.slimscroll.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.css b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-spinner/css/bootstrap-spinner.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-spinner/css/bootstrap-spinner.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.css.map b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-spinner/css/bootstrap-spinner.css.map similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.css.map rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-spinner/css/bootstrap-spinner.css.map diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-spinner/css/bootstrap-spinner.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/css/bootstrap-spinner.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-spinner/css/bootstrap-spinner.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/js/jquery.spinner.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-spinner/js/jquery.spinner.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/js/jquery.spinner.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-spinner/js/jquery.spinner.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/js/jquery.spinner.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-spinner/js/jquery.spinner.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-spinner/js/jquery.spinner.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-spinner/js/jquery.spinner.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.css b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-steps/jquery.steps.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-steps/jquery.steps.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-steps/jquery.steps.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-steps/jquery.steps.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery-steps/jquery.steps.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery-steps/jquery.steps.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery-steps/jquery.steps.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery/jquery.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery/jquery.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery/jquery.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery/jquery.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.min.map b/Plan/common/src/main/resources/assets/plan/web/plugins/jquery/jquery.min.map similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/jquery/jquery.min.map rename to Plan/common/src/main/resources/assets/plan/web/plugins/jquery/jquery.min.map diff --git a/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/css/material-design-iconic-font.css b/Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/css/material-design-iconic-font.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/css/material-design-iconic-font.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/css/material-design-iconic-font.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/css/material-design-iconic-font.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/css/material-design-iconic-font.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/css/material-design-iconic-font.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/css/material-design-iconic-font.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot b/Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot rename to Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot diff --git a/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg b/Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg rename to Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg diff --git a/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf b/Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf rename to Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf diff --git a/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff b/Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff rename to Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff diff --git a/Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2 b/Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2 similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2 rename to Plan/common/src/main/resources/assets/plan/web/plugins/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff2 diff --git a/Plan/common/src/main/resources/assets/web/plugins/materialize-css/css/materialize.css b/Plan/common/src/main/resources/assets/plan/web/plugins/materialize-css/css/materialize.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/materialize-css/css/materialize.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/materialize-css/css/materialize.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/materialize-css/css/materialize.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/materialize-css/css/materialize.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/materialize-css/css/materialize.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/materialize-css/css/materialize.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/materialize-css/js/materialize.js b/Plan/common/src/main/resources/assets/plan/web/plugins/materialize-css/js/materialize.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/materialize-css/js/materialize.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/materialize-css/js/materialize.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/materialize-css/js/materialize.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/materialize-css/js/materialize.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/materialize-css/js/materialize.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/materialize-css/js/materialize.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/momentjs/ender.js b/Plan/common/src/main/resources/assets/plan/web/plugins/momentjs/ender.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/momentjs/ender.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/momentjs/ender.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/momentjs/moment.js b/Plan/common/src/main/resources/assets/plan/web/plugins/momentjs/moment.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/momentjs/moment.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/momentjs/moment.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/momentjs/package.js b/Plan/common/src/main/resources/assets/plan/web/plugins/momentjs/package.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/momentjs/package.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/momentjs/package.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/multi-select/css/multi-select.css b/Plan/common/src/main/resources/assets/plan/web/plugins/multi-select/css/multi-select.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/multi-select/css/multi-select.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/multi-select/css/multi-select.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/multi-select/img/switch.png b/Plan/common/src/main/resources/assets/plan/web/plugins/multi-select/img/switch.png similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/multi-select/img/switch.png rename to Plan/common/src/main/resources/assets/plan/web/plugins/multi-select/img/switch.png diff --git a/Plan/common/src/main/resources/assets/web/plugins/multi-select/js/jquery.multi-select.js b/Plan/common/src/main/resources/assets/plan/web/plugins/multi-select/js/jquery.multi-select.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/multi-select/js/jquery.multi-select.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/multi-select/js/jquery.multi-select.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/nestable/jquery-nestable.css b/Plan/common/src/main/resources/assets/plan/web/plugins/nestable/jquery-nestable.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/nestable/jquery-nestable.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/nestable/jquery-nestable.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/nestable/jquery.nestable.js b/Plan/common/src/main/resources/assets/plan/web/plugins/nestable/jquery.nestable.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/nestable/jquery.nestable.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/nestable/jquery.nestable.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.css b/Plan/common/src/main/resources/assets/plan/web/plugins/node-waves/waves.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/node-waves/waves.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.js b/Plan/common/src/main/resources/assets/plan/web/plugins/node-waves/waves.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/node-waves/waves.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/node-waves/waves.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/node-waves/waves.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/node-waves/waves.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/node-waves/waves.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.js.map b/Plan/common/src/main/resources/assets/plan/web/plugins/node-waves/waves.min.js.map similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/node-waves/waves.min.js.map rename to Plan/common/src/main/resources/assets/plan/web/plugins/node-waves/waves.min.js.map diff --git a/Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.js b/Plan/common/src/main/resources/assets/plan/web/plugins/nouislider/nouislider.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/nouislider/nouislider.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/nouislider/nouislider.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/nouislider/nouislider.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/nouislider/nouislider.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/nouislider/nouislider.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/nouislider/nouislider.min.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/waitme/img.svg b/Plan/common/src/main/resources/assets/plan/web/plugins/waitme/img.svg similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/waitme/img.svg rename to Plan/common/src/main/resources/assets/plan/web/plugins/waitme/img.svg diff --git a/Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.css b/Plan/common/src/main/resources/assets/plan/web/plugins/waitme/waitMe.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/waitme/waitMe.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.js b/Plan/common/src/main/resources/assets/plan/web/plugins/waitme/waitMe.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/waitme/waitMe.js diff --git a/Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.min.css b/Plan/common/src/main/resources/assets/plan/web/plugins/waitme/waitMe.min.css similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.min.css rename to Plan/common/src/main/resources/assets/plan/web/plugins/waitme/waitMe.min.css diff --git a/Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.min.js b/Plan/common/src/main/resources/assets/plan/web/plugins/waitme/waitMe.min.js similarity index 100% rename from Plan/common/src/main/resources/assets/web/plugins/waitme/waitMe.min.js rename to Plan/common/src/main/resources/assets/plan/web/plugins/waitme/waitMe.min.js diff --git a/Plan/common/src/main/resources/assets/web/server.html b/Plan/common/src/main/resources/assets/plan/web/server.html similarity index 100% rename from Plan/common/src/main/resources/assets/web/server.html rename to Plan/common/src/main/resources/assets/plan/web/server.html diff --git a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java index f234a6110..fbb8e0d87 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java @@ -130,7 +130,7 @@ public class ConfigSettingKeyTest { private PlanConfig createConfig(String copyDefaultSettingsFrom) throws IOException { File configFile = temporaryFolder.newFile(); - TestResources.copyResourceIntoFile(configFile, "/assets/" + copyDefaultSettingsFrom); + TestResources.copyResourceIntoFile(configFile, "/assets/plan/" + copyDefaultSettingsFrom); return createConfig(configFile); } diff --git a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/changes/ConfigUpdaterTest.java b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/changes/ConfigUpdaterTest.java index 9e5e69152..42cc2a804 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/changes/ConfigUpdaterTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/changes/ConfigUpdaterTest.java @@ -70,10 +70,10 @@ class ConfigUpdaterTest { Files.copy(bungeeConfigResource.toPath(), oldBungeeConfig.toPath(), StandardCopyOption.REPLACE_EXISTING); newConfig = tempDir.resolve("newconfig.yml"); - TestResources.copyResourceIntoFile(newConfig.toFile(), "/assets/config.yml"); + TestResources.copyResourceIntoFile(newConfig.toFile(), "/assets/plan/config.yml"); newBungeeConfig = tempDir.resolve("newbungeeconfig.yml"); - TestResources.copyResourceIntoFile(newBungeeConfig.toFile(), "/assets/bungeeconfig.yml"); + TestResources.copyResourceIntoFile(newBungeeConfig.toFile(), "/assets/plan/bungeeconfig.yml"); PluginLogger testLogger = new TestPluginLogger(); UNDER_TEST = new ConfigUpdater(testLogger, new ConsoleErrorLogger(testLogger)); diff --git a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/config/ConfigWriterTest.java b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/config/ConfigWriterTest.java index 6017e205d..6868cca2c 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/config/ConfigWriterTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/config/ConfigWriterTest.java @@ -54,7 +54,7 @@ class ConfigWriterTest { File original = tempFolder.resolve("loaded.yml").toFile(); File written = tempFolder.resolve("written.yml").toFile(); - TestResources.copyResourceIntoFile(original, "/assets/config.yml"); + TestResources.copyResourceIntoFile(original, "/assets/plan/config.yml"); try (ConfigReader reader = new ConfigReader(Files.newInputStream(original.toPath()))) { new ConfigWriter(written.toPath()).write(reader.read()); @@ -84,7 +84,7 @@ class ConfigWriterTest { File indented = tempFolder.resolve("indented.yml").toFile(); File written = tempFolder.resolve("written.yml").toFile(); - TestResources.copyResourceIntoFile(original, "/assets/config.yml"); + TestResources.copyResourceIntoFile(original, "/assets/plan/config.yml"); try (ConfigReader reader = new ConfigReader(Files.newInputStream(original.toPath()))) { new ConfigWriter(indented.toPath()).write(reader.read()); diff --git a/Plan/common/src/test/java/utilities/mocks/Mocker.java b/Plan/common/src/test/java/utilities/mocks/Mocker.java index ba089a206..2a8beeae1 100644 --- a/Plan/common/src/test/java/utilities/mocks/Mocker.java +++ b/Plan/common/src/test/java/utilities/mocks/Mocker.java @@ -46,8 +46,8 @@ abstract class Mocker { throw new IllegalStateException("withDataFolder needs to be called before setting files"); } try { - File file = getFile("/assets/" + fileName); - doReturn(Files.newInputStream(file.toPath())).when(planMock).getResource("assets/" + fileName); + File file = getFile("/assets/plan/" + fileName); + doReturn(Files.newInputStream(file.toPath())).when(planMock).getResource("assets/plan/" + fileName); } catch (NullPointerException e) { System.out.println("File is missing! " + fileName); } diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongeAssetResource.java b/Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongeAssetResource.java index a465de59e..6ddd850d6 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongeAssetResource.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/system/file/SpongeAssetResource.java @@ -47,7 +47,7 @@ public class SpongeAssetResource implements Resource { private void nullCheck() throws FileNotFoundException { if (asset == null) { - throw new FileNotFoundException("a Resource was not found inside the jar (" + resourceName + "), " + + throw new FileNotFoundException("a Resource was not found inside the jar (/assets/plan/" + resourceName + "), " + "Plan does not support /reload or updates using " + "Plugin Managers, restart the server and see if the error persists."); }