From ef216840a7bae835b1876e98d53750f2b0c8ffd3 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Mon, 11 Nov 2024 16:13:08 +0200 Subject: [PATCH] Move Simple UI at root level (#2005) Signed-off-by: Avgustin Marinov --- hawkbit-runtime/pom.xml | 1 - .../.gitignore | 0 .../hawkbit-simple-ui => hawkbit-simple-ui}/pom.xml | 2 +- .../hawkbit/ui/simple/HawkbitMgmtClient.java | 0 .../org/eclipse/hawkbit/ui/simple/MainLayout.java | 0 .../org/eclipse/hawkbit/ui/simple/SimpleUIApp.java | 0 .../ui/simple/security/AuthenticatedUser.java | 0 .../ui/simple/security/SecurityConfiguration.java | 0 .../eclipse/hawkbit/ui/simple/view/AboutView.java | 0 .../eclipse/hawkbit/ui/simple/view/ConfigView.java | 0 .../eclipse/hawkbit/ui/simple/view/Constants.java | 0 .../hawkbit/ui/simple/view/DistributionSetView.java | 0 .../eclipse/hawkbit/ui/simple/view/LoginView.java | 0 .../eclipse/hawkbit/ui/simple/view/RolloutView.java | 0 .../hawkbit/ui/simple/view/SoftwareModuleView.java | 0 .../eclipse/hawkbit/ui/simple/view/TargetView.java | 0 .../eclipse/hawkbit/ui/simple/view/util/Filter.java | 0 .../hawkbit/ui/simple/view/util/SelectionGrid.java | 0 .../hawkbit/ui/simple/view/util/TableView.java | 0 .../eclipse/hawkbit/ui/simple/view/util/Utils.java | 0 .../META-INF/resources/images/about_image.png | Bin .../META-INF/resources/images/header_icon.png | Bin .../src/main/resources/application.properties | 0 .../src/main/resources/banner.txt | 0 pom.xml | 7 ++++++- 25 files changed, 7 insertions(+), 3 deletions(-) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/.gitignore (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/pom.xml (98%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitMgmtClient.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/ConfigView.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/resources/META-INF/resources/images/about_image.png (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/resources/META-INF/resources/images/header_icon.png (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/resources/application.properties (100%) rename {hawkbit-runtime/hawkbit-simple-ui => hawkbit-simple-ui}/src/main/resources/banner.txt (100%) diff --git a/hawkbit-runtime/pom.xml b/hawkbit-runtime/pom.xml index 2d8263a94..a8053004d 100644 --- a/hawkbit-runtime/pom.xml +++ b/hawkbit-runtime/pom.xml @@ -52,6 +52,5 @@ hawkbit-update-server - hawkbit-simple-ui diff --git a/hawkbit-runtime/hawkbit-simple-ui/.gitignore b/hawkbit-simple-ui/.gitignore similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/.gitignore rename to hawkbit-simple-ui/.gitignore diff --git a/hawkbit-runtime/hawkbit-simple-ui/pom.xml b/hawkbit-simple-ui/pom.xml similarity index 98% rename from hawkbit-runtime/hawkbit-simple-ui/pom.xml rename to hawkbit-simple-ui/pom.xml index ff3cfb46a..08de1257d 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/pom.xml +++ b/hawkbit-simple-ui/pom.xml @@ -15,7 +15,7 @@ 4.0.0 org.eclipse.hawkbit - hawkbit-runtime-parent + hawkbit-parent ${revision} diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitMgmtClient.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitMgmtClient.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitMgmtClient.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitMgmtClient.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/ConfigView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/ConfigView.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/ConfigView.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/ConfigView.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java rename to hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/META-INF/resources/images/about_image.png b/hawkbit-simple-ui/src/main/resources/META-INF/resources/images/about_image.png similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/resources/META-INF/resources/images/about_image.png rename to hawkbit-simple-ui/src/main/resources/META-INF/resources/images/about_image.png diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/META-INF/resources/images/header_icon.png b/hawkbit-simple-ui/src/main/resources/META-INF/resources/images/header_icon.png similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/resources/META-INF/resources/images/header_icon.png rename to hawkbit-simple-ui/src/main/resources/META-INF/resources/images/header_icon.png diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/application.properties b/hawkbit-simple-ui/src/main/resources/application.properties similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/resources/application.properties rename to hawkbit-simple-ui/src/main/resources/application.properties diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/banner.txt b/hawkbit-simple-ui/src/main/resources/banner.txt similarity index 100% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/resources/banner.txt rename to hawkbit-simple-ui/src/main/resources/banner.txt diff --git a/pom.xml b/pom.xml index 699bb7316..526374ff5 100644 --- a/pom.xml +++ b/pom.xml @@ -139,14 +139,19 @@ hawkbit-repository hawkbit-artifact-repository-filesystem hawkbit-autoconfigure + hawkbit-rest-core hawkbit-mgmt hawkbit-ddi hawkbit-dmf - hawkbit-test-report hawkbit-runtime + hawkbit-simple-ui + hawkbit-starters + hawkbit-sdk + + hawkbit-test-report