From 268d61962e900d1a75ca1c3bfac504c700bae118 Mon Sep 17 00:00:00 2001 From: Clement Escoffier Date: Mon, 20 Mar 2023 08:52:00 +0100 Subject: [PATCH] Expose the new dev ui under /q/dev The old dev ui is under /q/devui-v1. --- TROUBLESHOOTING.md | 2 +- .../META-INF/resources/index.entry.qute.html | 2 +- .../main/asciidoc/dev-mode-differences.adoc | 7 +++++ docs/src/main/asciidoc/dev-ui.adoc | 14 ++++++++-- .../asciidoc/grpc-service-implementation.adoc | 2 +- .../asciidoc/resteasy-reactive-migration.adoc | 2 +- .../security-keycloak-authorization.adoc | 2 +- ...-bearer-token-authentication-tutorial.adoc | 2 +- .../security-openid-connect-client.adoc | 2 +- .../security-openid-connect-dev-services.adoc | 12 ++++---- .../{dev-ui => dev}/arc/qwc-arc-beans.js | 0 .../{dev-ui => dev}/arc/qwc-arc-decorators.js | 0 .../arc/qwc-arc-fired-events.js | 0 .../arc/qwc-arc-interceptors.js | 0 .../arc/qwc-arc-invocation-trees.js | 0 .../{dev-ui => dev}/arc/qwc-arc-observers.js | 0 .../arc/qwc-arc-removed-components.js | 0 .../{dev-ui => dev}/cache/qwc-cache-caches.js | 0 .../qwc-container-image-build.js | 0 .../datasources/qwc-datasources-reset.js | 0 .../FlywayDevModeCreateFromHibernateTest.java | 2 +- .../devconsole/DevConsoleUnaryMethodTest.java | 2 +- .../qwc-resteasy-reactive-card.js | 0 .../qwc-resteasy-reactive-endpoint-scores.js | 0 ...qwc-resteasy-reactive-exception-mappers.js | 0 ...-reactive-parameter-converter-providers.js | 0 .../scheduler/qwc-scheduler-log.js | 0 .../qwc-scheduler-scheduled-methods.js | 0 .../qwc-fault-tolerance-methods.js | 0 ...wc-smallrye-reactive-messaging-channels.js | 0 .../deployment/BuildTimeContentProcessor.java | 4 +-- .../devui/deployment/DevUIProcessor.java | 2 +- .../devmode/console/DevConsole.java | 4 +-- .../devmode/console/DevConsoleProcessor.java | 17 ++++++------ .../devmode/console/package-info.java | 4 +++ .../devmode/tests/TestsProcessor.java | 2 +- .../main/resources/dev-static/js/logstream.js | 4 +-- .../src/main/resources/dev-static/js/tests.js | 6 ++-- .../io.quarkus.quarkus-vertx-http/tests.html | 2 +- ...DevConsoleConfigEditorBodyHandlerTest.java | 2 +- .../DevConsoleConfigEditorTest.java | 4 +-- ...figMisinterpretedDoubleUnderscoreTest.java | 2 +- .../http/devconsole/DevConsoleCorsTest.java | 26 +++++++++--------- .../testrunner/TestRunnerSmokeTestCase.java | 2 +- .../brokenonly/TestBrokenOnlyTestCase.java | 2 +- .../params/TestParameterizedTestCase.java | 2 +- .../spi/DevConsoleRouteBuildItem.java | 2 +- .../build-time/build-time-data.js | 0 .../build-time/index.html | 0 .../{dev-ui => dev}/controller/jsonrpc.js | 3 +- .../controller/log-controller.js | 0 .../{dev-ui => dev}/controller/notifier.js | 0 .../controller/router-controller.js | 15 +++++----- .../controller/storage-controller.js | 0 .../echarts/echarts-abstract-canvas.js | 0 .../echarts/echarts-gauge-grade.js | 0 .../resources/{dev-ui => dev}/favicon.ico | Bin .../{dev-ui => dev}/font/red-hat-font.min.css | 0 .../icon/font-awesome-brands.js | 0 .../icon/font-awesome-regular.js | 0 .../icon/font-awesome-solid.js | 0 .../{dev-ui => dev}/icon/font-awesome.js | 0 .../{dev-ui => dev}/quarkus-logo.png | Bin .../{dev-ui => dev}/qui/qui-alert.js | 0 .../{dev-ui => dev}/qui/qui-badge.js | 0 .../{dev-ui => dev}/qwc/qwc-build-steps.js | 0 .../{dev-ui => dev}/qwc/qwc-configuration.js | 0 .../qwc/qwc-continuous-testing.js | 0 .../{dev-ui => dev}/qwc/qwc-data-qute-page.js | 0 .../{dev-ui => dev}/qwc/qwc-data-raw-page.js | 0 .../qwc/qwc-data-table-page.js | 0 .../{dev-ui => dev}/qwc/qwc-dev-services.js | 0 .../{dev-ui => dev}/qwc/qwc-extension-link.js | 0 .../{dev-ui => dev}/qwc/qwc-extension.js | 0 .../{dev-ui => dev}/qwc/qwc-extensions.js | 0 .../{dev-ui => dev}/qwc/qwc-external-page.js | 0 .../{dev-ui => dev}/qwc/qwc-footer.js | 0 .../{dev-ui => dev}/qwc/qwc-header.js | 0 .../qwc/qwc-hot-reload-element.js | 0 .../qwc/qwc-jsonrpc-messages.js | 0 .../resources/{dev-ui => dev}/qwc/qwc-menu.js | 0 .../{dev-ui => dev}/qwc/qwc-server-log.js | 0 .../{dev-ui => dev}/qwc/qwc-ws-status.js | 0 .../{dev-ui => dev}/state/connection-state.js | 0 .../{dev-ui => dev}/state/devui-state.js | 0 .../{dev-ui => dev}/state/theme-state.js | 0 .../spi/buildtime/QuteTemplateBuildItem.java | 2 +- .../java/io/quarkus/devui/spi/page/Page.java | 4 +-- .../devui/spi/page/QuteDataPageBuilder.java | 4 +-- .../runtime/DevUIBuildTimeStaticHandler.java | 2 +- .../runtime/devmode/DevConsoleFilter.java | 2 +- .../META-INF/resources/index.tpl.qute.html | 1 + .../devconsole/DevConsoleKafkaSmokeTest.java | 2 +- .../java/io/quarkus/maven/it/DevMojoIT.java | 6 ++-- .../io/quarkus/maven/it/RemoteDevMojoIT.java | 2 +- .../ContinuousTestingMavenTestUtils.java | 2 +- 96 files changed, 103 insertions(+), 80 deletions(-) rename extensions/arc/deployment/src/main/resources/{dev-ui => dev}/arc/qwc-arc-beans.js (100%) rename extensions/arc/deployment/src/main/resources/{dev-ui => dev}/arc/qwc-arc-decorators.js (100%) rename extensions/arc/deployment/src/main/resources/{dev-ui => dev}/arc/qwc-arc-fired-events.js (100%) rename extensions/arc/deployment/src/main/resources/{dev-ui => dev}/arc/qwc-arc-interceptors.js (100%) rename extensions/arc/deployment/src/main/resources/{dev-ui => dev}/arc/qwc-arc-invocation-trees.js (100%) rename extensions/arc/deployment/src/main/resources/{dev-ui => dev}/arc/qwc-arc-observers.js (100%) rename extensions/arc/deployment/src/main/resources/{dev-ui => dev}/arc/qwc-arc-removed-components.js (100%) rename extensions/cache/deployment/src/main/resources/{dev-ui => dev}/cache/qwc-cache-caches.js (100%) rename extensions/container-image/deployment/src/main/resources/{dev-ui => dev}/container-image/qwc-container-image-build.js (100%) rename extensions/datasource/deployment/src/main/resources/{dev-ui => dev}/datasources/qwc-datasources-reset.js (100%) rename extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/{dev-ui => dev}/resteasy-reactive/qwc-resteasy-reactive-card.js (100%) rename extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/{dev-ui => dev}/resteasy-reactive/qwc-resteasy-reactive-endpoint-scores.js (100%) rename extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/{dev-ui => dev}/resteasy-reactive/qwc-resteasy-reactive-exception-mappers.js (100%) rename extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/{dev-ui => dev}/resteasy-reactive/qwc-resteasy-reactive-parameter-converter-providers.js (100%) rename extensions/scheduler/deployment/src/main/resources/{dev-ui => dev}/scheduler/qwc-scheduler-log.js (100%) rename extensions/scheduler/deployment/src/main/resources/{dev-ui => dev}/scheduler/qwc-scheduler-scheduled-methods.js (100%) rename extensions/smallrye-fault-tolerance/deployment/src/main/resources/{dev-ui => dev}/smallrye-fault-tolerance/qwc-fault-tolerance-methods.js (100%) rename extensions/smallrye-reactive-messaging/deployment/src/main/resources/{dev-ui => dev}/smallrye-reactive-messaging/qwc-smallrye-reactive-messaging-channels.js (100%) create mode 100644 extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/package-info.java rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui-templates => dev-templates}/build-time/build-time-data.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui-templates => dev-templates}/build-time/index.html (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/controller/jsonrpc.js (99%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/controller/log-controller.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/controller/notifier.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/controller/router-controller.js (95%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/controller/storage-controller.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/echarts/echarts-abstract-canvas.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/echarts/echarts-gauge-grade.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/favicon.ico (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/font/red-hat-font.min.css (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/icon/font-awesome-brands.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/icon/font-awesome-regular.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/icon/font-awesome-solid.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/icon/font-awesome.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/quarkus-logo.png (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qui/qui-alert.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qui/qui-badge.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-build-steps.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-configuration.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-continuous-testing.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-data-qute-page.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-data-raw-page.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-data-table-page.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-dev-services.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-extension-link.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-extension.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-extensions.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-external-page.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-footer.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-header.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-hot-reload-element.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-jsonrpc-messages.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-menu.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-server-log.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/qwc/qwc-ws-status.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/state/connection-state.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/state/devui-state.js (100%) rename extensions/vertx-http/dev-ui-resources/src/main/resources/{dev-ui => dev}/state/theme-state.js (100%) diff --git a/TROUBLESHOOTING.md b/TROUBLESHOOTING.md index 5485a574ed6d2..23f04b576b7d9 100644 --- a/TROUBLESHOOTING.md +++ b/TROUBLESHOOTING.md @@ -153,7 +153,7 @@ You can also configure the `jvm.args` system property directly inside the `quark When trying to debug startup performance, it is convenient to log build steps execution time. This can be achieved by adding the following system property: `-Dquarkus.debug.print-startup-times=true` in dev mode or when launching the JAR. -There is also a nice visualization of build steps available in the Dev UI located here: http://localhost:8080/q/dev/io.quarkus.quarkus-vertx-http/build-steps. +There is also a nice visualization of build steps available in the Dev UI located here: http://localhost:8080/q/dev/build-steps. If you want to have the same visualization of build steps processing when building your application, you can use the `quarkus.debug.dump-build-metrics=true` property. For example using `mvn package -Dquarkus.debug.dump-build-metrics=true`, will generate a `build-metrics.json` in your `target` repository that you can process via the quarkus-build-report application available here https://github.com/mkouba/quarkus-build-report. diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/grpc-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/grpc-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html index ae4d95a1a9f2f..808ea97086fb0 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/grpc-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/grpc-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html @@ -1,3 +1,3 @@ {#include index-entry} -{#body}
› It can be tested in the Dev UI (available in dev mode only). +{#body}
› It can be tested in the Dev UI (available in dev mode only). {/include} \ No newline at end of file diff --git a/docs/src/main/asciidoc/dev-mode-differences.adoc b/docs/src/main/asciidoc/dev-mode-differences.adoc index 06ec4b22de2d6..8dbd199c661f6 100644 --- a/docs/src/main/asciidoc/dev-mode-differences.adoc +++ b/docs/src/main/asciidoc/dev-mode-differences.adoc @@ -45,6 +45,13 @@ Examples of such operations are: * Running scheduled operations * Building a container +[TIP] +==== +A new Dev UI has been implemented in Quarkus 3.x. +Not all the features are available yet. +You can still access the previous version of the Dev UI using: http://localhost:8080/q/devui-v1/. +==== + === Error pages In an effort to make development errors very easy to diagnose, Quarkus provides various detailed error pages when running in dev mode. diff --git a/docs/src/main/asciidoc/dev-ui.adoc b/docs/src/main/asciidoc/dev-ui.adoc index bcfe42cafe046..58c6e39ef4ac7 100644 --- a/docs/src/main/asciidoc/dev-ui.adoc +++ b/docs/src/main/asciidoc/dev-ui.adoc @@ -6,12 +6,20 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc = Dev UI include::_attributes.adoc[] :categories: writing-extensions -:summary: Learn how to get your extension contribute features to the Dev UI. +:summary: Learn how to get your extension contribute features to the Dev UI (v1). + + +[IMPORTANT] +.Dev UI v1 +==== +This guide covers the Dev UI v1, which has been replaced in Quarkus 3. +You can still access the Dev UI v1 using http://localhost/q/devui-v1/ +==== This guide covers the Quarkus Dev UI for xref:building-my-first-extension.adoc[extension authors]. Quarkus now ships with a new experimental Dev UI, which is available in dev mode (when you start -quarkus with `mvn quarkus:dev`) at http://localhost:8080/q/dev[/q/dev] by default. It will show you something like +quarkus with `mvn quarkus:dev`) at http://localhost:8080/q/devui-v1[/q/devui-v1] by default. It will show you something like this: image::dev-ui-overview.png[alt=Dev UI overview,role="center",width=90%] @@ -191,7 +199,7 @@ xref:building-my-first-extension.adoc#description-of-a-quarkus-extension[`deploy Full-page templates for extensions live under a pre-defined `{devRootAppend}/{groupId}.{artifactId}/` directory that is referenced using the `urlbase` template parameter. Using configuration defaults, that would resolve to -`/q/dev/io.quarkus.quarkus-cache/`, as an example. +`/q/devui-v1/io.quarkus.quarkus-cache/`, as an example. Use the `{urlbase}` template parameter to reference this folder in `embedded.html`: diff --git a/docs/src/main/asciidoc/grpc-service-implementation.adoc b/docs/src/main/asciidoc/grpc-service-implementation.adoc index 272647040240b..9eb196d20c710 100644 --- a/docs/src/main/asciidoc/grpc-service-implementation.adoc +++ b/docs/src/main/asciidoc/grpc-service-implementation.adoc @@ -337,7 +337,7 @@ public class HelloServiceTest implements Greeter { == Trying out your services manually In the dev mode, you can try out your gRPC services in the Quarkus Dev UI. -Just go to http://localhost:8080/q/dev and click on _Services_ under the gRPC tile. +Just go to http://localhost:8080/q/devui-v1 and click on _Services_ under the gRPC tile. Please note that your application needs to expose the "normal" HTTP port for the Dev UI to be accessible. If your application does not expose any HTTP endpoints, you can create a dedicated profile with a dependency on `quarkus-vertx-http`: [source,xml] diff --git a/docs/src/main/asciidoc/resteasy-reactive-migration.adoc b/docs/src/main/asciidoc/resteasy-reactive-migration.adoc index 49e5f3cb5ebcb..31abd082599ad 100644 --- a/docs/src/main/asciidoc/resteasy-reactive-migration.adoc +++ b/docs/src/main/asciidoc/resteasy-reactive-migration.adoc @@ -100,7 +100,7 @@ Users are instead encouraged to use the Jakarta REST standard `jakarta.ws.rs.Bea Although RESTEasy Reactive provides the same spec compliant behavior as RESTEasy Classic does, it does not include the same exact provider implementations at runtime. -The most common case where the difference in providers might result in different behavior, is the included `jakarta.ws.rs.ext.ExceptionMapper` implementations. To see what classes are included in the application, launch the application in dev mode and navigate to http://localhost:8080/q/dev/io.quarkus.quarkus-resteasy-reactive/exception-mappers. +The most common case where the difference in providers might result in different behavior, is the included `jakarta.ws.rs.ext.ExceptionMapper` implementations. To see what classes are included in the application, launch the application in dev mode and navigate to http://localhost:8080/q/dev/resteasy-reactive/exception-mappers. ==== Service Loading diff --git a/docs/src/main/asciidoc/security-keycloak-authorization.adoc b/docs/src/main/asciidoc/security-keycloak-authorization.adoc index 75406cef05aad..a0a370aa9232b 100644 --- a/docs/src/main/asciidoc/security-keycloak-authorization.adoc +++ b/docs/src/main/asciidoc/security-keycloak-authorization.adoc @@ -232,7 +232,7 @@ include::{includes}/devtools/dev.adoc[] xref:security-openid-connect-dev-services.adoc[Dev Services for Keycloak] will launch a Keycloak container and import a `quarkus-realm.json`. -Open a xref:dev-ui.adoc[Dev UI] available at http://localhost:8080/q/dev[/q/dev] and click on a `Provider: Keycloak` link in an `OpenID Connect` `Dev UI` card. +Open a xref:dev-ui.adoc[Dev UI] available at http://localhost:8080/q/devui-v1[/q/devui-v1] and click on a `Provider: Keycloak` link in an `OpenID Connect` `Dev UI` card. You will be asked to log in into a `Single Page Application` provided by `OpenID Connect Dev UI`: diff --git a/docs/src/main/asciidoc/security-oidc-bearer-token-authentication-tutorial.adoc b/docs/src/main/asciidoc/security-oidc-bearer-token-authentication-tutorial.adoc index 915b0e9da8832..a3ae03318db02 100644 --- a/docs/src/main/asciidoc/security-oidc-bearer-token-authentication-tutorial.adoc +++ b/docs/src/main/asciidoc/security-oidc-bearer-token-authentication-tutorial.adoc @@ -207,7 +207,7 @@ include::{includes}/devtools/dev.adoc[] xref:security-openid-connect-dev-services.adoc[Dev Services for Keycloak] will launch a Keycloak container and import a `quarkus-realm.json`. -Open a xref:dev-ui.adoc[Dev UI] available at http://localhost:8080/q/dev[/q/dev] and click on a `Provider: Keycloak` link in an `OpenID Connect` `Dev UI` card. +Open a xref:dev-ui.adoc[Dev UI] available at http://localhost:8080/q/devui-v1[/q/devui-v1] and click on a `Provider: Keycloak` link in an `OpenID Connect` `Dev UI` card. You will be asked to log in into a `Single Page Application` provided by `OpenID Connect Dev UI`: diff --git a/docs/src/main/asciidoc/security-openid-connect-client.adoc b/docs/src/main/asciidoc/security-openid-connect-client.adoc index 6ee65f8c6834b..648409831d0fd 100644 --- a/docs/src/main/asciidoc/security-openid-connect-client.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-client.adoc @@ -361,7 +361,7 @@ include::{includes}/devtools/dev.adoc[] xref:security-openid-connect-dev-services.adoc[Dev Services for Keycloak] will launch a Keycloak container and import a `quarkus-realm.json`. -Open a xref:dev-ui.adoc[Dev UI] available at http://localhost:8080/q/dev[/q/dev] and click on a `Provider: Keycloak` link in an `OpenID Connect` `Dev UI` card. +Open a xref:dev-ui.adoc[Dev UI] available at http://localhost:8080/q/devui-v1[/q/devui-v1] and click on a `Provider: Keycloak` link in an `OpenID Connect` `Dev UI` card. You will be asked to log in into a `Single Page Application` provided by `OpenID Connect Dev UI`: diff --git a/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc b/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc index 59eba5678cf86..bc64fdc4e4059 100644 --- a/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc @@ -16,7 +16,7 @@ It also describes Dev UI for all OpenID Connect providers which have already bee Quarkus introduces an experimental `Dev Services For Keycloak` feature which is enabled by default when the `quarkus-oidc` extension is started in dev mode and when the integration tests are running in test mode, but only when no `quarkus.oidc.auth-server-url` property is configured. It starts a Keycloak container for both the dev and/or test modes and initializes them by registering the existing Keycloak realm or creating a new realm with the client and users for you to start developing your Quarkus application secured by Keycloak immediately. It will restart the container when the `application.properties` or the realm file changes have been detected. -Additionally, xref:dev-ui.adoc[Dev UI] available at http://localhost:8080/q/dev[/q/dev] complements this feature with a Dev UI page which helps to acquire the tokens from Keycloak and test your Quarkus application. +Additionally, xref:dev-ui.adoc[Dev UI] available at http://localhost:8080/q/devui-v1[/q/devui-v1] complements this feature with a Dev UI page which helps to acquire the tokens from Keycloak and test your Quarkus application. If `quarkus.oidc.auth-server-url` is already set then a generic OpenID Connect Dev Console which can be used with all OpenID Connect providers will be activated, please see <> for more information. @@ -53,7 +53,7 @@ include::{includes}/devtools/dev.adoc[] Note that you can disable sharing the containers with `quarkus.keycloak.devservices.shared=false`. -Now open the main link:http://localhost:8080/q/dev[Dev UI page], and you will see the `OpenID Connect Card` linking to a Keycloak page: +Now open the main link:http://localhost:8080/q/devui-v1[Dev UI (v1) page], and you will see the `OpenID Connect Card` linking to a Keycloak page: image::dev-ui-oidc-keycloak-card.png[alt=Dev UI OpenID Connect Card,role="center"] @@ -128,7 +128,7 @@ You may need to register a redirect URI for the authorization code flow initiate If Keycloak does enforce it then you will see an authentication error informing you that the `redirect_uri` value is wrong. -In this case select the `Keycloak Admin` option in the right top corner, login as `admin:admin`, select the test realm and the client which Dev UI for Keycloak is configured with and add `http://localhost:8080/q/dev/io.quarkus.quarkus-oidc/provider` to `Valid Redirect URIs`. If you used `-Dquarkus.http.port` when starting Quarkus then change `8080` to the value of `quarkus.http.port`. +In this case select the `Keycloak Admin` option in the right top corner, login as `admin:admin`, select the test realm and the client which Dev UI for Keycloak is configured with and add `http://localhost:8080/q/devui-v1/io.quarkus.quarkus-oidc/provider` to `Valid Redirect URIs`. If you used `-Dquarkus.http.port` when starting Quarkus then change `8080` to the value of `quarkus.http.port`. If the container is shared between multiple applications running on different ports then you will need to register `redirect_uri` values for each of these applications. @@ -297,13 +297,13 @@ And you will see the following message: ... ---- -If the provider metadata discovery has been successful then, after you open the main link:http://localhost:8080/q/dev[Dev UI page], you will see the `OpenID Connect Card` page linking to `Dev Console`: +If the provider metadata discovery has been successful then, after you open the main link:http://localhost:8080/q/devui-v1[Dev UI (V1) page], you will see the `OpenID Connect Card` page linking to `Dev Console`: image::dev-ui-oidc-devconsole-card.png[alt=Generic Dev UI OpenID Connect Card,role="center"] Follow the link, and you will be able to log in to your provider, get the tokens and test the application. The experience will be the same as described in the <> section, where `Dev Services for Keycloak` container has been started, especially if you work with Keycloak. -You will most likely need to configure your OpenId Connect provider to support redirecting back to the `Dev Console`. Add `http://localhost:8080/q/dev/io.quarkus.quarkus-oidc/provider` as one of the supported redirect and logout URLs. +You will most likely need to configure your OpenId Connect provider to support redirecting back to the `Dev Console`. Add `http://localhost:8080/q/devui-v1/io.quarkus.quarkus-oidc/provider` as one of the supported redirect and logout URLs. If you work with other providers then a Dev UI experience described in the <> section might differ slightly. For example, an access token may not be in a JWT format, so it won't be possible to show its internal content, though all providers should return an ID Token as JWT. @@ -401,7 +401,7 @@ Please follow the xref:dev-ui.adoc[Dev UI] tutorial as well as check the `extens == Non Application Root Path Considerations -This document refers to the `http://localhost:8080/q/dev` Dev UI URL in several places where `q` is a default non application root path. If you customize `quarkus.http.root-path` and/or `quarkus.http.non-application-root-path` properties then replace `q` accordingly, please see https://quarkus.io/blog/path-resolution-in-quarkus/[Path Resolution in Quarkus] for more information. +This document refers to the `http://localhost:8080/q/devui-v1` Dev UI URL in several places where `q` is a default non application root path. If you customize `quarkus.http.root-path` and/or `quarkus.http.non-application-root-path` properties then replace `q` accordingly, please see https://quarkus.io/blog/path-resolution-in-quarkus/[Path Resolution in Quarkus] for more information. == References diff --git a/extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-beans.js b/extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-beans.js similarity index 100% rename from extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-beans.js rename to extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-beans.js diff --git a/extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-decorators.js b/extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-decorators.js similarity index 100% rename from extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-decorators.js rename to extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-decorators.js diff --git a/extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-fired-events.js b/extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-fired-events.js similarity index 100% rename from extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-fired-events.js rename to extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-fired-events.js diff --git a/extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-interceptors.js b/extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-interceptors.js similarity index 100% rename from extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-interceptors.js rename to extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-interceptors.js diff --git a/extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-invocation-trees.js b/extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-invocation-trees.js similarity index 100% rename from extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-invocation-trees.js rename to extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-invocation-trees.js diff --git a/extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-observers.js b/extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-observers.js similarity index 100% rename from extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-observers.js rename to extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-observers.js diff --git a/extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-removed-components.js b/extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-removed-components.js similarity index 100% rename from extensions/arc/deployment/src/main/resources/dev-ui/arc/qwc-arc-removed-components.js rename to extensions/arc/deployment/src/main/resources/dev/arc/qwc-arc-removed-components.js diff --git a/extensions/cache/deployment/src/main/resources/dev-ui/cache/qwc-cache-caches.js b/extensions/cache/deployment/src/main/resources/dev/cache/qwc-cache-caches.js similarity index 100% rename from extensions/cache/deployment/src/main/resources/dev-ui/cache/qwc-cache-caches.js rename to extensions/cache/deployment/src/main/resources/dev/cache/qwc-cache-caches.js diff --git a/extensions/container-image/deployment/src/main/resources/dev-ui/container-image/qwc-container-image-build.js b/extensions/container-image/deployment/src/main/resources/dev/container-image/qwc-container-image-build.js similarity index 100% rename from extensions/container-image/deployment/src/main/resources/dev-ui/container-image/qwc-container-image-build.js rename to extensions/container-image/deployment/src/main/resources/dev/container-image/qwc-container-image-build.js diff --git a/extensions/datasource/deployment/src/main/resources/dev-ui/datasources/qwc-datasources-reset.js b/extensions/datasource/deployment/src/main/resources/dev/datasources/qwc-datasources-reset.js similarity index 100% rename from extensions/datasource/deployment/src/main/resources/dev-ui/datasources/qwc-datasources-reset.js rename to extensions/datasource/deployment/src/main/resources/dev/datasources/qwc-datasources-reset.js diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeCreateFromHibernateTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeCreateFromHibernateTest.java index a9d30c5362216..dd7fa856034db 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeCreateFromHibernateTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayDevModeCreateFromHibernateTest.java @@ -36,7 +36,7 @@ public void testGenerateMigrationFromHibernate() { RestAssured.get("fruit").then().statusCode(200) .body("[0].name", CoreMatchers.is("Orange")); RestAssured.given().redirects().follow(false).formParam("datasource", "") - .post("/q/dev/io.quarkus.quarkus-flyway/create-initial-migration").then().statusCode(303); + .post("/q/devui-v1/io.quarkus.quarkus-flyway/create-initial-migration").then().statusCode(303); config.modifySourceFile(Fruit.class, s -> s.replace("Fruit {", "Fruit {\n" + " \n" + diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/devconsole/DevConsoleUnaryMethodTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/devconsole/DevConsoleUnaryMethodTest.java index 5bd59bccc933d..cc171f2a7a6ee 100644 --- a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/devconsole/DevConsoleUnaryMethodTest.java +++ b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/devconsole/DevConsoleUnaryMethodTest.java @@ -37,7 +37,7 @@ public void websocketTest() throws Exception { List incomingMessages = new CopyOnWriteArrayList<>(); HttpClient client = vertx.createHttpClient(); - client.webSocket(8080, "localhost", "/q/dev/io.quarkus.quarkus-grpc/grpc-test", result -> { + client.webSocket(8080, "localhost", "/q/devui-v1/io.quarkus.quarkus-grpc/grpc-test", result -> { if (result.failed()) { log.error("failure making a web socket connection", result.cause()); return; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-ui/resteasy-reactive/qwc-resteasy-reactive-card.js b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev/resteasy-reactive/qwc-resteasy-reactive-card.js similarity index 100% rename from extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-ui/resteasy-reactive/qwc-resteasy-reactive-card.js rename to extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev/resteasy-reactive/qwc-resteasy-reactive-card.js diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-ui/resteasy-reactive/qwc-resteasy-reactive-endpoint-scores.js b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev/resteasy-reactive/qwc-resteasy-reactive-endpoint-scores.js similarity index 100% rename from extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-ui/resteasy-reactive/qwc-resteasy-reactive-endpoint-scores.js rename to extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev/resteasy-reactive/qwc-resteasy-reactive-endpoint-scores.js diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-ui/resteasy-reactive/qwc-resteasy-reactive-exception-mappers.js b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev/resteasy-reactive/qwc-resteasy-reactive-exception-mappers.js similarity index 100% rename from extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-ui/resteasy-reactive/qwc-resteasy-reactive-exception-mappers.js rename to extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev/resteasy-reactive/qwc-resteasy-reactive-exception-mappers.js diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-ui/resteasy-reactive/qwc-resteasy-reactive-parameter-converter-providers.js b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev/resteasy-reactive/qwc-resteasy-reactive-parameter-converter-providers.js similarity index 100% rename from extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev-ui/resteasy-reactive/qwc-resteasy-reactive-parameter-converter-providers.js rename to extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/resources/dev/resteasy-reactive/qwc-resteasy-reactive-parameter-converter-providers.js diff --git a/extensions/scheduler/deployment/src/main/resources/dev-ui/scheduler/qwc-scheduler-log.js b/extensions/scheduler/deployment/src/main/resources/dev/scheduler/qwc-scheduler-log.js similarity index 100% rename from extensions/scheduler/deployment/src/main/resources/dev-ui/scheduler/qwc-scheduler-log.js rename to extensions/scheduler/deployment/src/main/resources/dev/scheduler/qwc-scheduler-log.js diff --git a/extensions/scheduler/deployment/src/main/resources/dev-ui/scheduler/qwc-scheduler-scheduled-methods.js b/extensions/scheduler/deployment/src/main/resources/dev/scheduler/qwc-scheduler-scheduled-methods.js similarity index 100% rename from extensions/scheduler/deployment/src/main/resources/dev-ui/scheduler/qwc-scheduler-scheduled-methods.js rename to extensions/scheduler/deployment/src/main/resources/dev/scheduler/qwc-scheduler-scheduled-methods.js diff --git a/extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev-ui/smallrye-fault-tolerance/qwc-fault-tolerance-methods.js b/extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev/smallrye-fault-tolerance/qwc-fault-tolerance-methods.js similarity index 100% rename from extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev-ui/smallrye-fault-tolerance/qwc-fault-tolerance-methods.js rename to extensions/smallrye-fault-tolerance/deployment/src/main/resources/dev/smallrye-fault-tolerance/qwc-fault-tolerance-methods.js diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev-ui/smallrye-reactive-messaging/qwc-smallrye-reactive-messaging-channels.js b/extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev/smallrye-reactive-messaging/qwc-smallrye-reactive-messaging-channels.js similarity index 100% rename from extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev-ui/smallrye-reactive-messaging/qwc-smallrye-reactive-messaging-channels.js rename to extensions/smallrye-reactive-messaging/deployment/src/main/resources/dev/smallrye-reactive-messaging/qwc-smallrye-reactive-messaging-channels.js diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java index f8567fabc9d3b..90725c7a4e8f8 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java @@ -56,8 +56,8 @@ */ public class BuildTimeContentProcessor { private static final String SLASH = "/"; - private static final String DEV_UI = "dev-ui"; - private static final String BUILD_TIME_PATH = "dev-ui-templates/build-time"; + private static final String DEV_UI = "dev"; + private static final String BUILD_TIME_PATH = "dev-templates/build-time"; final Config config = ConfigProvider.getConfig(); diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java index 164297328ea14..52a23c598ef7d 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java @@ -73,7 +73,7 @@ */ public class DevUIProcessor { - private static final String DEVUI = "dev-ui"; + private static final String DEVUI = "dev"; private static final String SLASH = "/"; private static final String DOT = "."; private static final String SPACE = " "; diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java index 55c22afcde627..20bf364f09821 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java @@ -62,7 +62,7 @@ public class DevConsole implements Handler { this.globalData.put("frameworkRootPath", frameworkRootPath); // This includes the dev segment, but does not include a trailing slash (for append) - this.devRootAppend = frameworkRootPath + "dev"; + this.devRootAppend = frameworkRootPath + "devui-v1"; this.globalData.put("devRootAppend", devRootAppend); this.globalData.put("quarkusVersion", Version.getVersion()); @@ -107,7 +107,7 @@ private void initLazyState() { @Override public void handle(RoutingContext ctx) { initLazyState(); - // Redirect /q/dev to /q/dev/ + // Redirect /q/devui-v1 to /q/devui-v1/ if (ctx.normalizedPath().length() == devRootAppend.length()) { ctx.response().setStatusCode(302); ctx.response().headers().set(HttpHeaders.LOCATION, devRootAppend + "/"); diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java index fec79b47321cf..17ba30a049c37 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java @@ -273,7 +273,7 @@ public void handle(RoutingContext event) { .handler(new DevConsole(engine, httpRootPath, frameworkRootPath)); mainRouter = Router.router(devConsoleVertx); mainRouter.errorHandler(500, errorHandler); - mainRouter.route(nonApplicationRootPathBuildItem.resolvePath("dev*")).subRouter(router); + mainRouter.route(nonApplicationRootPathBuildItem.resolvePath("devui-v1*")).subRouter(router); } @BuildStep(onlyIf = IsDevelopment.class) @@ -461,14 +461,14 @@ public void setupDevConsoleRoutes( } routeBuildItemBuildProducer.produce(nonApplicationRootPathBuildItem.routeBuilder() - .route("dev/resources/*") + .route("devui-v1/resources/*") .handler(recorder.fileSystemStaticHandler( result.getWebRootConfigurations(), shutdownContext)) .build()); // Add the log stream routeBuildItemBuildProducer.produce(nonApplicationRootPathBuildItem.routeBuilder() - .route("dev/logstream") + .route("devui-v1/logstream") .handler(logStreamRecorder.websocketHandler(historyHandlerBuildItem.value)) .build()); @@ -479,13 +479,13 @@ public void setupDevConsoleRoutes( if (!i.isDeploymentSide()) { if (devUIConfig.cors.enabled) { routeBuildItemBuildProducer.produce(nonApplicationRootPathBuildItem.routeBuilder() - .route("dev/*") + .route("devui-v1/*") .handler(new DevConsoleCORSFilter()) .build()); } NonApplicationRootPathBuildItem.Builder builder = nonApplicationRootPathBuildItem.routeBuilder() .routeFunction( - "dev/" + groupAndArtifact.getKey() + "." + groupAndArtifact.getValue() + "/" + i.getPath(), + "devui-v1/" + groupAndArtifact.getKey() + "." + groupAndArtifact.getValue() + "/" + i.getPath(), new RuntimeDevConsoleRoute(i.getMethod(), i.isBodyHandlerRequired() ? bodyHandlerBuildItem.getHandler() : null)); if (i.isBlockingHandler()) { @@ -499,12 +499,12 @@ public void setupDevConsoleRoutes( DevConsoleManager.registerHandler(new DevConsoleHttpHandler()); //must be last so the above routes have precedence routeBuildItemBuildProducer.produce(nonApplicationRootPathBuildItem.routeBuilder() - .route("dev/*") + .route("devui-v1/*") .handler(new DevConsoleFilter()) .build()); routeBuildItemBuildProducer.produce(nonApplicationRootPathBuildItem.routeBuilder() - .route("dev") - .displayOnNotFoundPage("Dev UI") + .route("devui-v1") + .displayOnNotFoundPage("Dev UI (v1)") .handler(new RedirectHandler()) .build()); } @@ -533,6 +533,7 @@ void setupConsole(HttpRootPathBuildItem rp, NonApplicationRootPathBuildItem np, String port = c.getOptionalValue("quarkus.http.port", String.class).orElse("8080"); context.reset( new ConsoleCommand('w', "Open the application in a browser", null, () -> openBrowser(rp, np, "/", host, port)), + // Open the new dev ui. new ConsoleCommand('d', "Open the Dev UI in a browser", null, () -> openBrowser(rp, np, "/q/dev", host, port))); } diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/package-info.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/package-info.java new file mode 100644 index 0000000000000..bd63e36c5ee6e --- /dev/null +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/package-info.java @@ -0,0 +1,4 @@ +/** + * Package containing the dev UI v1. + */ +package io.quarkus.vertx.http.deployment.devmode.console; \ No newline at end of file diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java index 5d8ee7d0ce9a5..89d8b783c0fc2 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java @@ -57,7 +57,7 @@ public void setupTestRoutes( if (TestSupport.instance().isPresent()) { // Add continuous testing routeBuildItemBuildProducer.produce(nonApplicationRootPathBuildItem.routeBuilder() - .route("dev/test") + .route("devui-v1/test") .handler(recorder.continuousTestHandler(shutdownContextBuildItem)) .build()); } diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js b/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js index 72c4577adeedd..555b42743c331 100644 --- a/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js +++ b/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js @@ -4,12 +4,12 @@ var myself = $('script[src*=logstream]'); var frameworkRootPath = myself.attr('data-frameworkRootPath'); if (typeof frameworkRootPath === "undefined" ) { var pathname = window.location.pathname; - var frameworkRootPath = pathname.substr(0, pathname.indexOf('/dev/')); + var frameworkRootPath = pathname.substr(0, pathname.indexOf('/devui-v1/')); } // Get the streaming path var streamingPath = myself.attr('data-streamingPath'); if (typeof streamingPath === "undefined" ) { - var streamingPath = "/dev/logstream"; + var streamingPath = "/devui-v1/logstream"; } var zoom = 0.90; diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-static/js/tests.js b/extensions/vertx-http/deployment/src/main/resources/dev-static/js/tests.js index 6f62c4022a1e1..a6af151087336 100644 --- a/extensions/vertx-http/deployment/src/main/resources/dev-static/js/tests.js +++ b/extensions/vertx-http/deployment/src/main/resources/dev-static/js/tests.js @@ -1,10 +1,10 @@ var testsPathname = window.location.pathname; -var testsFrameworkRootPath = testsPathname.substr(0, testsPathname.indexOf('/dev/')); +var testsFrameworkRootPath = testsPathname.substr(0, testsPathname.indexOf('/devui-v1/')); // Get the streaming path -var testsStreamingPath = "/dev/test"; +var testsStreamingPath = "/devui-v1/test"; var testsWebSocket; -var testBackendUrl = window.location.protocol + "//" + window.location.host + testsFrameworkRootPath + "/dev/io.quarkus.quarkus-vertx-http/tests/"; +var testBackendUrl = window.location.protocol + "//" + window.location.host + testsFrameworkRootPath + "/devui-v1/io.quarkus.quarkus-vertx-http/tests/"; var testsInProgress = false; var testsIsRunning = false; var hasFailingTests = false; diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html index 15f844e897309..27493f8dcdaac 100644 --- a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html +++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html @@ -51,7 +51,7 @@ {/style} {#script} - var testPageUrl = window.location.protocol + "//" + window.location.host + testsPathname.substr(0, testsPathname.indexOf('/dev/')) + "/dev/io.quarkus.quarkus-vertx-http/tests"; + var testPageUrl = window.location.protocol + "//" + window.location.host + testsPathname.substr(0, testsPathname.indexOf('/devui-v1/')) + "/devui-v1/io.quarkus.quarkus-vertx-http/tests"; document.addEventListener('messageReceived', function (e) { $.get(testPageUrl, function(response){ var testsResultsSection = $(response).find("#testsResultsSection"); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorBodyHandlerTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorBodyHandlerTest.java index 7583b859445c5..3708b7486eeeb 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorBodyHandlerTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorBodyHandlerTest.java @@ -29,7 +29,7 @@ public void testChangeHttpRoute() { .formParam("value", "/foo") .formParam("action", "updateProperty") .redirects().follow(false) - .post("q/dev/io.quarkus.quarkus-vertx-http/config") + .post("q/devui-v1/io.quarkus.quarkus-vertx-http/config") .then() .statusCode(303); RestAssured.with() diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorTest.java index bfa4de214ebcf..c09b862fdb9f2 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigEditorTest.java @@ -22,7 +22,7 @@ public void testChangeHttpRoute() { .formParam("value", "/foo") .formParam("action", "updateProperty") .redirects().follow(false) - .post("q/dev/io.quarkus.quarkus-vertx-http/config") + .post("q/devui-v1/io.quarkus.quarkus-vertx-http/config") .then() .statusCode(303); RestAssured.with() @@ -46,7 +46,7 @@ public void testSetEmptyValue() { .formParam("value", "") .formParam("action", "updateProperty") .redirects().follow(false) - .post("q/dev/io.quarkus.quarkus-vertx-http/config") + .post("q/devui-v1/io.quarkus.quarkus-vertx-http/config") .then() .statusCode(303); RestAssured.with() diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigMisinterpretedDoubleUnderscoreTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigMisinterpretedDoubleUnderscoreTest.java index 519d8d758578a..81d1e282fde45 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigMisinterpretedDoubleUnderscoreTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleConfigMisinterpretedDoubleUnderscoreTest.java @@ -25,7 +25,7 @@ public class DevConsoleConfigMisinterpretedDoubleUnderscoreTest { @Test public void testNoFailure() { - RestAssured.get("q/dev/io.quarkus.quarkus-vertx-http/config") + RestAssured.get("q/devui-v1/io.quarkus.quarkus-vertx-http/config") .then() .statusCode(200).body(Matchers.containsString("Config Editor")); } diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleCorsTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleCorsTest.java index 81d6660f6c244..b7a4332671f67 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleCorsTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/devconsole/DevConsoleCorsTest.java @@ -24,7 +24,7 @@ public void testPreflightHttpLocalhostOrigin() { .header("Origin", origin) .header("Access-Control-Request-Method", methods) .when() - .options("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .options("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(200) .header("Access-Control-Allow-Origin", origin) .header("Access-Control-Allow-Methods", methods) @@ -39,7 +39,7 @@ public void testPreflightHttpLocalhostIpOrigin() { .header("Origin", origin) .header("Access-Control-Request-Method", methods) .when() - .options("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .options("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(200) .header("Access-Control-Allow-Origin", origin) .header("Access-Control-Allow-Methods", methods) @@ -54,7 +54,7 @@ public void testPreflightHttpsLocalhostOrigin() { .header("Origin", origin) .header("Access-Control-Request-Method", methods) .when() - .options("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .options("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(200) .header("Access-Control-Allow-Origin", origin) .header("Access-Control-Allow-Methods", methods) @@ -69,7 +69,7 @@ public void testPreflightHttpsLocalhostIpOrigin() { .header("Origin", origin) .header("Access-Control-Request-Method", methods) .when() - .options("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .options("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(200) .header("Access-Control-Allow-Origin", origin) .header("Access-Control-Allow-Methods", methods) @@ -83,7 +83,7 @@ public void testPreflightNonLocalhostOrigin() { .header("Origin", "https://quarkus.io/http://localhost") .header("Access-Control-Request-Method", methods) .when() - .options("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .options("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(403) .header("Access-Control-Allow-Origin", nullValue()) .header("Access-Control-Allow-Methods", nullValue()) @@ -97,7 +97,7 @@ public void testPreflightBadLocalhostOrigin() { .header("Origin", "http://localhost:8080/devui") .header("Access-Control-Request-Method", methods) .when() - .options("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .options("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(403) .header("Access-Control-Allow-Origin", nullValue()) .body(emptyOrNullString()); @@ -110,7 +110,7 @@ public void testPreflightBadLocalhostIpOrigin() { .header("Origin", "http://127.0.0.1:8080/devui") .header("Access-Control-Request-Method", methods) .when() - .options("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .options("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(403) .header("Access-Control-Allow-Origin", nullValue()) .body(emptyOrNullString()); @@ -123,7 +123,7 @@ public void testPreflightLocalhostOriginWithoutPort() { .header("Origin", "http://localhost") .header("Access-Control-Request-Method", methods) .when() - .options("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .options("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(403) .header("Access-Control-Allow-Origin", nullValue()) .body(emptyOrNullString()); @@ -135,7 +135,7 @@ public void testSimpleRequestHttpLocalhostOrigin() { RestAssured.given() .header("Origin", origin) .when() - .get("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .get("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(200) .header("Access-Control-Allow-Origin", origin) .header("Access-Control-Allow-Methods", nullValue()) @@ -148,7 +148,7 @@ public void testSimpleRequestHttpLocalhostIpOrigin() { RestAssured.given() .header("Origin", origin) .when() - .get("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .get("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(200) .header("Access-Control-Allow-Origin", origin) .header("Access-Control-Allow-Methods", nullValue()) @@ -161,7 +161,7 @@ public void testSimpleRequestHttpsLocalhostOrigin() { RestAssured.given() .header("Origin", origin) .when() - .get("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .get("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(200) .header("Access-Control-Allow-Origin", origin) .header("Access-Control-Allow-Methods", nullValue()) @@ -174,7 +174,7 @@ public void testSimpleRequestHttpsLocalhostIpOrigin() { RestAssured.given() .header("Origin", origin) .when() - .get("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .get("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(200) .header("Access-Control-Allow-Origin", origin) .header("Access-Control-Allow-Methods", nullValue()) @@ -186,7 +186,7 @@ public void testSimpleRequestNonLocalhostOrigin() { RestAssured.given() .header("Origin", "https://quarkus.io/http://localhost") .when() - .get("q/dev/io.quarkus.quarkus-vertx-http/config").then() + .get("q/devui-v1/io.quarkus.quarkus-vertx-http/config").then() .statusCode(403) .header("Access-Control-Allow-Origin", nullValue()) .body(emptyOrNullString()); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java index d560f2d81e6e8..400978bea0b66 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java @@ -48,7 +48,7 @@ public void checkTestsAreRun() throws InterruptedException { Assertions.assertEquals(1L, ts.getTotalTestsPassed()); Assertions.assertEquals(0L, ts.getTotalTestsSkipped()); - SuiteResult suiteResult = RestAssured.get("q/dev/io.quarkus.quarkus-vertx-http/tests/result") + SuiteResult suiteResult = RestAssured.get("q/devui-v1/io.quarkus.quarkus-vertx-http/tests/result") .as(SuiteResult.class); Assertions.assertEquals(2, suiteResult.getResults().size()); for (ClassResult cr : suiteResult.getResults().values()) { diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java index 8f9afa786295b..bb24b63d52416 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java @@ -44,7 +44,7 @@ public void testBrokenOnlyMode() throws InterruptedException { Assertions.assertEquals(0L, ts.getTestsSkipped()); //start broken only mode - RestAssured.post("q/dev/io.quarkus.quarkus-vertx-http/tests/toggle-broken-only"); + RestAssured.post("q/devui-v1/io.quarkus.quarkus-vertx-http/tests/toggle-broken-only"); test.modifyTestSourceFile(SimpleET.class, new Function() { @Override diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java index 2ee0cb592ea00..99fc13b33232b 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java @@ -43,7 +43,7 @@ public void testParameterizedTests() throws InterruptedException { Assertions.assertEquals(4L, ts.getTestsPassed()); Assertions.assertEquals(0L, ts.getTestsSkipped()); - RestAssured.post("q/dev/io.quarkus.quarkus-vertx-http/tests/runfailed"); + RestAssured.post("q/devui-v1/io.quarkus.quarkus-vertx-http/tests/runfailed"); ts = utils.waitForNextCompletion(); diff --git a/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleRouteBuildItem.java b/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleRouteBuildItem.java index 4371c83d2075d..b7034bbb87935 100644 --- a/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleRouteBuildItem.java +++ b/extensions/vertx-http/dev-console-spi/src/main/java/io/quarkus/devconsole/spi/DevConsoleRouteBuildItem.java @@ -14,7 +14,7 @@ /** * A route for handling requests in the dev console. *

- * Routes are registered under /q/dev/{groupId}.{artifactId}/ + * Routes are registered under /q/devui-v1/{groupId}.{artifactId}/ *

* The route is registered: *

    diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui-templates/build-time/build-time-data.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-templates/build-time/build-time-data.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui-templates/build-time/build-time-data.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev-templates/build-time/build-time-data.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui-templates/build-time/index.html b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-templates/build-time/index.html similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui-templates/build-time/index.html rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev-templates/build-time/index.html diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/jsonrpc.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/jsonrpc.js similarity index 99% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/jsonrpc.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/jsonrpc.js index 7d6ff6c7c0c9f..c61db06700842 100644 --- a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/jsonrpc.js +++ b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/jsonrpc.js @@ -94,8 +94,9 @@ export class JsonRpc { JsonRpc.serverUri = "ws:"; } var currentPath = window.location.pathname; - currentPath = currentPath.substring(0, currentPath.indexOf('/dev')) + "/dev-ui"; + currentPath = currentPath.substring(0, currentPath.indexOf('/dev')) + "/dev"; JsonRpc.serverUri += "//" + window.location.host + currentPath + "/json-rpc-ws"; + console.log(("Json RPC server uri", JsonRpc.serverUri)); JsonRpc.connect(); } diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/log-controller.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/log-controller.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/log-controller.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/log-controller.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/notifier.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/notifier.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/notifier.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/notifier.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/router-controller.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/router-controller.js similarity index 95% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/router-controller.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/router-controller.js index dabf7b27b5da4..f8a965dbb0054 100644 --- a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/router-controller.js +++ b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/router-controller.js @@ -46,12 +46,12 @@ export class RouterController { * Get the header title for a certain path */ static titleForPath(path){ - if(path.includes('/dev-ui/')){ + if(path.includes('/dev/')){ var metadata = RouterController.metaDataForPath(path); if(metadata && metadata.extensionName){ return metadata.extensionName; }else{ - var currentPage = path.substring(path.indexOf('/dev-ui/') + 8); + var currentPage = path.substring(path.indexOf('/dev/') + 8); if(currentPage.includes('/')){ // This is a submenu var extension = currentPage.substring(0, currentPage.lastIndexOf("/")); @@ -81,8 +81,8 @@ export class RouterController { */ static subMenuForPath(path){ - if(path.includes('/dev-ui/')){ - var currentPage = path.substring(path.indexOf('/dev-ui/') + 8); + if(path.includes('/dev/')){ + var currentPage = path.substring(path.indexOf('/dev/') + 5); if(currentPage.includes('/')){ // This is a submenu const links = []; @@ -92,7 +92,7 @@ export class RouterController { var counter = 0; var index = 0; routes.forEach((route) => { - var pageLink = route.path.substring(route.path.indexOf('/dev-ui/') + 8); + var pageLink = route.path.substring(route.path.indexOf('/dev/') + 5); if(pageLink.includes('/')){ // To filter out section menu items if(route.path.startsWith(startOfPath)){ links.push(route); @@ -197,7 +197,8 @@ export class RouterController { static basePath(){ var base = window.location.pathname; - return base.substring(0, base.indexOf('/dev')) + "/dev-ui"; + console.log(("Base is", base.substring(0, base.indexOf('/dev')) + "/dev")); + return base.substring(0, base.indexOf('/dev')) + "/dev"; } static pageRef(pageName) { @@ -242,7 +243,7 @@ export class RouterController { if (currentSelection === path) { Router.go({pathname: path}); // The default naked route - } else if (!RouterController.router.location.route && defaultRoute && currentSelection.endsWith('/dev-ui/')) { + } else if (!RouterController.router.location.route && defaultRoute && currentSelection.endsWith('/dev/')) { Router.go({pathname: path}); // We do not know and have not yet loaded the requested location } else if (!RouterController.router.location.route && defaultRoute) { diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/storage-controller.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/storage-controller.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/storage-controller.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/controller/storage-controller.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/echarts/echarts-abstract-canvas.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/echarts/echarts-abstract-canvas.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/echarts/echarts-abstract-canvas.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/echarts/echarts-abstract-canvas.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/echarts/echarts-gauge-grade.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/echarts/echarts-gauge-grade.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/echarts/echarts-gauge-grade.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/echarts/echarts-gauge-grade.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/favicon.ico b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/favicon.ico similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/favicon.ico rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/favicon.ico diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/font/red-hat-font.min.css b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/font/red-hat-font.min.css similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/font/red-hat-font.min.css rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/font/red-hat-font.min.css diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/icon/font-awesome-brands.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/icon/font-awesome-brands.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/icon/font-awesome-brands.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/icon/font-awesome-brands.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/icon/font-awesome-regular.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/icon/font-awesome-regular.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/icon/font-awesome-regular.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/icon/font-awesome-regular.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/icon/font-awesome-solid.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/icon/font-awesome-solid.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/icon/font-awesome-solid.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/icon/font-awesome-solid.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/icon/font-awesome.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/icon/font-awesome.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/icon/font-awesome.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/icon/font-awesome.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/quarkus-logo.png b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/quarkus-logo.png similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/quarkus-logo.png rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/quarkus-logo.png diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qui/qui-alert.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qui/qui-alert.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qui/qui-alert.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qui/qui-alert.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qui/qui-badge.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qui/qui-badge.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qui/qui-badge.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qui/qui-badge.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-build-steps.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-build-steps.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-build-steps.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-build-steps.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-configuration.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-configuration.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-configuration.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-configuration.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-continuous-testing.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-continuous-testing.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-continuous-testing.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-continuous-testing.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-data-qute-page.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-data-qute-page.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-data-qute-page.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-data-qute-page.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-data-raw-page.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-data-raw-page.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-data-raw-page.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-data-raw-page.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-data-table-page.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-data-table-page.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-data-table-page.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-data-table-page.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-dev-services.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-dev-services.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-dev-services.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-dev-services.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-extension-link.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-extension-link.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-extension-link.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-extension-link.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-extension.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-extension.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-extension.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-extension.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-extensions.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-extensions.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-extensions.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-extensions.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-external-page.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-external-page.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-external-page.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-external-page.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-footer.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-footer.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-footer.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-footer.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-header.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-header.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-header.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-header.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-hot-reload-element.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-hot-reload-element.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-hot-reload-element.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-hot-reload-element.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-jsonrpc-messages.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-jsonrpc-messages.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-jsonrpc-messages.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-jsonrpc-messages.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-menu.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-menu.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-menu.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-menu.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-server-log.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-server-log.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-server-log.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-server-log.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-ws-status.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-ws-status.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-ws-status.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/qwc/qwc-ws-status.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/state/connection-state.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/state/connection-state.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/state/connection-state.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/state/connection-state.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/state/devui-state.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/state/devui-state.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/state/devui-state.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/state/devui-state.js diff --git a/extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/state/theme-state.js b/extensions/vertx-http/dev-ui-resources/src/main/resources/dev/state/theme-state.js similarity index 100% rename from extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/state/theme-state.js rename to extensions/vertx-http/dev-ui-resources/src/main/resources/dev/state/theme-state.js diff --git a/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/buildtime/QuteTemplateBuildItem.java b/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/buildtime/QuteTemplateBuildItem.java index c9db5ef99730c..1570332181120 100644 --- a/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/buildtime/QuteTemplateBuildItem.java +++ b/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/buildtime/QuteTemplateBuildItem.java @@ -8,7 +8,7 @@ /** * Contains info on the build time template used to build static content for Dev UI - * All files are relative to dev-ui-templates/build-time/{extensionName} (in src/main/resources) + * All files are relative to dev-templates/build-time/{extensionName} (in src/main/resources) * * This contain the fileName to the template, and the template data (variables) * diff --git a/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/Page.java b/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/Page.java index a96a2d44832c1..b10c33fd41128 100644 --- a/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/Page.java +++ b/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/Page.java @@ -20,8 +20,8 @@ public class Page { private final String componentLink; // This is a link to the component, excluding namespace private final Map metadata; // Key value Metadata - private final boolean embed; // if the component is embeded in the page. true in all cases except maybe external pages - private final boolean internalComponent; // True f this component is provided by dev-ui (usually provided by the extension) + private final boolean embed; // if the component is embedded in the page. true in all cases except maybe external pages + private final boolean internalComponent; // True f this component is provided by dev (usually provided by the extension) private String namespace = null; // The namespace can be the extension path or, if internal, qwc diff --git a/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/QuteDataPageBuilder.java b/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/QuteDataPageBuilder.java index 595ad61283569..c560d096d03d8 100644 --- a/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/QuteDataPageBuilder.java +++ b/extensions/vertx-http/dev-ui-spi/src/main/java/io/quarkus/devui/spi/page/QuteDataPageBuilder.java @@ -15,7 +15,7 @@ protected QuteDataPageBuilder(String title) { public QuteDataPageBuilder templateLink(String templateLink) { if (templateLink == null || templateLink.isEmpty() || !templateLink.endsWith(DOT_HTML)) { throw new RuntimeException( - "Invalid template link [" + templateLink + "] - Expeting a link that ends with .html"); + "Invalid template link [" + templateLink + "] - Expecting a link that ends with .html"); } this.templateLink = templateLink; @@ -30,7 +30,7 @@ public Page build() { } public String getTemplatePath() { - return "/dev-ui/" + super.namespace + "/" + this.templateLink; + return "/dev/" + super.namespace + "/" + this.templateLink; } } \ No newline at end of file diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIBuildTimeStaticHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIBuildTimeStaticHandler.java index c66a937cda0eb..077bedb619f09 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIBuildTimeStaticHandler.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIBuildTimeStaticHandler.java @@ -14,7 +14,7 @@ */ public class DevUIBuildTimeStaticHandler implements Handler { private Map urlAndPath; - private String basePath; // Like /q/dev-ui + private String basePath; // Like /q/dev public DevUIBuildTimeStaticHandler() { diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleFilter.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleFilter.java index a16ab6330f01f..6e51afbee3633 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleFilter.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleFilter.java @@ -20,7 +20,7 @@ /** * This is a Handler running in the regular runtime Vert.x instance - * and what it does is to take the Vert.x request coming from client (under /q/dev/) + * and what it does is to take the Vert.x request coming from client (under /q/devui-v1/) * and create the DevConsoleRequest that ends up being sent to the Netty Virtual Channel * which is eventually piped into the Netty event loop that powers the Dev Vert.x instance. */ diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/project/quarkus/base/src/main/resources/META-INF/resources/index.tpl.qute.html b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/project/quarkus/base/src/main/resources/META-INF/resources/index.tpl.qute.html index 2434627133234..aff57f4f15ed8 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/project/quarkus/base/src/main/resources/META-INF/resources/index.tpl.qute.html +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/project/quarkus/base/src/main/resources/META-INF/resources/index.tpl.qute.html @@ -259,6 +259,7 @@

    You just made a Quarkus application.

      {merged-content}
    +

    Dev UI V1: /q/devui-v1

    {#if input.selected-extensions} diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleKafkaSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleKafkaSmokeTest.java index bbf82bf28ab1b..5a5fb4facd5c3 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleKafkaSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleKafkaSmokeTest.java @@ -21,7 +21,7 @@ public class DevConsoleKafkaSmokeTest { @Test public void testServices() { - RestAssured.get("testing/q/dev/io.quarkus.quarkus-kafka-client/kafka-dev-ui") + RestAssured.get("testing/q/devui-v1/io.quarkus.quarkus-kafka-client/kafka-dev-ui") .then() .statusCode(200).body(Matchers.containsString("Kafka Dev UI")); } diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java index 9bd6f0ca8d941..057e87b3cdce8 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java @@ -359,7 +359,7 @@ public void testThatInstrumentationBasedReloadWorks() throws MavenInvocationExce runAndCheck(); // Enable instrumentation based reload to begin with - RestAssured.post("/q/dev/io.quarkus.quarkus-vertx-http/tests/toggle-instrumentation").then().statusCode(200); + RestAssured.post("/q/devui-v1/io.quarkus.quarkus-vertx-http/tests/toggle-instrumentation").then().statusCode(200); //if there is an instrumentation based reload this will stay the same String firstUuid = DevModeTestUtils.getHttpResponse("/app/uuid"); @@ -392,7 +392,7 @@ public void testThatInstrumentationBasedReloadWorks() throws MavenInvocationExce //now disable instrumentation based restart, and try again //change it back to hello - RestAssured.post("/q/dev/io.quarkus.quarkus-vertx-http/tests/toggle-instrumentation").then().statusCode(200); + RestAssured.post("/q/devui-v1/io.quarkus.quarkus-vertx-http/tests/toggle-instrumentation").then().statusCode(200); source = new File(testDir, "src/main/java/org/acme/HelloResource.java"); filter(source, Collections.singletonMap("return \"" + uuid + "\";", "return \"hello\";")); @@ -407,7 +407,7 @@ public void testThatInstrumentationBasedReloadWorks() throws MavenInvocationExce //now re-enable //and repeat - RestAssured.post("/q/dev/io.quarkus.quarkus-vertx-http/tests/toggle-instrumentation").then().statusCode(200); + RestAssured.post("/q/devui-v1/io.quarkus.quarkus-vertx-http/tests/toggle-instrumentation").then().statusCode(200); source = new File(testDir, "src/main/java/org/acme/HelloResource.java"); filter(source, Collections.singletonMap("return \"hello\";", "return \"" + uuid + "\";")); diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java index b99b46ab347e9..46b980c408913 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/RemoteDevMojoIT.java @@ -56,7 +56,7 @@ public void testThatTheApplicationIsReloadedOnJavaChange() .atMost(1, TimeUnit.MINUTES).until(() -> DevModeTestUtils.getHttpResponse("/app/hello").contains("carambar")); //also verify that the dev ui console is disabled - DevModeTestUtils.getHttpResponse("/q/dev", 404, 10, TimeUnit.SECONDS); + DevModeTestUtils.getHttpResponse("/q/devui-v1", 404, 10, TimeUnit.SECONDS); } @Test diff --git a/test-framework/maven/src/main/java/io/quarkus/maven/it/continuoustesting/ContinuousTestingMavenTestUtils.java b/test-framework/maven/src/main/java/io/quarkus/maven/it/continuoustesting/ContinuousTestingMavenTestUtils.java index 477a6036033c8..c05e8b8a32dcf 100644 --- a/test-framework/maven/src/main/java/io/quarkus/maven/it/continuoustesting/ContinuousTestingMavenTestUtils.java +++ b/test-framework/maven/src/main/java/io/quarkus/maven/it/continuoustesting/ContinuousTestingMavenTestUtils.java @@ -23,7 +23,7 @@ public class ContinuousTestingMavenTestUtils { static { try { - DEFAULT = new URL("http://localhost:8080/q/dev/io.quarkus.quarkus-vertx-http/tests/status"); + DEFAULT = new URL("http://localhost:8080/q/devui-v1/io.quarkus.quarkus-vertx-http/tests/status"); } catch (MalformedURLException e) { throw new RuntimeException(e); }