diff --git a/.github/workflows/release_docker.yaml b/.github/workflows/release_docker.yaml index a37358893..acca23dc0 100644 --- a/.github/workflows/release_docker.yaml +++ b/.github/workflows/release_docker.yaml @@ -30,7 +30,7 @@ jobs: run: | ALL_APPS=( # microservices - "hawkbit-ddi-server", "hawkbit-dmf-server", "hawkbit-mgmt-server", "hawkbit-simple-ui", + "hawkbit-ddi-server", "hawkbit-dmf-server", "hawkbit-mgmt-server", "hawkbit-ui", # monolith "hawkbit-update-server", # db init diff --git a/.github/workflows/reusable_workflow_trivy-scan.yaml b/.github/workflows/reusable_workflow_trivy-scan.yaml index 9fe0ba3b7..67c4f66b6 100644 --- a/.github/workflows/reusable_workflow_trivy-scan.yaml +++ b/.github/workflows/reusable_workflow_trivy-scan.yaml @@ -83,11 +83,11 @@ jobs: with: sarif_file: 'scans/eclipse-hawkbit/hawkbit/hawkbit-mgmt-server:latest.sarif' category: "Container Images (hawkbit-mgmt-server)" - - name: Upload Docker image scan results to GitHub Security tab hawkbit-simple-ui + - name: Upload Docker image scan results to GitHub Security tab hawkbit-ui uses: github/codeql-action/upload-sarif@v4 with: - sarif_file: 'scans/eclipse-hawkbit/hawkbit/hawkbit-simple-ui:latest.sarif' - category: "Container Images (hawkbit-simple-ui)" + sarif_file: 'scans/eclipse-hawkbit/hawkbit/hawkbit-ui:latest.sarif' + category: "Container Images (hawkbit-ui)" - name: Upload Docker image scan results to GitHub Security tab hawkbit-update-server uses: github/codeql-action/upload-sarif@v4 diff --git a/docker/README.md b/docker/README.md index 97f9dc6b2..411fed94b 100644 --- a/docker/README.md +++ b/docker/README.md @@ -38,7 +38,7 @@ $ docker compose -f mysql/docker-compose-monolith-mysql.yml down You could, also start it in different flavours, with UI or in microservices mode (see Docker Compose files in [mysql](./mysql) and [postgres](./postgres) folders). For instance to start with PostgreSQL, with RabbitMQ, in microservices mode and with UI you could use: ```bash -$ docker compose -f postgres/docker-compose-micro-services-with-simple-ui-postgres.yml up +$ docker compose -f postgres/docker-compose-micro-services-with-ui-postgres.yml up ``` ### Access diff --git a/docker/build/build_dev.sh b/docker/build/build_dev.sh index caf6bd0b8..2da820bf7 100755 --- a/docker/build/build_dev.sh +++ b/docker/build/build_dev.sh @@ -57,7 +57,7 @@ if [ -z "$1" ]; then build "hawkbit-ddi-server" build "hawkbit-dmf-server" build "hawkbit-mgmt-server" - build "hawkbit-simple-ui" + build "hawkbit-ui" # monolith build "hawkbit-update-server" # db init diff --git a/docker/mysql/docker-compose-micro-services-with-simple-ui-dbinit-mysql.yml b/docker/mysql/docker-compose-micro-services-with-ui-dbinit-mysql.yml similarity index 84% rename from docker/mysql/docker-compose-micro-services-with-simple-ui-dbinit-mysql.yml rename to docker/mysql/docker-compose-micro-services-with-ui-dbinit-mysql.yml index 3f34658d7..5a7a5639b 100644 --- a/docker/mysql/docker-compose-micro-services-with-simple-ui-dbinit-mysql.yml +++ b/docker/mysql/docker-compose-micro-services-with-ui-dbinit-mysql.yml @@ -15,17 +15,17 @@ include: services: # --------------------- - # HawkBit Simple UI + # HawkBit UI # --------------------- - hawkbit-simple-ui: - image: "hawkbit/hawkbit-simple-ui:latest" + hawkbit-ui: + image: "hawkbit/hawkbit-ui:latest" environment: - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit-mgmt:8080"}' restart: always ports: - 8088:8088 labels: - NAME: "hawkbit-simple-ui" + NAME: "hawkbit-ui" volumes: artifactrepo: diff --git a/docker/mysql/docker-compose-micro-services-with-simple-ui-mysql.yml b/docker/mysql/docker-compose-micro-services-with-ui-mysql.yml similarity index 83% rename from docker/mysql/docker-compose-micro-services-with-simple-ui-mysql.yml rename to docker/mysql/docker-compose-micro-services-with-ui-mysql.yml index 10e6b259e..e09d2e4be 100644 --- a/docker/mysql/docker-compose-micro-services-with-simple-ui-mysql.yml +++ b/docker/mysql/docker-compose-micro-services-with-ui-mysql.yml @@ -15,17 +15,17 @@ include: services: # --------------------- - # HawkBit Simple UI + # HawkBit UI # --------------------- - hawkbit-simple-ui: - image: "hawkbit/hawkbit-simple-ui:latest" + hawkbit-ui: + image: "hawkbit/hawkbit-ui:latest" environment: - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit-mgmt:8080"}' restart: always ports: - 8088:8088 labels: - NAME: "hawkbit-simple-ui" + NAME: "hawkbit-ui" volumes: artifactrepo: diff --git a/docker/mysql/docker-compose-monolith-with-simple-ui-dbinit-mysql.yml b/docker/mysql/docker-compose-monolith-with-ui-dbinit-mysql.yml similarity index 82% rename from docker/mysql/docker-compose-monolith-with-simple-ui-dbinit-mysql.yml rename to docker/mysql/docker-compose-monolith-with-ui-dbinit-mysql.yml index 7fe2db54b..39f73be7c 100644 --- a/docker/mysql/docker-compose-monolith-with-simple-ui-dbinit-mysql.yml +++ b/docker/mysql/docker-compose-monolith-with-ui-dbinit-mysql.yml @@ -15,17 +15,17 @@ include: services: # --------------------- - # HawkBit Simple UI service + # HawkBit UI service # --------------------- - hawkbit-simple-ui: - image: "hawkbit/hawkbit-simple-ui:latest" + hawkbit-ui: + image: "hawkbit/hawkbit-ui:latest" environment: - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit:8080"}' restart: always ports: - 8088:8088 labels: - NAME: "hawkbit-simple-ui" + NAME: "hawkbit-ui" volumes: artifactrepo: diff --git a/docker/mysql/docker-compose-monolith-with-simple-ui-mysql.yml b/docker/mysql/docker-compose-monolith-with-ui-mysql.yml similarity index 82% rename from docker/mysql/docker-compose-monolith-with-simple-ui-mysql.yml rename to docker/mysql/docker-compose-monolith-with-ui-mysql.yml index fccd56a13..ef099c22a 100644 --- a/docker/mysql/docker-compose-monolith-with-simple-ui-mysql.yml +++ b/docker/mysql/docker-compose-monolith-with-ui-mysql.yml @@ -15,17 +15,17 @@ include: services: # --------------------- - # HawkBit Simple UI service + # HawkBit UI service # --------------------- - hawkbit-simple-ui: - image: "hawkbit/hawkbit-simple-ui:latest" + hawkbit-ui: + image: "hawkbit/hawkbit-ui:latest" environment: - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit:8080"}' restart: always ports: - 8088:8088 labels: - NAME: "hawkbit-simple-ui" + NAME: "hawkbit-ui" volumes: artifactrepo: diff --git a/docker/postgres/docker-compose-micro-services-with-simple-ui-dbinit-postgres.yml b/docker/postgres/docker-compose-micro-services-with-simple-ui-dbinit-postgres.yml index d0ddbec7b..dbe874e6a 100644 --- a/docker/postgres/docker-compose-micro-services-with-simple-ui-dbinit-postgres.yml +++ b/docker/postgres/docker-compose-micro-services-with-simple-ui-dbinit-postgres.yml @@ -15,17 +15,17 @@ include: services: # --------------------- - # HawkBit Simple UI + # HawkBit UI # --------------------- - hawkbit-simple-ui: - image: "hawkbit/hawkbit-simple-ui:latest" + hawkbit-ui: + image: "hawkbit/hawkbit-ui:latest" environment: - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit-mgmt:8080"}' restart: always ports: - 8088:8088 labels: - NAME: "hawkbit-simple-ui" + NAME: "hawkbit-ui" volumes: artifactrepo: diff --git a/docker/postgres/docker-compose-micro-services-with-simple-ui-postgres.yml b/docker/postgres/docker-compose-micro-services-with-simple-ui-postgres.yml index 4d0c12582..9228ef59f 100644 --- a/docker/postgres/docker-compose-micro-services-with-simple-ui-postgres.yml +++ b/docker/postgres/docker-compose-micro-services-with-simple-ui-postgres.yml @@ -15,17 +15,17 @@ include: services: # --------------------- - # HawkBit Simple UI + # HawkBit UI # --------------------- - hawkbit-simple-ui: - image: "hawkbit/hawkbit-simple-ui:latest" + hawkbit-ui: + image: "hawkbit/hawkbit-ui:latest" environment: - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit-mgmt:8080"}' restart: always ports: - 8088:8088 labels: - NAME: "hawkbit-simple-ui" + NAME: "hawkbit-ui" volumes: artifactrepo: diff --git a/docker/postgres/docker-compose-monolith-with-simple-ui-dbinit-postgres.yml b/docker/postgres/docker-compose-monolith-with-simple-ui-dbinit-postgres.yml index a84ed04d5..64d17a733 100644 --- a/docker/postgres/docker-compose-monolith-with-simple-ui-dbinit-postgres.yml +++ b/docker/postgres/docker-compose-monolith-with-simple-ui-dbinit-postgres.yml @@ -15,17 +15,17 @@ include: services: # --------------------- - # HawkBit Simple UI service + # HawkBit UI service # --------------------- - hawkbit-simple-ui: - image: "hawkbit/hawkbit-simple-ui:latest" + hawkbit-ui: + image: "hawkbit/hawkbit-ui:latest" environment: - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit:8080"}' restart: always ports: - 8088:8088 labels: - NAME: "hawkbit-simple-ui" + NAME: "hawkbit-ui" volumes: artifactrepo: diff --git a/docker/postgres/docker-compose-monolith-with-simple-ui-postgres.yml b/docker/postgres/docker-compose-monolith-with-simple-ui-postgres.yml index e3b4ae4f6..d97a5b936 100644 --- a/docker/postgres/docker-compose-monolith-with-simple-ui-postgres.yml +++ b/docker/postgres/docker-compose-monolith-with-simple-ui-postgres.yml @@ -15,17 +15,17 @@ include: services: # --------------------- - # HawkBit Simple UI service + # HawkBit UI service # --------------------- - hawkbit-simple-ui: - image: "hawkbit/hawkbit-simple-ui:latest" + hawkbit-ui: + image: "hawkbit/hawkbit-ui:latest" environment: - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit:8080"}' restart: always ports: - 8088:8088 labels: - NAME: "hawkbit-simple-ui" + NAME: "hawkbit-ui" volumes: artifactrepo: diff --git a/docs/quick-start.md b/docs/quick-start.md index ab7a058d9..809cd4298 100644 --- a/docs/quick-start.md +++ b/docs/quick-start.md @@ -45,12 +45,12 @@ $ cd hawkbit/docker $ docker-compose -f docker-compose-monolith-mysql.yml up -d ``` -If you want to start also the Simple UI, you can use, for PostgreSQL: +If you want to start also the hawkBit UI, you can use, for PostgreSQL: ```bash $ git clone https://github.com/eclipse-hawkbit/hawkbit.git $ cd hawkbit/docker -$ docker-compose -f docker-compose-monolith-with-simple-ui-postgres.yml up -d +$ docker-compose -f docker-compose-monolith-with-ui-postgres.yml up -d ``` or with MySQL: @@ -58,7 +58,7 @@ or with MySQL: ```bash $ git clone https://github.com/eclipse-hawkbit/hawkbit.git $ cd hawkbit/docker -$ docker-compose -f docker-compose-monolith-with-simple-ui-mysql.yml up -d +$ docker-compose -f docker-compose-monolith-with-ui-mysql.yml up -d ``` > **Note:** `-d` flag is used to run the containers in detached mode. @@ -84,12 +84,12 @@ $ cd hawkbit/docker $ docker-compose -f docker-compose-micro-services-mysql.yml up -d ``` -If you want to start also the Simple UI, you can use, for PostgreSQL: +If you want to start also the hawkBit UI, you can use, for PostgreSQL: ```bash $ git clone https://github.com/eclipse-hawkbit/hawkbit.git $ cd hawkbit/docker -$ docker-compose -f docker-compose-micro-services-with-simple-ui-postgres.yml up -d +$ docker-compose -f docker-compose-micro-services-with-ui-postgres.yml up -d ``` or with MySQL: @@ -97,7 +97,7 @@ or with MySQL: ```bash $ git clone https://github.com/eclipse-hawkbit/hawkbit.git $ cd hawkbit/docker -$ docker-compose -f docker-compose-micro-services-with-simple-ui-mysql.yml up -d +$ docker-compose -f docker-compose-micro-services-with-ui-mysql.yml up -d ``` > **Note:** `-d` flag is used to run the containers in detached mode. @@ -137,10 +137,10 @@ And (only if you want to use the DMF feature): $ java -jar ./hawkbit-monolith/hawkbit-update-server/target/hawkbit-update-server-0-SNAPSHOT.jar ``` -You could also start the **Simple UI** by: +You could also start the **hawkBit UI** by: ```bash -$ java -jar ./hawkbit-simple-ui/target/hawkbit-simple-ui-0-SNAPSHOT.jar +$ java -jar ./hawkbit--ui/target/hawkbit-ui-0-SNAPSHOT.jar ``` --- diff --git a/hawkbit-simple-ui/.gitignore b/hawkbit-ui/.gitignore similarity index 100% rename from hawkbit-simple-ui/.gitignore rename to hawkbit-ui/.gitignore diff --git a/hawkbit-simple-ui/pom.xml b/hawkbit-ui/pom.xml similarity index 88% rename from hawkbit-simple-ui/pom.xml rename to hawkbit-ui/pom.xml index cf7fbb134..80aa4df34 100644 --- a/hawkbit-simple-ui/pom.xml +++ b/hawkbit-ui/pom.xml @@ -19,10 +19,10 @@ ${revision} - hawkbit-simple-ui + hawkbit-ui ${revision} jar - hawkBit :: Simple UI + hawkBit :: UI 24.9.5 @@ -51,6 +51,13 @@ + + + org.apache.commons + commons-text + ${commons-text.version} + + org.eclipse.hawkbit hawkbit-sdk-commons @@ -94,8 +101,8 @@ spring-boot-maven-plugin false - Simple-UI - org.eclipse.hawkbit.ui.simple.SimpleUIApp + hawkBit-UI + org.eclipse.hawkbit.ui.HawkbitUiApp diff --git a/hawkbit-simple-ui/src/main/frontend/themes/hawkbit/styles.css b/hawkbit-ui/src/main/frontend/themes/hawkbit/styles.css similarity index 100% rename from hawkbit-simple-ui/src/main/frontend/themes/hawkbit/styles.css rename to hawkbit-ui/src/main/frontend/themes/hawkbit/styles.css diff --git a/hawkbit-simple-ui/src/main/frontend/themes/hawkbit/theme.json b/hawkbit-ui/src/main/frontend/themes/hawkbit/theme.json similarity index 100% rename from hawkbit-simple-ui/src/main/frontend/themes/hawkbit/theme.json rename to hawkbit-ui/src/main/frontend/themes/hawkbit/theme.json diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitMgmtClient.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitMgmtClient.java similarity index 99% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitMgmtClient.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitMgmtClient.java index ccea66ca4..05cafe6d9 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitMgmtClient.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitMgmtClient.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple; +package org.eclipse.hawkbit.ui; import java.util.function.Supplier; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUiApp.java similarity index 96% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUiApp.java index 42b9385b9..82aeafbd9 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUiApp.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple; +package org.eclipse.hawkbit.ui; import com.vaadin.flow.component.page.AppShellConfigurator; import com.vaadin.flow.server.PWA; @@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.eclipse.hawkbit.sdk.HawkbitClient; import org.eclipse.hawkbit.sdk.HawkbitServer; import org.eclipse.hawkbit.sdk.Tenant; -import org.eclipse.hawkbit.ui.simple.view.util.Utils; +import org.eclipse.hawkbit.ui.view.util.Utils; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; @@ -51,7 +51,7 @@ import static feign.Util.ISO_8859_1; @EnableScheduling @SpringBootApplication @Import(FeignClientsConfiguration.class) -public class SimpleUIApp implements AppShellConfigurator { +public class HawkbitUiApp implements AppShellConfigurator { private static final String AUTHORIZATION_HEADER = "Authorization"; private static final RequestInterceptor AUTHORIZATION = requestTemplate -> { @@ -75,7 +75,7 @@ public class SimpleUIApp implements AppShellConfigurator { }; public static void main(String[] args) { - SpringApplication.run(SimpleUIApp.class, args); + SpringApplication.run(HawkbitUiApp.class, args); } @Bean diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java similarity index 93% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java index 62f37e8b8..a40f20d3d 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple; +package org.eclipse.hawkbit.ui; import java.util.List; import java.util.Optional; @@ -37,13 +37,13 @@ import com.vaadin.flow.component.sidenav.SideNavItem; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.server.auth.AccessAnnotationChecker; import com.vaadin.flow.theme.lumo.LumoUtility; -import org.eclipse.hawkbit.ui.simple.security.AuthenticatedUser; -import org.eclipse.hawkbit.ui.simple.view.AboutView; -import org.eclipse.hawkbit.ui.simple.view.ConfigView; -import org.eclipse.hawkbit.ui.simple.view.DistributionSetView; -import org.eclipse.hawkbit.ui.simple.view.RolloutView; -import org.eclipse.hawkbit.ui.simple.view.SoftwareModuleView; -import org.eclipse.hawkbit.ui.simple.view.TargetView; +import org.eclipse.hawkbit.ui.security.AuthenticatedUser; +import org.eclipse.hawkbit.ui.view.AboutView; +import org.eclipse.hawkbit.ui.view.ConfigView; +import org.eclipse.hawkbit.ui.view.DistributionSetView; +import org.eclipse.hawkbit.ui.view.RolloutView; +import org.eclipse.hawkbit.ui.view.SoftwareModuleView; +import org.eclipse.hawkbit.ui.view.TargetView; /** * The main view is a top-level placeholder for other views. diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleI18NProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SimpleI18NProvider.java similarity index 94% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleI18NProvider.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SimpleI18NProvider.java index aa95f8d39..cf8831095 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleI18NProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SimpleI18NProvider.java @@ -8,7 +8,7 @@ * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple; +package org.eclipse.hawkbit.ui; import java.util.Arrays; import java.util.Locale; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/VaadinServiceInit.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/VaadinServiceInit.java similarity index 95% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/VaadinServiceInit.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/VaadinServiceInit.java index 601549ce9..7848cd0ee 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/VaadinServiceInit.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/VaadinServiceInit.java @@ -8,7 +8,7 @@ * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple; +package org.eclipse.hawkbit.ui; import com.vaadin.flow.server.ServiceInitEvent; import com.vaadin.flow.server.VaadinServiceInitListener; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/component/TargetActionsHistory.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/component/TargetActionsHistory.java similarity index 97% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/component/TargetActionsHistory.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/component/TargetActionsHistory.java index ce0bd1970..4da8c43ac 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/component/TargetActionsHistory.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/component/TargetActionsHistory.java @@ -8,9 +8,9 @@ * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.component; +package org.eclipse.hawkbit.ui.component; -import static org.eclipse.hawkbit.ui.simple.view.Constants.STATUS; +import static org.eclipse.hawkbit.ui.view.Constants.STATUS; import java.util.List; import java.util.Optional; @@ -34,9 +34,9 @@ import org.eclipse.hawkbit.mgmt.json.model.action.MgmtActionRequestBodyPut; import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType; import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet; import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget; -import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient; -import org.eclipse.hawkbit.ui.simple.view.TargetView; -import org.eclipse.hawkbit.ui.simple.view.util.Utils; +import org.eclipse.hawkbit.ui.HawkbitMgmtClient; +import org.eclipse.hawkbit.ui.view.TargetView; +import org.eclipse.hawkbit.ui.view.util.Utils; @Slf4j public class TargetActionsHistory extends Grid { diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/AuthenticatedUser.java similarity index 95% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/AuthenticatedUser.java index cf8f100b8..a2457c64a 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/AuthenticatedUser.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.security; +package org.eclipse.hawkbit.ui.security; import java.util.Optional; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/GrantedAuthoritiesService.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/GrantedAuthoritiesService.java similarity index 95% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/GrantedAuthoritiesService.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/GrantedAuthoritiesService.java index 37caee76f..5823eeae5 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/GrantedAuthoritiesService.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/GrantedAuthoritiesService.java @@ -7,14 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.security; +package org.eclipse.hawkbit.ui.security; import java.util.LinkedList; import java.util.List; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient; +import org.eclipse.hawkbit.ui.HawkbitMgmtClient; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.scheduling.annotation.Scheduled; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/Oauth2ClientConfig.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/Oauth2ClientConfig.java similarity index 96% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/Oauth2ClientConfig.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/Oauth2ClientConfig.java index 37792cd79..efd31c36c 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/Oauth2ClientConfig.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/Oauth2ClientConfig.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.security; +package org.eclipse.hawkbit.ui.security; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/OidcClientProperties.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/OidcClientProperties.java similarity index 94% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/OidcClientProperties.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/OidcClientProperties.java index 8a47d1ad0..9c9981245 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/OidcClientProperties.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/OidcClientProperties.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.security; +package org.eclipse.hawkbit.ui.security; import lombok.Data; import lombok.ToString; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/SecurityConfiguration.java similarity index 97% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/SecurityConfiguration.java index 64c919bfc..762651a60 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/SecurityConfiguration.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.security; +package org.eclipse.hawkbit.ui.security; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -15,7 +15,7 @@ import java.nio.charset.StandardCharsets; import com.vaadin.flow.spring.security.VaadinAwareSecurityContextHolderStrategyConfiguration; import com.vaadin.flow.spring.security.VaadinSecurityConfigurer; import lombok.extern.slf4j.Slf4j; -import org.eclipse.hawkbit.ui.simple.view.LoginView; +import org.eclipse.hawkbit.ui.view.LoginView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/UserDetailsSetter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/UserDetailsSetter.java similarity index 98% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/UserDetailsSetter.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/UserDetailsSetter.java index 676f70081..dacba1971 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/UserDetailsSetter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/UserDetailsSetter.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.security; +package org.eclipse.hawkbit.ui.security; import java.io.IOException; import java.time.Instant; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java similarity index 93% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java index 71f562730..1b5242306 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view; +package org.eclipse.hawkbit.ui.view; import jakarta.annotation.security.RolesAllowed; @@ -18,7 +18,7 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.router.RouteAlias; import com.vaadin.flow.theme.lumo.LumoUtility.Margin; -import org.eclipse.hawkbit.ui.simple.MainLayout; +import org.eclipse.hawkbit.ui.MainLayout; @PageTitle("About") @Route(value = "about", layout = MainLayout.class) diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/ConfigView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/ConfigView.java similarity index 96% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/ConfigView.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/ConfigView.java index c6f466315..97c77f010 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/ConfigView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/ConfigView.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view; +package org.eclipse.hawkbit.ui.view; import java.util.HashMap; import java.util.Map; @@ -25,8 +25,8 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import lombok.extern.slf4j.Slf4j; import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValueRequest; -import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient; -import org.eclipse.hawkbit.ui.simple.MainLayout; +import org.eclipse.hawkbit.ui.HawkbitMgmtClient; +import org.eclipse.hawkbit.ui.MainLayout; @PageTitle("Config") @Route(value = "config", layout = MainLayout.class) diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/Constants.java similarity index 97% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/Constants.java index 9b99f4c9b..c389cc7f5 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/Constants.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view; +package org.eclipse.hawkbit.ui.view; // java:S1214 - implementations of Constants interface extends other classes, so if make this class we shall go for static imports // which is not not better diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java similarity index 98% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java index 013541d35..ba696e4f5 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view; +package org.eclipse.hawkbit.ui.view; import java.util.Collection; import java.util.Collections; @@ -50,12 +50,12 @@ import org.eclipse.hawkbit.mgmt.json.model.distributionsettype.MgmtDistributionS import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule; import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleAssignment; import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTag; -import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient; -import org.eclipse.hawkbit.ui.simple.MainLayout; -import org.eclipse.hawkbit.ui.simple.view.util.Filter; -import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid; -import org.eclipse.hawkbit.ui.simple.view.util.TableView; -import org.eclipse.hawkbit.ui.simple.view.util.Utils; +import org.eclipse.hawkbit.ui.HawkbitMgmtClient; +import org.eclipse.hawkbit.ui.MainLayout; +import org.eclipse.hawkbit.ui.view.util.Filter; +import org.eclipse.hawkbit.ui.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.view.util.TableView; +import org.eclipse.hawkbit.ui.view.util.Utils; @PageTitle("Distribution Sets") @Route(value = "distribution_sets", layout = MainLayout.class) diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/LoginView.java similarity index 94% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/LoginView.java index 5aa6c8c31..1d8d3757f 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/LoginView.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view; +package org.eclipse.hawkbit.ui.view; import com.vaadin.flow.component.login.LoginI18n; import com.vaadin.flow.component.login.LoginOverlay; @@ -18,7 +18,7 @@ import com.vaadin.flow.router.Route; import com.vaadin.flow.router.internal.RouteUtil; import com.vaadin.flow.server.VaadinService; import com.vaadin.flow.server.auth.AnonymousAllowed; -import org.eclipse.hawkbit.ui.simple.security.AuthenticatedUser; +import org.eclipse.hawkbit.ui.security.AuthenticatedUser; @AnonymousAllowed @PageTitle("Login") diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java similarity index 98% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java index 955d6cdd6..48be189d5 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view; +package org.eclipse.hawkbit.ui.view; import java.time.ZoneOffset; import java.util.List; @@ -48,12 +48,12 @@ import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutResponseBody; import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutRestRequestBodyPost; import org.eclipse.hawkbit.mgmt.json.model.rolloutgroup.MgmtRolloutGroupResponseBody; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery; -import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient; -import org.eclipse.hawkbit.ui.simple.MainLayout; -import org.eclipse.hawkbit.ui.simple.view.util.Filter; -import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid; -import org.eclipse.hawkbit.ui.simple.view.util.TableView; -import org.eclipse.hawkbit.ui.simple.view.util.Utils; +import org.eclipse.hawkbit.ui.HawkbitMgmtClient; +import org.eclipse.hawkbit.ui.MainLayout; +import org.eclipse.hawkbit.ui.view.util.Filter; +import org.eclipse.hawkbit.ui.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.view.util.TableView; +import org.eclipse.hawkbit.ui.view.util.Utils; import org.springframework.util.ObjectUtils; @PageTitle("Rollouts") diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java similarity index 98% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java index 4db027b1f..d71aeeed6 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view; +package org.eclipse.hawkbit.ui.view; import java.io.File; import java.io.IOException; @@ -52,12 +52,12 @@ import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule; import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleAssignment; import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleRequestBodyPost; import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleType; -import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient; -import org.eclipse.hawkbit.ui.simple.MainLayout; -import org.eclipse.hawkbit.ui.simple.view.util.Filter; -import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid; -import org.eclipse.hawkbit.ui.simple.view.util.TableView; -import org.eclipse.hawkbit.ui.simple.view.util.Utils; +import org.eclipse.hawkbit.ui.HawkbitMgmtClient; +import org.eclipse.hawkbit.ui.MainLayout; +import org.eclipse.hawkbit.ui.view.util.Filter; +import org.eclipse.hawkbit.ui.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.view.util.TableView; +import org.eclipse.hawkbit.ui.view.util.Utils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java similarity index 98% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java index 83d4688b1..af8e067cc 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view; +package org.eclipse.hawkbit.ui.view; import java.time.ZoneOffset; import java.util.ArrayList; @@ -74,14 +74,14 @@ import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetRequestBody; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQueryRequestBody; import org.eclipse.hawkbit.mgmt.json.model.targettype.MgmtTargetType; -import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient; -import org.eclipse.hawkbit.ui.simple.MainLayout; -import org.eclipse.hawkbit.ui.simple.component.TargetActionsHistory; -import org.eclipse.hawkbit.ui.simple.view.util.Filter; -import org.eclipse.hawkbit.ui.simple.view.util.LinkedTextArea; -import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid; -import org.eclipse.hawkbit.ui.simple.view.util.TableView; -import org.eclipse.hawkbit.ui.simple.view.util.Utils; +import org.eclipse.hawkbit.ui.HawkbitMgmtClient; +import org.eclipse.hawkbit.ui.MainLayout; +import org.eclipse.hawkbit.ui.component.TargetActionsHistory; +import org.eclipse.hawkbit.ui.view.util.Filter; +import org.eclipse.hawkbit.ui.view.util.LinkedTextArea; +import org.eclipse.hawkbit.ui.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.view.util.TableView; +import org.eclipse.hawkbit.ui.view.util.Utils; import org.springframework.http.ResponseEntity; import org.springframework.util.ObjectUtils; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Filter.java similarity index 99% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Filter.java index 3984218b3..c6f386f96 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Filter.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view.util; +package org.eclipse.hawkbit.ui.view.util; import java.util.Collection; import java.util.HashMap; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/LinkedTextArea.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/LinkedTextArea.java similarity index 96% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/LinkedTextArea.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/LinkedTextArea.java index 2f4a1b9c6..792852eda 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/LinkedTextArea.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/LinkedTextArea.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view.util; +package org.eclipse.hawkbit.ui.view.util; import com.vaadin.flow.component.card.Card; import com.vaadin.flow.component.card.CardVariant; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/SelectionGrid.java similarity index 98% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/SelectionGrid.java index 60e0064aa..0fcf16cf4 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/SelectionGrid.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view.util; +package org.eclipse.hawkbit.ui.view.util; import java.util.HashSet; import java.util.List; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java similarity index 98% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java index 21b1ac58a..0b956688e 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view.util; +package org.eclipse.hawkbit.ui.view.util; import java.util.concurrent.CompletionStage; import java.util.function.BiFunction; @@ -34,7 +34,7 @@ import com.vaadin.flow.router.BeforeEnterObserver; import com.vaadin.flow.router.NavigationTrigger; import com.vaadin.flow.theme.lumo.LumoUtility; -import org.eclipse.hawkbit.ui.simple.view.Constants; +import org.eclipse.hawkbit.ui.view.Constants; @SuppressWarnings("java:S119") // better readability public class TableView extends Div implements Constants, BeforeEnterObserver { diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Utils.java similarity index 99% rename from hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Utils.java index 6617ace07..ff6a60f83 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Utils.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.simple.view.util; +package org.eclipse.hawkbit.ui.view.util; import java.time.Duration; import java.time.Instant; @@ -35,7 +35,7 @@ import com.vaadin.flow.data.provider.SortDirection; import com.vaadin.flow.data.renderer.LocalDateTimeRenderer; import lombok.extern.slf4j.Slf4j; import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType; -import org.eclipse.hawkbit.ui.simple.view.Constants; +import org.eclipse.hawkbit.ui.view.Constants; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.HasValue; diff --git a/hawkbit-simple-ui/src/main/resources/META-INF/resources/images/about_image.png b/hawkbit-ui/src/main/resources/META-INF/resources/images/about_image.png similarity index 100% rename from hawkbit-simple-ui/src/main/resources/META-INF/resources/images/about_image.png rename to hawkbit-ui/src/main/resources/META-INF/resources/images/about_image.png diff --git a/hawkbit-simple-ui/src/main/resources/META-INF/resources/images/header_icon.png b/hawkbit-ui/src/main/resources/META-INF/resources/images/header_icon.png similarity index 100% rename from hawkbit-simple-ui/src/main/resources/META-INF/resources/images/header_icon.png rename to hawkbit-ui/src/main/resources/META-INF/resources/images/header_icon.png diff --git a/hawkbit-simple-ui/src/main/resources/application.properties b/hawkbit-ui/src/main/resources/application.properties similarity index 97% rename from hawkbit-simple-ui/src/main/resources/application.properties rename to hawkbit-ui/src/main/resources/application.properties index 60074fcc6..b24aa545b 100644 --- a/hawkbit-simple-ui/src/main/resources/application.properties +++ b/hawkbit-ui/src/main/resources/application.properties @@ -27,6 +27,6 @@ vaadin.launch-browser=true # To improve the performance during development. # For more information https://vaadin.com/docs/flow/spring/tutorial-spring-configuration.html#special-configuration-parameters vaadin.allowed-packages=com.vaadin,org.vaadin,dev.hilla,org.eclipse.hawkbit -spring.application.name=Simple-UI +spring.application.name=hawkBit-UI server.servlet.session.persistent=false ### Vaadin end ### \ No newline at end of file diff --git a/hawkbit-simple-ui/src/main/resources/banner.txt b/hawkbit-ui/src/main/resources/banner.txt similarity index 100% rename from hawkbit-simple-ui/src/main/resources/banner.txt rename to hawkbit-ui/src/main/resources/banner.txt diff --git a/pom.xml b/pom.xml index 82899818a..57947d28c 100644 --- a/pom.xml +++ b/pom.xml @@ -572,7 +572,7 @@ eclipse_codeformatter.xml intellij_codeformatter.xml **/*.sql - + **/banner.txt **/robots.txt **/frontend/** @@ -581,7 +581,7 @@ **/types.d.ts **/vite.config.ts **/vite.generated.ts - + **/application-local.properties @@ -722,7 +722,7 @@ hawkbit-dmf hawkbit-monolith - hawkbit-simple-ui + hawkbit-ui hawkbit-sdk