diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9d7356c2810b4..1e11f8a3f0b3b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,7 +52,7 @@ If you have not done so on this machine, you need to: * `xcode-select --install` * Set `GRAALVM_HOME` to your GraalVM Home directory e.g. `/opt/graalvm` on Linux or `$location/JDK/GraalVM/Contents/Home` on macOS -Docker is not strictly necessary: it is used to run the MariaDB and PostgreSQL tests which are not enabled by default. However it is a recommended install if you plan to work on Shamrock JPA support: +Docker is not strictly necessary: it is used to run the MariaDB and PostgreSQL tests which are not enabled by default. However it is a recommended install if you plan to work on Quarkus JPA support: * Check [the installation guide](https://docs.docker.com/install/), and [the MacOS installation guide](https://docs.docker.com/docker-for-mac/install/) * If you just install docker, be sure that your current user can run a container (no root required). @@ -60,13 +60,13 @@ On Linux, check [the post-installation guide](https://docs.docker.com/install/li ## Build -* Clone the repository: `git clone https://github.com/jbossas/protean-shamrock.git` -* Navigate to the directory: `cd protean-shamrock` +* Clone the repository: `git clone https://github.com/jbossas/quarkus.git` +* Navigate to the directory: `cd quarkus` * Invoke `mvn clean install` from the root directory ```bash -git clone https://github.com/jbossas/protean-shamrock.git -cd protean-shamrock +git clone https://github.com/jbossas/quarkus.git +cd quarkus mvn clean install # Wait... success! ``` diff --git a/README.md b/README.md index c84e98208b7c9..e72e4927d3448 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Shamrock +# Quarkus -[![Build Status](https://dev.azure.com/protean-ci/Shamrock/_apis/build/status/jbossas.protean-shamrock)](https://dev.azure.com/protean-ci/Shamrock/_build/latest?definitionId=4) +[![Build Status](https://dev.azure.com/quarkus-ci/Quarkus/_apis/build/status/jbossas.quarkus)](https://dev.azure.com/quarkus-ci/Quarkus/_build/latest?definitionId=4) -> Protean is a Cloud Native, Container First framework for writing Java applications. +> Quarkus is a Cloud Native, Container First framework for writing Java applications. * **Container First**: @@ -22,14 +22,14 @@ _All under ONE framework._ ## Getting Started -* [Documentation](http://10.0.144.40/nfs/protean/) -* [Getting Started](http://10.0.144.40/nfs/protean/getting-started-guide.html) +* [Documentation](http://10.0.144.40/nfs/quarkus/) +* [Getting Started](http://10.0.144.40/nfs/quarkus/getting-started-guide.html) --- -## Shamrock +## Quarkus -Shamrock, aka the core of Protean, is a framework that allows you to process Java EE and Eclipse MicroProfile metadata at build time, +Quarkus, aka the core of Quarkus, is a framework that allows you to process Java EE and Eclipse MicroProfile metadata at build time, and use it to create low overhead jar files, as well as native images using Graal/Substrate VM. At the moment it has the following features: @@ -59,13 +59,13 @@ At the moment it has the following features: - A JUnit runner that can run tests, and supports IDE usage - A JUnit runner that can test a native image produced by the Maven plugin -### How to build Shamrock +### How to build Quarkus The build instructions are available in the [contribution guide](CONTRIBUTING.md). ### Architecture Overview -Shamrock runs in two distinct phases. The first phase is build time processing phase called augmentation. In this phase +Quarkus runs in two distinct phases. The first phase is build time processing phase called augmentation. In this phase we process all metadata such as annotations and descriptors and use this information to determine which services we need to start at runtime. The output of this phase is generated bytecode that will configure and start all the services required at runtime. diff --git a/azure-mvn-settings.xml b/azure-mvn-settings.xml index baebdc865651d..7c67b289c934b 100644 --- a/azure-mvn-settings.xml +++ b/azure-mvn-settings.xml @@ -2,7 +2,7 @@ jboss-public-repository-group - *,!protean-nexus-release,!protean-nexus-snapshot + *,!quarkus-nexus-release,!quarkus-nexus-snapshot jboss http://repository.jboss.org/nexus/content/groups/developer/ @@ -25,10 +25,10 @@ never - + - protean-nexus-release - Protean AWS Nexus - Releases + quarkus-nexus-release + Quarkus AWS Nexus - Releases http://ec2-18-234-117-118.compute-1.amazonaws.com:8081/nexus/content/repositories/releases/ default @@ -39,10 +39,10 @@ false - + - protean-nexus-snapshot - Protean AWS Nexus - Snapshots + quarkus-nexus-snapshot + Quarkus AWS Nexus - Snapshots http://ec2-18-234-117-118.compute-1.amazonaws.com:8081/nexus/content/repositories/snapshots/ default diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 46fc7d95f8f44..0fb639749b0e2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,7 +16,7 @@ jobs: vmImage: 'Ubuntu 16.04' variables: - imageName: 'shamrock:$(build.buildId)' + imageName: 'quarkus:$(build.buildId)' steps: @@ -30,9 +30,9 @@ jobs: options: '-B --settings azure-mvn-settings.xml -Dnative-image.docker-build -Dtest-postgresql -Dnative-image.xmx=4g -Dnative' - script: | - docker build -f docker/integration-test-main/Dockerfile -t jtgdocker1/shamrock-integration-test-main integration-tests/main + docker build -f docker/integration-test-main/Dockerfile -t jtgdocker1/quarkus-integration-test-main integration-tests/main docker login -u jtgdocker1 -p uEo-NTv-5YT-kk6 - docker push jtgdocker1/shamrock-integration-test-main + docker push jtgdocker1/quarkus-integration-test-main docker logout displayName: Publishing Integration Test Main Container Image @@ -68,17 +68,17 @@ jobs: } cd openshift-origin-client* docker login -u jtgdocker1 -p uEo-NTv-5YT-kk6 - docker pull jtgdocker1/shamrock-integration-test-main + docker pull jtgdocker1/quarkus-integration-test-main docker pull centos/postgresql-10-centos7 docker logout ./oc create secret docker-registry jtgdocker1 --docker-username=jtgdocker1 --docker-password=uEo-NTv-5YT-kk6 --docker-email='bogus@bogus.com' ./oc secrets link default jtgdocker1 --for=pull ./oc new-app -e "POSTGRESQL_USER=hibernate_orm_test" -e "POSTGRESQL_PASSWORD=hibernate_orm_test" -e "POSTGRESQL_DATABASE=hibernate_orm_test" centos/postgresql-10-centos7 wait_for_pod postgres - ./oc new-app -e "DATASOURCE_URL=jdbc:postgresql://postgresql-10-centos7/hibernate_orm_test" jtgdocker1/shamrock-integration-test-main - wait_for_pod shamrock + ./oc new-app -e "DATASOURCE_URL=jdbc:postgresql://postgresql-10-centos7/hibernate_orm_test" jtgdocker1/quarkus-integration-test-main + wait_for_pod quarkus ./oc status - VAL=`./oc get service shamrock-integration-test-main -o "custom-columns=IP:.spec.clusterIP" --no-headers=true` + VAL=`./oc get service quarkus-integration-test-main -o "custom-columns=IP:.spec.clusterIP" --no-headers=true` VAL2=`curl -v http://$VAL:8080/jpa/testjpaeminjection` test "$VAL2" = "OK" displayName: 'Deploy and Test On Openshift' @@ -90,7 +90,7 @@ jobs: vmImage: 'vs2017-win2016' variables: - imageName: 'shamrock-windows:$(build.buildId)' + imageName: 'quarkus-windows:$(build.buildId)' steps: @@ -106,7 +106,7 @@ jobs: vmImage: 'Ubuntu 16.04' variables: - imageName: 'shamrock-jdk11:$(build.buildId)' + imageName: 'quarkus-jdk11:$(build.buildId)' steps: - task: Maven@3 diff --git a/bom/pom.xml b/bom/pom.xml index e301b266d76b5..d8af9edda89cb 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -12,252 +12,252 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-parent - org.jboss.shamrock + quarkus-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-bom - Shamrock - BOM + quarkus-bom + Quarkus - BOM pom - org.jboss.shamrock - shamrock-agroal-deployment + io.quarkus + quarkus-agroal-deployment ${project.version} provided - org.jboss.shamrock - shamrock-hibernate-validator-deployment + io.quarkus + quarkus-hibernate-validator-deployment ${project.version} provided - org.jboss.shamrock - shamrock-caffeine-deployment + io.quarkus + quarkus-caffeine-deployment ${project.version} provided - org.jboss.shamrock - shamrock-jdbc-postgresql-deployment + io.quarkus + quarkus-jdbc-postgresql-deployment ${project.version} provided - org.jboss.shamrock - shamrock-jdbc-h2-deployment + io.quarkus + quarkus-jdbc-h2-deployment ${project.version} provided - org.jboss.shamrock - shamrock-jdbc-mariadb-deployment + io.quarkus + quarkus-jdbc-mariadb-deployment ${project.version} provided - org.jboss.shamrock - shamrock-kafka-client-deployment + io.quarkus + quarkus-kafka-client-deployment ${project.version} provided - org.jboss.shamrock - shamrock-smallrye-health-deployment + io.quarkus + quarkus-smallrye-health-deployment ${project.version} provided - org.jboss.shamrock - shamrock-smallrye-jwt-deployment + io.quarkus + quarkus-smallrye-jwt-deployment ${project.version} provided - org.jboss.shamrock - shamrock-smallrye-reactive-streams-operators-deployment + io.quarkus + quarkus-smallrye-reactive-streams-operators-deployment ${project.version} provided - org.jboss.shamrock - shamrock-smallrye-reactive-type-converters-deployment + io.quarkus + quarkus-smallrye-reactive-type-converters-deployment ${project.version} provided - org.jboss.shamrock - shamrock-smallrye-reactive-messaging-deployment + io.quarkus + quarkus-smallrye-reactive-messaging-deployment ${project.version} provided - org.jboss.shamrock - shamrock-smallrye-reactive-messaging-kafka-deployment + io.quarkus + quarkus-smallrye-reactive-messaging-kafka-deployment ${project.version} provided - org.jboss.shamrock - shamrock-smallrye-metrics-deployment + io.quarkus + quarkus-smallrye-metrics-deployment ${project.version} provided - org.jboss.shamrock - shamrock-smallrye-openapi-deployment + io.quarkus + quarkus-smallrye-openapi-deployment ${project.version} provided - org.jboss.shamrock - shamrock-smallrye-opentracing-deployment + io.quarkus + quarkus-smallrye-opentracing-deployment ${project.version} provided - org.jboss.shamrock - shamrock-smallrye-rest-client-deployment + io.quarkus + quarkus-smallrye-rest-client-deployment ${project.version} provided - org.jboss.shamrock - shamrock-resteasy-deployment + io.quarkus + quarkus-resteasy-deployment ${project.version} provided - org.jboss.shamrock - shamrock-resteasy-jsonb-deployment + io.quarkus + quarkus-resteasy-jsonb-deployment ${project.version} provided - org.jboss.shamrock - shamrock-jaxrs-json-deployment + io.quarkus + quarkus-jaxrs-json-deployment ${project.version} provided - org.jboss.shamrock - shamrock-netty-deployment + io.quarkus + quarkus-netty-deployment ${project.version} provided - org.jboss.shamrock - shamrock-openssl-deployment + io.quarkus + quarkus-openssl-deployment ${project.version} provided - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment ${project.version} provided - org.jboss.shamrock - shamrock-narayana-jta-deployment + io.quarkus + quarkus-narayana-jta-deployment ${project.version} provided - org.jboss.shamrock - shamrock-undertow-deployment + io.quarkus + quarkus-undertow-deployment ${project.version} provided - org.jboss.shamrock - shamrock-hibernate-orm-deployment + io.quarkus + quarkus-hibernate-orm-deployment ${project.version} provided - org.jboss.shamrock - shamrock-smallrye-fault-tolerance-deployment + io.quarkus + quarkus-smallrye-fault-tolerance-deployment ${project.version} provided - org.jboss.shamrock - shamrock-vertx-deployment + io.quarkus + quarkus-vertx-deployment ${project.version} provided - org.jboss.shamrock - shamrock-panache-jpa-deployment + io.quarkus + quarkus-panache-jpa-deployment ${project.version} provided - org.jboss.shamrock - shamrock-undertow-websockets-deployment + io.quarkus + quarkus-undertow-websockets-deployment ${project.version} provided - org.jboss.shamrock - shamrock-scheduler-deployment + io.quarkus + quarkus-scheduler-deployment ${project.version} provided - org.jboss.shamrock - shamrock-spring-di-deployment + io.quarkus + quarkus-spring-di-deployment ${project.version} provided - org.jboss.shamrock - shamrock-junit4 + io.quarkus + quarkus-junit4 ${project.version} test - org.jboss.shamrock - shamrock-junit5 + io.quarkus + quarkus-junit5 ${project.version} test diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 109dbbacefa8a..143db365f42a0 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -12,14 +12,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-parent - org.jboss.shamrock + quarkus-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-build-parent - Shamrock - Build Parent + quarkus-build-parent + Quarkus - Build Parent Build parent to bring in required dependencies pom @@ -101,7 +101,7 @@ 1.1.0.Final 1.5.0.Alpha4-format-002 1.0.0.Final - + 2.0.0.Alpha1 1.8.7.Final 3.0.0.Alpha4 @@ -136,437 +136,437 @@ - org.jboss.shamrock - shamrock-agroal-deployment + io.quarkus + quarkus-agroal-deployment ${project.version} - org.jboss.shamrock - shamrock-agroal-runtime + io.quarkus + quarkus-agroal-runtime ${project.version} - org.jboss.shamrock - shamrock-hibernate-validator-deployment + io.quarkus + quarkus-hibernate-validator-deployment ${project.version} - org.jboss.shamrock - shamrock-hibernate-validator-runtime + io.quarkus + quarkus-hibernate-validator-runtime ${project.version} - org.jboss.shamrock - shamrock-builder + io.quarkus + quarkus-builder ${project.version} - org.jboss.shamrock - shamrock-caffeine-deployment + io.quarkus + quarkus-caffeine-deployment ${project.version} - org.jboss.shamrock - shamrock-caffeine-runtime + io.quarkus + quarkus-caffeine-runtime ${project.version} - org.jboss.shamrock - shamrock-devtools-common + io.quarkus + quarkus-devtools-common ${project.version} - org.jboss.shamrock - shamrock-devtools-common-core + io.quarkus + quarkus-devtools-common-core ${project.version} - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment ${project.version} - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime ${project.version} ${project.groupId} - shamrock-creator + quarkus-creator ${project.version} - org.jboss.shamrock - shamrock-integration-test-class-transformer + io.quarkus + quarkus-integration-test-class-transformer ${project.version} - org.jboss.shamrock - shamrock-development-mode + io.quarkus + quarkus-development-mode ${project.version} - org.jboss.shamrock - shamrock-jdbc-postgresql-deployment + io.quarkus + quarkus-jdbc-postgresql-deployment ${project.version} - org.jboss.shamrock - shamrock-jdbc-postgresql-runtime + io.quarkus + quarkus-jdbc-postgresql-runtime ${project.version} - org.jboss.shamrock - shamrock-jdbc-h2-deployment + io.quarkus + quarkus-jdbc-h2-deployment ${project.version} - org.jboss.shamrock - shamrock-jdbc-h2-runtime + io.quarkus + quarkus-jdbc-h2-runtime ${project.version} - org.jboss.shamrock - shamrock-jdbc-mariadb-deployment + io.quarkus + quarkus-jdbc-mariadb-deployment ${project.version} - org.jboss.shamrock - shamrock-jdbc-mariadb-runtime + io.quarkus + quarkus-jdbc-mariadb-runtime ${project.version} - org.jboss.shamrock - shamrock-kafka-client-deployment + io.quarkus + quarkus-kafka-client-deployment ${project.version} - org.jboss.shamrock - shamrock-kafka-client-runtime + io.quarkus + quarkus-kafka-client-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-health-deployment + io.quarkus + quarkus-smallrye-health-deployment ${project.version} - org.jboss.shamrock - shamrock-netty-deployment + io.quarkus + quarkus-netty-deployment ${project.version} - org.jboss.shamrock - shamrock-netty-runtime + io.quarkus + quarkus-netty-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-reactive-streams-operators-deployment + io.quarkus + quarkus-smallrye-reactive-streams-operators-deployment ${project.version} - org.jboss.shamrock - shamrock-smallrye-reactive-streams-operators-runtime + io.quarkus + quarkus-smallrye-reactive-streams-operators-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-reactive-type-converters-deployment + io.quarkus + quarkus-smallrye-reactive-type-converters-deployment ${project.version} - org.jboss.shamrock - shamrock-smallrye-reactive-type-converters-runtime + io.quarkus + quarkus-smallrye-reactive-type-converters-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-fault-tolerance-deployment + io.quarkus + quarkus-smallrye-fault-tolerance-deployment ${project.version} - org.jboss.shamrock - shamrock-smallrye-fault-tolerance-runtime + io.quarkus + quarkus-smallrye-fault-tolerance-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-health-runtime + io.quarkus + quarkus-smallrye-health-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-metrics-deployment + io.quarkus + quarkus-smallrye-metrics-deployment ${project.version} - org.jboss.shamrock - shamrock-smallrye-metrics-runtime + io.quarkus + quarkus-smallrye-metrics-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-openapi-deployment + io.quarkus + quarkus-smallrye-openapi-deployment ${project.version} - org.jboss.shamrock - shamrock-smallrye-openapi-runtime + io.quarkus + quarkus-smallrye-openapi-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-opentracing-deployment + io.quarkus + quarkus-smallrye-opentracing-deployment ${project.version} - org.jboss.shamrock - shamrock-smallrye-opentracing-runtime + io.quarkus + quarkus-smallrye-opentracing-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-rest-client-deployment + io.quarkus + quarkus-smallrye-rest-client-deployment ${project.version} - org.jboss.shamrock - shamrock-smallrye-rest-client-runtime + io.quarkus + quarkus-smallrye-rest-client-runtime ${project.version} - org.jboss.shamrock - shamrock-jaeger-deployment + io.quarkus + quarkus-jaeger-deployment ${project.version} - org.jboss.shamrock - shamrock-jaeger-runtime + io.quarkus + quarkus-jaeger-runtime ${project.version} - org.jboss.shamrock - shamrock-resteasy-deployment + io.quarkus + quarkus-resteasy-deployment ${project.version} - org.jboss.shamrock - shamrock-resteasy-runtime + io.quarkus + quarkus-resteasy-runtime ${project.version} - org.jboss.shamrock - shamrock-resteasy-jsonb-deployment + io.quarkus + quarkus-resteasy-jsonb-deployment ${project.version} - org.jboss.shamrock - shamrock-resteasy-jsonb-runtime + io.quarkus + quarkus-resteasy-jsonb-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-jwt-deployment + io.quarkus + quarkus-smallrye-jwt-deployment ${project.version} - org.jboss.shamrock - shamrock-smallrye-jwt-runtime + io.quarkus + quarkus-smallrye-jwt-runtime ${project.version} - org.jboss.shamrock - shamrock-test-common + io.quarkus + quarkus-test-common ${project.version} - org.jboss.shamrock - shamrock-test-h2 + io.quarkus + quarkus-test-h2 ${project.version} test - org.jboss.shamrock - shamrock-junit4 + io.quarkus + quarkus-junit4 ${project.version} test - org.jboss.shamrock - shamrock-junit5 + io.quarkus + quarkus-junit5 ${project.version} test - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal ${project.version} test - org.jboss.shamrock - shamrock-war-launcher-runner + io.quarkus + quarkus-war-launcher-runner ${project.version} - org.jboss.shamrock - shamrock-legacy-launcher + io.quarkus + quarkus-legacy-launcher ${project.version} - org.jboss.shamrock - shamrock-openssl-deployment + io.quarkus + quarkus-openssl-deployment ${project.version} - org.jboss.shamrock - shamrock-openssl-runtime + io.quarkus + quarkus-openssl-runtime ${project.version} - org.jboss.shamrock - shamrock-resteasy-common-deployment + io.quarkus + quarkus-resteasy-common-deployment ${project.version} - org.jboss.shamrock - shamrock-resteasy-common-runtime + io.quarkus + quarkus-resteasy-common-runtime ${project.version} - org.jboss.shamrock - shamrock-integration-test-shared-library + io.quarkus + quarkus-integration-test-shared-library ${project.version} - org.jboss.shamrock - shamrock-narayana-jta-deployment + io.quarkus + quarkus-narayana-jta-deployment ${project.version} - org.jboss.shamrock - shamrock-narayana-jta-runtime + io.quarkus + quarkus-narayana-jta-runtime ${project.version} - org.jboss.shamrock - shamrock-undertow-deployment + io.quarkus + quarkus-undertow-deployment ${project.version} - org.jboss.shamrock - shamrock-undertow-runtime + io.quarkus + quarkus-undertow-runtime ${project.version} - org.jboss.shamrock - shamrock-hibernate-orm-deployment + io.quarkus + quarkus-hibernate-orm-deployment ${project.version} - org.jboss.shamrock - shamrock-hibernate-orm-runtime + io.quarkus + quarkus-hibernate-orm-runtime ${project.version} - org.jboss.shamrock - shamrock-panache-jpa-deployment + io.quarkus + quarkus-panache-jpa-deployment ${project.version} - org.jboss.shamrock - shamrock-panache-jpa-runtime + io.quarkus + quarkus-panache-jpa-runtime ${project.version} - org.jboss.shamrock - shamrock-panache-common-runtime + io.quarkus + quarkus-panache-common-runtime ${project.version} - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment ${project.version} - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime ${project.version} - org.jboss.shamrock - shamrock-vertx-deployment + io.quarkus + quarkus-vertx-deployment ${project.version} - org.jboss.shamrock - shamrock-vertx-runtime + io.quarkus + quarkus-vertx-runtime ${project.version} - org.jboss.shamrock - shamrock-undertow-websockets-deployment + io.quarkus + quarkus-undertow-websockets-deployment ${project.version} - org.jboss.shamrock - shamrock-undertow-websockets-runtime + io.quarkus + quarkus-undertow-websockets-runtime ${project.version} - org.jboss.shamrock - shamrock-scheduler-deployment + io.quarkus + quarkus-scheduler-deployment ${project.version} - org.jboss.shamrock - shamrock-scheduler-runtime + io.quarkus + quarkus-scheduler-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-reactive-messaging-deployment + io.quarkus + quarkus-smallrye-reactive-messaging-deployment ${project.version} - org.jboss.shamrock - shamrock-smallrye-reactive-messaging-runtime + io.quarkus + quarkus-smallrye-reactive-messaging-runtime ${project.version} - org.jboss.shamrock - shamrock-smallrye-reactive-messaging-kafka-deployment + io.quarkus + quarkus-smallrye-reactive-messaging-kafka-deployment ${project.version} - org.jboss.shamrock - shamrock-smallrye-reactive-messaging-kafka-runtime + io.quarkus + quarkus-smallrye-reactive-messaging-kafka-runtime ${project.version} - org.jboss.shamrock - shamrock-spring-di-deployment + io.quarkus + quarkus-spring-di-deployment ${project.version} - org.jboss.shamrock - shamrock-security-deployment + io.quarkus + quarkus-security-deployment ${project.version} - org.jboss.shamrock - shamrock-security-runtime + io.quarkus + quarkus-security-runtime ${project.version} - org.jboss.shamrock - shamrock-infinispan-client-runtime + io.quarkus + quarkus-infinispan-client-runtime ${project.version} - org.jboss.shamrock - shamrock-infinispan-client-deployment + io.quarkus + quarkus-infinispan-client-deployment ${project.version} @@ -1258,12 +1258,12 @@ ${jboss-transaction-spi.version} - org.jboss.protean.arc + org.jboss.quarkus.arc arc-processor ${project.version} - org.jboss.protean.arc + org.jboss.quarkus.arc arc-runtime ${project.version} @@ -1420,7 +1420,7 @@ ${project.groupId} - shamrock-maven-plugin + quarkus-maven-plugin ${project.version} diff --git a/core/builder/pom.xml b/core/builder/pom.xml index 189285a1ef8e1..2655bd8fcf658 100644 --- a/core/builder/pom.xml +++ b/core/builder/pom.xml @@ -20,12 +20,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - shamrock-builder - Shamrock - Builder + quarkus-builder + Quarkus - Builder - org.jboss.shamrock - shamrock-build-parent + io.quarkus + quarkus-build-parent 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml diff --git a/core/creator/pom.xml b/core/creator/pom.xml index 996c510002367..14d94dac9e769 100644 --- a/core/creator/pom.xml +++ b/core/creator/pom.xml @@ -19,20 +19,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-creator - Shamrock - Creator + quarkus-creator + Quarkus - Creator - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifact.java b/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifact.java index e3f20b61a455a..e7ad36b20f5b5 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifact.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifact.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator; +package io.quarkus.creator; import java.nio.file.Path; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifactResolver.java b/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifactResolver.java index b2329df2e4b96..2b26cd5877213 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifactResolver.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifactResolver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator; +package io.quarkus.creator; import java.nio.file.Path; import java.util.List; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifactResolverBase.java b/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifactResolverBase.java index fded60aec76d1..49c94e2364a44 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifactResolverBase.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/AppArtifactResolverBase.java @@ -1,7 +1,7 @@ /** * */ -package org.jboss.shamrock.creator; +package io.quarkus.creator; import java.nio.file.Path; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreationPhase.java b/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreationPhase.java index c2b646a2d9d30..0710a0617e2ab 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreationPhase.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreationPhase.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.jboss.shamrock.creator; +package io.quarkus.creator; -import org.jboss.shamrock.creator.config.Configurable; -import org.jboss.shamrock.creator.outcome.OutcomeProvider; +import io.quarkus.creator.config.Configurable; +import io.quarkus.creator.outcome.OutcomeProvider; /** * A phase in the application build flow diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreator.java b/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreator.java index 05f526ae926c0..aed6db2777ddb 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreator.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator; +package io.quarkus.creator; import java.io.IOException; import java.nio.file.Files; @@ -28,12 +28,12 @@ import java.util.Map; import java.util.ServiceLoader; -import org.jboss.shamrock.creator.config.reader.MappedPropertiesHandler; -import org.jboss.shamrock.creator.config.reader.PropertiesConfigReaderException; -import org.jboss.shamrock.creator.config.reader.PropertiesHandler; -import org.jboss.shamrock.creator.outcome.OutcomeResolver; -import org.jboss.shamrock.creator.outcome.OutcomeResolverFactory; -import org.jboss.shamrock.creator.util.IoUtils; +import io.quarkus.creator.config.reader.MappedPropertiesHandler; +import io.quarkus.creator.config.reader.PropertiesConfigReaderException; +import io.quarkus.creator.config.reader.PropertiesHandler; +import io.quarkus.creator.outcome.OutcomeResolver; +import io.quarkus.creator.outcome.OutcomeResolverFactory; +import io.quarkus.creator.util.IoUtils; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreatorException.java b/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreatorException.java index eb820824a91bf..a15743ef66f9e 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreatorException.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/AppCreatorException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator; +package io.quarkus.creator; /** * Main application creator exception. diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/AppDependency.java b/core/creator/src/main/java/org/jboss/shamrock/creator/AppDependency.java index 477b3a03f8701..97c52d76cbb5d 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/AppDependency.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/AppDependency.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator; +package io.quarkus.creator; /** * Represents an application artifact dependency. diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/NoOpArtifactResolver.java b/core/creator/src/main/java/org/jboss/shamrock/creator/NoOpArtifactResolver.java index ba4cf4c685698..8cdef81653725 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/NoOpArtifactResolver.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/NoOpArtifactResolver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator; +package io.quarkus.creator; import java.nio.file.Path; import java.util.List; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/Configurable.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/Configurable.java index ef5bed163f6c0..7d75ea1aac39a 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/Configurable.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/Configurable.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config; +package io.quarkus.creator.config; -import org.jboss.shamrock.creator.config.reader.PropertiesHandler; +import io.quarkus.creator.config.reader.PropertiesHandler; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/MappedPropertiesHandler.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/MappedPropertiesHandler.java index dfd0c59f4736e..cab74117a0c71 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/MappedPropertiesHandler.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/MappedPropertiesHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.reader; +package io.quarkus.creator.config.reader; import java.util.Collections; import java.util.HashMap; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/MultirootedConfigHandler.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/MultirootedConfigHandler.java index 3f0c4a7fa3fe9..6a4d8866bd51b 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/MultirootedConfigHandler.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/MultirootedConfigHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.reader; +package io.quarkus.creator.config.reader; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigReader.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigReader.java index 10af33cffb609..503884e63cca9 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigReader.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.reader; +package io.quarkus.creator.config.reader; import java.io.BufferedReader; import java.io.IOException; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigReaderException.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigReaderException.java index 0d16b653d5f73..df615f3b3070a 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigReaderException.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigReaderException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.reader; +package io.quarkus.creator.config.reader; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigUtils.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigUtils.java index c939c83c859be..5042fc3780657 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigUtils.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesConfigUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.reader; +package io.quarkus.creator.config.reader; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesHandler.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesHandler.java index cfa322252852a..e32a5dc6456c7 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesHandler.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertiesHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.reader; +package io.quarkus.creator.config.reader; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyContext.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyContext.java index ca273651704b8..246fe321236a6 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyContext.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyContext.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.reader; +package io.quarkus.creator.config.reader; /** diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyLine.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyLine.java index c5fba284e29cb..8f018748d8c5c 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyLine.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyLine.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.reader; +package io.quarkus.creator.config.reader; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyLineConverter.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyLineConverter.java index 42deac8ac3d62..255139ec36335 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyLineConverter.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/PropertyLineConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.reader; +package io.quarkus.creator.config.reader; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/UnrecognizedNameElementHandler.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/UnrecognizedNameElementHandler.java index a3b20028a9e5d..9d5d587bd72b7 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/UnrecognizedNameElementHandler.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/UnrecognizedNameElementHandler.java @@ -1,7 +1,7 @@ /** * */ -package org.jboss.shamrock.creator.config.reader; +package io.quarkus.creator.config.reader; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/UnrecognizedPropertyHandler.java b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/UnrecognizedPropertyHandler.java index 188da0f8e0701..8ade1a562ca85 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/UnrecognizedPropertyHandler.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/config/reader/UnrecognizedPropertyHandler.java @@ -1,7 +1,7 @@ /** * */ -package org.jboss.shamrock.creator.config.reader; +package io.quarkus.creator.config.reader; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/AppCreatorDemo.java b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/AppCreatorDemo.java index 66b636979b4d9..f1831ba9394f0 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/AppCreatorDemo.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/AppCreatorDemo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.demo; +package io.quarkus.creator.demo; import java.io.IOException; import java.nio.file.DirectoryStream; @@ -28,15 +28,15 @@ import java.util.List; import java.util.Set; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.phase.augment.AugmentPhase; -import org.jboss.shamrock.creator.phase.curate.CuratePhase; -import org.jboss.shamrock.creator.phase.nativeimage.NativeImageOutcome; -import org.jboss.shamrock.creator.phase.nativeimage.NativeImagePhase; -import org.jboss.shamrock.creator.phase.runnerjar.RunnerJarOutcome; -import org.jboss.shamrock.creator.phase.runnerjar.RunnerJarPhase; -import org.jboss.shamrock.creator.util.IoUtils; -import org.jboss.shamrock.creator.util.PropertyUtils; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.phase.augment.AugmentPhase; +import io.quarkus.creator.phase.curate.CuratePhase; +import io.quarkus.creator.phase.nativeimage.NativeImageOutcome; +import io.quarkus.creator.phase.nativeimage.NativeImagePhase; +import io.quarkus.creator.phase.runnerjar.RunnerJarOutcome; +import io.quarkus.creator.phase.runnerjar.RunnerJarPhase; +import io.quarkus.creator.util.IoUtils; +import io.quarkus.creator.util.PropertyUtils; /** * @@ -45,23 +45,23 @@ public class AppCreatorDemo { /** - * This demo assumes you've built shamrock and its artifacts are in your local repo + * This demo assumes you've built quarkus and its artifacts are in your local repo * (otherwise they would have to be available in one of the remote repos to be resolvable) * - * AND also example shamrock-strict-bean-validation-example-1.0.0.Alpha1-SNAPSHOT.jar. This jar is + * AND also example quarkus-strict-bean-validation-example-1.0.0.Alpha1-SNAPSHOT.jar. This jar is * used as an example user app that is augmented and turned into a runnable application */ public static void main(String[] args) throws Exception { - final Path shamrockRoot = Paths.get("").toAbsolutePath().getParent().getParent(); - final Path exampleTarget = shamrockRoot.resolve("integration-tests").resolve("bean-validation-strict").resolve("target"); + final Path quarkusRoot = Paths.get("").toAbsolutePath().getParent().getParent(); + final Path exampleTarget = quarkusRoot.resolve("integration-tests").resolve("bean-validation-strict").resolve("target"); - final Path appJar = exampleTarget.resolve("shamrock-integration-test-bean-validation-1.0.0.Alpha1-SNAPSHOT.jar"); + final Path appJar = exampleTarget.resolve("quarkus-integration-test-bean-validation-1.0.0.Alpha1-SNAPSHOT.jar"); if (!Files.exists(appJar)) { throw new Exception("Failed to locate user app " + appJar); } - final Path demoDir = Paths.get(PropertyUtils.getUserHome()).resolve("shamrock-creator-demo"); + final Path demoDir = Paths.get(PropertyUtils.getUserHome()).resolve("quarkus-creator-demo"); IoUtils.recursiveDelete(demoDir); buildRunnableJar(appJar, demoDir); diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/CheckUpdatesDemo.java b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/CheckUpdatesDemo.java index de3d8ac7c4c2a..4259b77a4e8eb 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/CheckUpdatesDemo.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/CheckUpdatesDemo.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.demo; +package io.quarkus.creator.demo; import java.util.Properties; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.AppDependency; -import org.jboss.shamrock.creator.phase.curate.CurateOutcome; -import org.jboss.shamrock.creator.phase.curate.CuratePhase; -import org.jboss.shamrock.creator.phase.curate.VersionUpdate; -import org.jboss.shamrock.creator.phase.curate.VersionUpdateNumber; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.AppDependency; +import io.quarkus.creator.phase.curate.CurateOutcome; +import io.quarkus.creator.phase.curate.CuratePhase; +import io.quarkus.creator.phase.curate.VersionUpdate; +import io.quarkus.creator.phase.curate.VersionUpdateNumber; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/ConfigDemoBase.java b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/ConfigDemoBase.java index 76f2b98975196..3cbc64fc085e9 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/ConfigDemoBase.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/ConfigDemoBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.demo; +package io.quarkus.creator.demo; import java.io.IOException; import java.io.OutputStream; @@ -30,12 +30,12 @@ import java.util.Properties; import java.util.Set; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.config.reader.PropertiesConfigReader; -import org.jboss.shamrock.creator.config.reader.PropertiesHandler; -import org.jboss.shamrock.creator.phase.curate.CuratePhase; -import org.jboss.shamrock.creator.util.IoUtils; -import org.jboss.shamrock.creator.util.PropertyUtils; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.config.reader.PropertiesConfigReader; +import io.quarkus.creator.config.reader.PropertiesHandler; +import io.quarkus.creator.phase.curate.CuratePhase; +import io.quarkus.creator.util.IoUtils; +import io.quarkus.creator.util.PropertyUtils; /** * @@ -91,13 +91,13 @@ protected boolean isLogLibDiff() { } protected Path initAppJar() { - final Path shamrockRoot = Paths.get("").toAbsolutePath().getParent().getParent(); - //final Path appDir = shamrockRoot.resolve("integration-tests").resolve("bean-validation-strict").resolve("target"); - //final Path appJar = appDir.resolve("shamrock-integration-test-bean-validation-1.0.0.Alpha1-SNAPSHOT.jar"); + final Path quarkusRoot = Paths.get("").toAbsolutePath().getParent().getParent(); + //final Path appDir = quarkusRoot.resolve("integration-tests").resolve("bean-validation-strict").resolve("target"); + //final Path appJar = appDir.resolve("quarkus-integration-test-bean-validation-1.0.0.Alpha1-SNAPSHOT.jar"); - final Path quickstartsRoot = shamrockRoot.getParent().resolve("protean-quickstarts"); + final Path quickstartsRoot = quarkusRoot.getParent().resolve("quarkus-quickstarts"); if(!Files.exists(quickstartsRoot)) { - throw new IllegalStateException("Failed to locate protean-quickstarts repo at " + quickstartsRoot); + throw new IllegalStateException("Failed to locate quarkus-quickstarts repo at " + quickstartsRoot); } final Path appDir = quickstartsRoot.resolve("application-configuration").resolve("target"); final Path appJar = appDir.resolve("application-configuration-1.0-SNAPSHOT.jar"); @@ -109,7 +109,7 @@ public Path getAppJar() { } public Path getDemoWorkDir() { - return workDir == null ? workDir = Paths.get(PropertyUtils.getUserHome()).resolve("shamrock-creator-demo") : workDir; + return workDir == null ? workDir = Paths.get(PropertyUtils.getUserHome()).resolve("quarkus-creator-demo") : workDir; } public Properties getProperties() { @@ -118,7 +118,7 @@ public Properties getProperties() { if(demoDir != null) { props.setProperty("output", demoDir.toString()); } - props.setProperty(CuratePhase.completePropertyName(CuratePhase.CONFIG_PROP_LOCAL_REPO), Paths.get(PropertyUtils.getUserHome(), "shamrock-curate-repo").toString()); + props.setProperty(CuratePhase.completePropertyName(CuratePhase.CONFIG_PROP_LOCAL_REPO), Paths.get(PropertyUtils.getUserHome(), "quarkus-curate-repo").toString()); initProps(props); return props; } diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/NativeImageOutcomeDemo.java b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/NativeImageOutcomeDemo.java index 027ac1edd3226..1940920c55327 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/NativeImageOutcomeDemo.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/NativeImageOutcomeDemo.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.demo; +package io.quarkus.creator.demo; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Properties; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.phase.nativeimage.NativeImageOutcome; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.phase.nativeimage.NativeImageOutcome; /** * @@ -36,9 +36,9 @@ public static void main(String[] args) throws Exception { @Override protected Path initAppJar() { - final Path shamrockRoot = Paths.get("").toAbsolutePath().getParent().getParent(); - final Path appDir = shamrockRoot.resolve("integration-tests").resolve("bean-validation-strict").resolve("target"); - return appDir.resolve("shamrock-integration-test-bean-validation-1.0.0.Alpha1-SNAPSHOT.jar"); + final Path quarkusRoot = Paths.get("").toAbsolutePath().getParent().getParent(); + final Path appDir = quarkusRoot.resolve("integration-tests").resolve("bean-validation-strict").resolve("target"); + return appDir.resolve("quarkus-integration-test-bean-validation-1.0.0.Alpha1-SNAPSHOT.jar"); } @Override diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/RunnerJarOutcomeDemo.java b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/RunnerJarOutcomeDemo.java index fa5fa22db30a0..5e8d0aa334844 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/RunnerJarOutcomeDemo.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/RunnerJarOutcomeDemo.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.demo; +package io.quarkus.creator.demo; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.phase.runnerjar.RunnerJarOutcome; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.phase.runnerjar.RunnerJarOutcome; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToLatestVersionDemo.java b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToLatestVersionDemo.java index 5fed8e3d4798a..3f401f6f2d12f 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToLatestVersionDemo.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToLatestVersionDemo.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.demo; +package io.quarkus.creator.demo; import java.util.Properties; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.phase.curate.CuratePhase; -import org.jboss.shamrock.creator.phase.curate.VersionUpdateNumber; -import org.jboss.shamrock.creator.phase.curate.VersionUpdate; -import org.jboss.shamrock.creator.phase.runnerjar.RunnerJarOutcome; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.phase.curate.CuratePhase; +import io.quarkus.creator.phase.curate.VersionUpdateNumber; +import io.quarkus.creator.phase.curate.VersionUpdate; +import io.quarkus.creator.phase.runnerjar.RunnerJarOutcome; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToNextAndPersistStateDemo.java b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToNextAndPersistStateDemo.java index e4ea2cc0cf884..78e336121e1e6 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToNextAndPersistStateDemo.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToNextAndPersistStateDemo.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.demo; +package io.quarkus.creator.demo; import java.util.Properties; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.phase.curate.CurateOutcome; -import org.jboss.shamrock.creator.phase.curate.CuratePhase; -import org.jboss.shamrock.creator.phase.curate.DependenciesOrigin; -import org.jboss.shamrock.creator.phase.curate.VersionUpdate; -import org.jboss.shamrock.creator.phase.curate.VersionUpdateNumber; -import org.jboss.shamrock.creator.phase.runnerjar.RunnerJarOutcome; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.phase.curate.CurateOutcome; +import io.quarkus.creator.phase.curate.CuratePhase; +import io.quarkus.creator.phase.curate.DependenciesOrigin; +import io.quarkus.creator.phase.curate.VersionUpdate; +import io.quarkus.creator.phase.curate.VersionUpdateNumber; +import io.quarkus.creator.phase.runnerjar.RunnerJarOutcome; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToNextVersionDemo.java b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToNextVersionDemo.java index e2b7c19b9c469..cb7a03f40f3d7 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToNextVersionDemo.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/demo/UpdateToNextVersionDemo.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.demo; +package io.quarkus.creator.demo; import java.util.Properties; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.phase.curate.CuratePhase; -import org.jboss.shamrock.creator.phase.curate.VersionUpdate; -import org.jboss.shamrock.creator.phase.curate.VersionUpdateNumber; -import org.jboss.shamrock.creator.phase.runnerjar.RunnerJarOutcome; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.phase.curate.CuratePhase; +import io.quarkus.creator.phase.curate.VersionUpdate; +import io.quarkus.creator.phase.curate.VersionUpdateNumber; +import io.quarkus.creator.phase.runnerjar.RunnerJarOutcome; /** * @@ -37,10 +37,10 @@ public static void main(String[] args) throws Exception { /* @Override protected Path initAppJar() { - final Path shamrockRoot = Paths.get("").toAbsolutePath().getParent().getParent(); - final Path quickstartsRoot = shamrockRoot.getParent().resolve("protean-quickstarts"); + final Path quarkusRoot = Paths.get("").toAbsolutePath().getParent().getParent(); + final Path quickstartsRoot = quarkusRoot.getParent().resolve("quarkus-quickstarts"); if(!Files.exists(quickstartsRoot)) { - throw new IllegalStateException("Failed to locate protean-quickstarts repo at " + quickstartsRoot); + throw new IllegalStateException("Failed to locate quarkus-quickstarts repo at " + quickstartsRoot); } final Path appDir = quickstartsRoot.resolve("input-validation").resolve("target"); return appDir.resolve("input-validation-1.0-SNAPSHOT.jar"); diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/Errors.java b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/Errors.java index 818ca97643fbd..4511cc73ada41 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/Errors.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/Errors.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome; +package io.quarkus.creator.outcome; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeMap.java b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeMap.java index 41f6b0c0776a0..490e0f22dbef1 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeMap.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeMap.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome; +package io.quarkus.creator.outcome; import java.util.HashMap; import java.util.Map; -import org.jboss.shamrock.creator.AppCreatorException; +import io.quarkus.creator.AppCreatorException; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProvider.java b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProvider.java index 81c90921e7036..bbac40060588f 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProvider.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProvider.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome; +package io.quarkus.creator.outcome; -import org.jboss.shamrock.creator.AppCreatorException; +import io.quarkus.creator.AppCreatorException; /** * Phase handler diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProviderDescription.java b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProviderDescription.java index 8f86e6cff986c..91f5c4f16a693 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProviderDescription.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProviderDescription.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome; +package io.quarkus.creator.outcome; import java.util.ArrayList; import java.util.Collections; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProviderRegistration.java b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProviderRegistration.java index b0a209e03c471..b4c995a06c58e 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProviderRegistration.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeProviderRegistration.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome; +package io.quarkus.creator.outcome; -import org.jboss.shamrock.creator.AppCreatorException; +import io.quarkus.creator.AppCreatorException; /** * Phase registration callback. diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeResolver.java b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeResolver.java index 563c3c1df707f..c26cbc3571597 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeResolver.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeResolver.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome; +package io.quarkus.creator.outcome; import java.util.Collections; import java.util.Map; -import org.jboss.shamrock.creator.AppCreatorException; +import io.quarkus.creator.AppCreatorException; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeResolverFactory.java b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeResolverFactory.java index d703c2694f369..8fe00e80c92ca 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeResolverFactory.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/outcome/OutcomeResolverFactory.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome; +package io.quarkus.creator.outcome; import java.util.HashMap; import java.util.Map; -import org.jboss.shamrock.creator.AppCreatorException; +import io.quarkus.creator.AppCreatorException; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/augment/AugmentOutcome.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/augment/AugmentOutcome.java index 1beb8b612be7e..18863fe6d0395 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/augment/AugmentOutcome.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/augment/AugmentOutcome.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.augment; +package io.quarkus.creator.phase.augment; import java.nio.file.Path; -import org.jboss.shamrock.creator.AppDependency; +import io.quarkus.creator.AppDependency; /** * Represents an outcome of {@link AugmentPhase} diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/augment/AugmentPhase.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/augment/AugmentPhase.java index 56043d744ca07..b5c5df11b378c 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/augment/AugmentPhase.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/augment/AugmentPhase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.augment; +package io.quarkus.creator.phase.augment; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -47,24 +47,24 @@ import org.eclipse.microprofile.config.Config; import org.jboss.builder.BuildResult; import org.jboss.logging.Logger; -import org.jboss.shamrock.creator.AppArtifact; -import org.jboss.shamrock.creator.AppArtifactResolver; -import org.jboss.shamrock.creator.AppCreationPhase; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.AppDependency; -import org.jboss.shamrock.creator.config.reader.MappedPropertiesHandler; -import org.jboss.shamrock.creator.config.reader.PropertiesHandler; -import org.jboss.shamrock.creator.outcome.OutcomeProviderRegistration; -import org.jboss.shamrock.creator.phase.curate.CurateOutcome; -import org.jboss.shamrock.creator.util.IoUtils; -import org.jboss.shamrock.creator.util.ZipUtils; -import org.jboss.shamrock.deployment.ClassOutput; -import org.jboss.shamrock.deployment.ShamrockAugmentor; -import org.jboss.shamrock.deployment.ShamrockClassWriter; -import org.jboss.shamrock.deployment.builditem.BytecodeTransformerBuildItem; -import org.jboss.shamrock.deployment.builditem.MainClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateOutputBuildItem; +import io.quarkus.creator.AppArtifact; +import io.quarkus.creator.AppArtifactResolver; +import io.quarkus.creator.AppCreationPhase; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.AppDependency; +import io.quarkus.creator.config.reader.MappedPropertiesHandler; +import io.quarkus.creator.config.reader.PropertiesHandler; +import io.quarkus.creator.outcome.OutcomeProviderRegistration; +import io.quarkus.creator.phase.curate.CurateOutcome; +import io.quarkus.creator.util.IoUtils; +import io.quarkus.creator.util.ZipUtils; +import io.quarkus.deployment.ClassOutput; +import io.quarkus.deployment.QuarkusAugmentor; +import io.quarkus.deployment.QuarkusClassWriter; +import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem; +import io.quarkus.deployment.builditem.MainClassBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateOutputBuildItem; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; @@ -73,7 +73,7 @@ import io.smallrye.config.SmallRyeConfigProviderResolver; /** - * This phase consumes {@link org.jboss.shamrock.creator.phase.curate.CurateOutcome} and processes + * This phase consumes {@link io.quarkus.creator.phase.curate.CurateOutcome} and processes * user application and and its dependency classes for phases that generate a runnable application. * * @author Alexey Loubyansky @@ -81,7 +81,7 @@ public class AugmentPhase implements AppCreationPhase, AugmentOutcome { private static final String DEPENDENCIES_RUNTIME = "dependencies.runtime"; - private static final String FILENAME_STEP_CLASSES = "META-INF/shamrock-build-steps.list"; + private static final String FILENAME_STEP_CLASSES = "META-INF/quarkus-build-steps.list"; private static final String PROVIDED = "provided"; private static final Logger log = Logger.getLogger(AugmentPhase.class); @@ -232,7 +232,7 @@ private void doProcess(CurateOutcome appState) throws AppCreatorException { continue; } try (ZipFile zip = openZipFile(resolvedDep)) { - boolean deploymentArtifact = zip.getEntry("META-INF/shamrock-build-steps.list") != null; + boolean deploymentArtifact = zip.getEntry("META-INF/quarkus-build-steps.list") != null; if (!appDep.getScope().equals(PROVIDED) && deploymentArtifact) { if(problems == null) { problems = new ArrayList<>(); @@ -304,7 +304,7 @@ public void writeResource(String name, byte[] data) throws IOException { try { Thread.currentThread().setContextClassLoader(runnerClassLoader); - ShamrockAugmentor.Builder builder = ShamrockAugmentor.builder(); + QuarkusAugmentor.Builder builder = QuarkusAugmentor.builder(); builder.setRoot(appClassesDir); builder.setClassLoader(runnerClassLoader); builder.setOutput(classOutput); @@ -353,7 +353,7 @@ public FutureEntry call() throws Exception { throw new RuntimeException("Can't process class files larger than Integer.MAX_VALUE bytes"); } ClassReader cr = new ClassReader(Files.readAllBytes(path)); - ClassWriter writer = new ShamrockClassWriter(cr, ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); + ClassWriter writer = new QuarkusClassWriter(cr, ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); ClassVisitor visitor = writer; for (BiFunction i : visitors) { visitor = i.apply(className, visitor); diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/CurateOutcome.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/CurateOutcome.java index 5839da446aa11..283099348080d 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/CurateOutcome.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/CurateOutcome.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.curate; +package io.quarkus.creator.phase.curate; import java.nio.file.Path; import java.util.Collections; @@ -26,13 +26,13 @@ import org.apache.maven.model.Model; import org.apache.maven.model.Repository; import org.jboss.logging.Logger; -import org.jboss.shamrock.creator.AppArtifact; -import org.jboss.shamrock.creator.AppArtifactResolver; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.AppDependency; -import org.jboss.shamrock.creator.NoOpArtifactResolver; -import org.jboss.shamrock.creator.resolver.aether.AetherArtifactResolver; +import io.quarkus.creator.AppArtifact; +import io.quarkus.creator.AppArtifactResolver; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.AppDependency; +import io.quarkus.creator.NoOpArtifactResolver; +import io.quarkus.creator.resolver.aether.AetherArtifactResolver; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/CuratePhase.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/CuratePhase.java index 865eafbab94ca..7a196c7913de4 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/CuratePhase.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/CuratePhase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.curate; +package io.quarkus.creator.phase.curate; import java.io.IOException; import java.nio.file.Files; @@ -34,17 +34,17 @@ import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.repository.RepositoryPolicy; import org.jboss.logging.Logger; -import org.jboss.shamrock.creator.AppArtifact; -import org.jboss.shamrock.creator.AppArtifactResolver; -import org.jboss.shamrock.creator.AppCreationPhase; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.AppDependency; -import org.jboss.shamrock.creator.config.reader.MappedPropertiesHandler; -import org.jboss.shamrock.creator.config.reader.PropertiesConfigReaderException; -import org.jboss.shamrock.creator.config.reader.PropertiesHandler; -import org.jboss.shamrock.creator.outcome.OutcomeProviderRegistration; -import org.jboss.shamrock.creator.resolver.aether.AetherArtifactResolver; +import io.quarkus.creator.AppArtifact; +import io.quarkus.creator.AppArtifactResolver; +import io.quarkus.creator.AppCreationPhase; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.AppDependency; +import io.quarkus.creator.config.reader.MappedPropertiesHandler; +import io.quarkus.creator.config.reader.PropertiesConfigReaderException; +import io.quarkus.creator.config.reader.PropertiesHandler; +import io.quarkus.creator.outcome.OutcomeProviderRegistration; +import io.quarkus.creator.resolver.aether.AetherArtifactResolver; /** * @@ -71,7 +71,7 @@ public static String completePropertyName(String name) { private VersionUpdate update = VersionUpdate.NONE; private VersionUpdateNumber updateNumber = VersionUpdateNumber.MICRO; private Path localRepo; - private Set updateGroupIds = Collections.singleton("org.jboss.shamrock"); + private Set updateGroupIds = Collections.singleton("io.quarkus"); public void setInitialDeps(DependenciesOrigin initialDeps) { this.depsOrigin = initialDeps; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DefaultArtifactVersion.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DefaultArtifactVersion.java index 4a355b4407916..f196ac546103e 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DefaultArtifactVersion.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DefaultArtifactVersion.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.curate; +package io.quarkus.creator.phase.curate; import java.math.BigInteger; import java.util.ArrayList; @@ -25,7 +25,7 @@ import java.util.Map; import java.util.TreeMap; -import org.jboss.shamrock.creator.AppCreatorException; +import io.quarkus.creator.AppCreatorException; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DefaultUpdateDiscovery.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DefaultUpdateDiscovery.java index 4bbe3736bf2c1..4185fa424be41 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DefaultUpdateDiscovery.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DefaultUpdateDiscovery.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.curate; +package io.quarkus.creator.phase.curate; import java.util.List; -import org.jboss.shamrock.creator.AppArtifact; -import org.jboss.shamrock.creator.AppArtifactResolver; -import org.jboss.shamrock.creator.AppCreatorException; +import io.quarkus.creator.AppArtifact; +import io.quarkus.creator.AppArtifactResolver; +import io.quarkus.creator.AppCreatorException; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DependenciesOrigin.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DependenciesOrigin.java index 978a238242bac..546ec441affd3 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DependenciesOrigin.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/DependenciesOrigin.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.creator.phase.curate; +package io.quarkus.creator.phase.curate; /** * Indicates what should be used as the source of application dependencies. diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/UpdateDiscovery.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/UpdateDiscovery.java index 4dd6f97680470..84942e042e815 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/UpdateDiscovery.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/UpdateDiscovery.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.curate; +package io.quarkus.creator.phase.curate; import java.util.List; -import org.jboss.shamrock.creator.AppArtifact; -import org.jboss.shamrock.creator.AppCreatorException; +import io.quarkus.creator.AppArtifact; +import io.quarkus.creator.AppCreatorException; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/Utils.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/Utils.java index 5676d6c99755e..fdf14ad6a5fc6 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/Utils.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/Utils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.curate; +package io.quarkus.creator.phase.curate; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -37,9 +37,9 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.model.io.xpp3.MavenXpp3Writer; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import org.jboss.shamrock.creator.AppArtifact; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.AppDependency; +import io.quarkus.creator.AppArtifact; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.AppDependency; /** @@ -57,7 +57,7 @@ public class Utils { * @return provisioning state artifact */ static AppArtifact getStateArtifact(AppArtifact appArtifact) { - return new AppArtifact(appArtifact.getGroupId() + ".shamrock.curate", + return new AppArtifact(appArtifact.getGroupId() + ".quarkus.curate", appArtifact.getArtifactId(), "", "pom", diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/VersionUpdate.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/VersionUpdate.java index f3156b93f6e28..7aff1bfd1d8c6 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/VersionUpdate.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/VersionUpdate.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.creator.phase.curate; +package io.quarkus.creator.phase.curate; /** diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/VersionUpdateNumber.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/VersionUpdateNumber.java index b00e168d5923d..0fc28a9268f49 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/VersionUpdateNumber.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/curate/VersionUpdateNumber.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.creator.phase.curate; +package io.quarkus.creator.phase.curate; /** * Indicates which version number is allowed to be updated. diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/nativeimage/ErrorReplacingProcessReader.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/nativeimage/ErrorReplacingProcessReader.java index a19a3468f9773..f6961957cd71b 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/nativeimage/ErrorReplacingProcessReader.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/nativeimage/ErrorReplacingProcessReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.nativeimage; +package io.quarkus.creator.phase.nativeimage; import java.io.BufferedReader; import java.io.File; @@ -119,7 +119,7 @@ private static void handleErrorState(File report, String firstLine, Deque, Nat private static final String GRAALVM_HOME = "GRAALVM_HOME"; - private static final String SHAMROCK_PREFIX = "shamrock."; + private static final String SHAMROCK_PREFIX = "quarkus."; private Path outputDir; @@ -261,7 +261,7 @@ public void provideOutcome(AppCreator ctx) throws AppCreatorException { if (dockerBuild != null && !dockerBuild.toLowerCase().equals("false")) { - // E.g. "/usr/bin/docker run -v {{PROJECT_DIR}}:/project --rm protean/graalvm-native-image" + // E.g. "/usr/bin/docker run -v {{PROJECT_DIR}}:/project --rm quarkus/graalvm-native-image" nativeImage = new ArrayList<>(); //TODO: use an 'official' image String image; @@ -322,7 +322,7 @@ public void provideOutcome(AppCreator ctx) throws AppCreatorException { } } - enableSslNative = properties.getProperty("shamrock.ssl.native") != null ? Boolean.parseBoolean(properties.getProperty("shamrock.ssl.native")) + enableSslNative = properties.getProperty("quarkus.ssl.native") != null ? Boolean.parseBoolean(properties.getProperty("quarkus.ssl.native")) : false; } if (enableSslNative) { @@ -440,7 +440,7 @@ public void provideOutcome(AppCreator ctx) throws AppCreatorException { //FIXME remove after transition period private boolean isThisGraalVMRCObsolete() { final String vmName = System.getProperty("java.vm.name"); - log.info("Running Shamrock native-image plugin on " + vmName); + log.info("Running Quarkus native-image plugin on " + vmName); if (vmName.contains("-rc9") || vmName.contains("-rc10") || vmName.contains("-rc11")) { log.error("Out of date RC build of GraalVM detected! Please upgrade to RC12"); return true; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/nativeimage/ReportAnalyzer.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/nativeimage/ReportAnalyzer.java index a22367b3a938f..7e47b1d251bdc 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/nativeimage/ReportAnalyzer.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/nativeimage/ReportAnalyzer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.nativeimage; +package io.quarkus.creator.phase.nativeimage; import java.io.BufferedReader; import java.io.FileReader; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarOutcome.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarOutcome.java index b67d346e033ad..7274d409f68f3 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarOutcome.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarOutcome.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.runnerjar; +package io.quarkus.creator.phase.runnerjar; import java.nio.file.Path; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarPhase.java b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarPhase.java index b3401ac23f408..2418bba360e79 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarPhase.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/phase/runnerjar/RunnerJarPhase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.phase.runnerjar; +package io.quarkus.creator.phase.runnerjar; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -42,29 +42,29 @@ import java.util.jar.Attributes; import java.util.jar.Manifest; import org.jboss.logging.Logger; -import org.jboss.shamrock.creator.AppArtifact; -import org.jboss.shamrock.creator.AppArtifactResolver; -import org.jboss.shamrock.creator.AppCreationPhase; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.AppDependency; -import org.jboss.shamrock.creator.config.reader.MappedPropertiesHandler; -import org.jboss.shamrock.creator.config.reader.PropertiesHandler; -import org.jboss.shamrock.creator.outcome.OutcomeProviderRegistration; -import org.jboss.shamrock.creator.phase.augment.AugmentOutcome; -import org.jboss.shamrock.creator.phase.curate.CurateOutcome; -import org.jboss.shamrock.creator.util.IoUtils; -import org.jboss.shamrock.creator.util.ZipUtils; +import io.quarkus.creator.AppArtifact; +import io.quarkus.creator.AppArtifactResolver; +import io.quarkus.creator.AppCreationPhase; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.AppDependency; +import io.quarkus.creator.config.reader.MappedPropertiesHandler; +import io.quarkus.creator.config.reader.PropertiesHandler; +import io.quarkus.creator.outcome.OutcomeProviderRegistration; +import io.quarkus.creator.phase.augment.AugmentOutcome; +import io.quarkus.creator.phase.curate.CurateOutcome; +import io.quarkus.creator.util.IoUtils; +import io.quarkus.creator.util.ZipUtils; /** - * Based on the provided {@link org.jboss.shamrock.creator.phase.augment.AugmentOutcome}, + * Based on the provided {@link io.quarkus.creator.phase.augment.AugmentOutcome}, * this phase builds a runnable JAR. * * @author Alexey Loubyansky */ public class RunnerJarPhase implements AppCreationPhase, RunnerJarOutcome { - private static final String DEFAULT_MAIN_CLASS = "org.jboss.shamrock.runner.GeneratedMain"; + private static final String DEFAULT_MAIN_CLASS = "io.quarkus.runner.GeneratedMain"; private static final String PROVIDED = "provided"; private static final Logger log = Logger.getLogger(RunnerJarPhase.class); @@ -118,7 +118,7 @@ public RunnerJarPhase setFinalName(String finalName) { /** * Main class name fir the runnable JAR. If none is set by the user - * org.jboss.shamrock.runner.GeneratedMain will be use by default. + * io.quarkus.runner.GeneratedMain will be use by default. * * @param mainClass main class name for the runnable JAR * @return diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AetherArtifactResolver.java b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AetherArtifactResolver.java index 6d7755b6df0c3..bdbba39e37c2d 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AetherArtifactResolver.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AetherArtifactResolver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.aether; +package io.quarkus.creator.resolver.aether; import java.io.File; import java.nio.file.Path; @@ -50,10 +50,10 @@ import org.eclipse.aether.resolution.VersionRangeResolutionException; import org.eclipse.aether.resolution.VersionRangeResult; import org.eclipse.aether.version.Version; -import org.jboss.shamrock.creator.AppArtifact; -import org.jboss.shamrock.creator.AppArtifactResolverBase; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.AppDependency; +import io.quarkus.creator.AppArtifact; +import io.quarkus.creator.AppArtifactResolverBase; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.AppDependency; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AppCreatorDependencySelector.java b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AppCreatorDependencySelector.java index 4532637475a7a..ca7c40e4a58a2 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AppCreatorDependencySelector.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AppCreatorDependencySelector.java @@ -1,7 +1,7 @@ /** * */ -package org.jboss.shamrock.creator.resolver.aether; +package io.quarkus.creator.resolver.aether; import java.util.Arrays; import java.util.HashSet; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AppCreatorLocalRepositoryManager.java b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AppCreatorLocalRepositoryManager.java index 84036c6f06c11..5fce1588a8602 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AppCreatorLocalRepositoryManager.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/AppCreatorLocalRepositoryManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.aether; +package io.quarkus.creator.resolver.aether; import java.io.IOException; import java.nio.file.Files; @@ -33,7 +33,7 @@ import org.eclipse.aether.repository.LocalRepository; import org.eclipse.aether.repository.LocalRepositoryManager; import org.eclipse.aether.repository.RemoteRepository; -import org.jboss.shamrock.creator.util.IoUtils; +import io.quarkus.creator.util.IoUtils; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/DerivedDependencySelector.java b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/DerivedDependencySelector.java index 7641be6aa928f..23eb987877c78 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/DerivedDependencySelector.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/DerivedDependencySelector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.aether; +package io.quarkus.creator.resolver.aether; import java.util.Collection; import java.util.Set; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/DisabledDependencySelector.java b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/DisabledDependencySelector.java index a24349efbe4ba..e4308617bbc2d 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/DisabledDependencySelector.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/DisabledDependencySelector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.aether; +package io.quarkus.creator.resolver.aether; import org.eclipse.aether.collection.DependencyCollectionContext; import org.eclipse.aether.collection.DependencySelector; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/MavenRepoInitializer.java b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/MavenRepoInitializer.java index 8f970ff1b9f40..aff43f9d24a48 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/MavenRepoInitializer.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/aether/MavenRepoInitializer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.aether; +package io.quarkus.creator.resolver.aether; import java.io.File; import java.util.ArrayList; @@ -48,8 +48,8 @@ import org.eclipse.aether.util.repository.AuthenticationBuilder; import org.eclipse.aether.util.repository.DefaultProxySelector; import org.jboss.logging.Logger; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.util.PropertyUtils; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.util.PropertyUtils; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/maven/ResolvedMavenArtifactDeps.java b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/maven/ResolvedMavenArtifactDeps.java index 069a0f0837585..6b31e3a562c1a 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/maven/ResolvedMavenArtifactDeps.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/resolver/maven/ResolvedMavenArtifactDeps.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.maven; +package io.quarkus.creator.resolver.maven; import java.io.File; import java.nio.file.Path; @@ -24,10 +24,10 @@ import java.util.Collections; import java.util.List; import org.apache.maven.artifact.Artifact; -import org.jboss.shamrock.creator.AppArtifact; -import org.jboss.shamrock.creator.AppArtifactResolverBase; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.AppDependency; +import io.quarkus.creator.AppArtifact; +import io.quarkus.creator.AppArtifactResolverBase; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.AppDependency; /** * diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/util/IoUtils.java b/core/creator/src/main/java/org/jboss/shamrock/creator/util/IoUtils.java index bc7a1f11c319e..10745358b9b77 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/util/IoUtils.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/util/IoUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.util; +package io.quarkus.creator.util; import java.io.BufferedReader; import java.io.IOException; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/util/PropertyUtils.java b/core/creator/src/main/java/org/jboss/shamrock/creator/util/PropertyUtils.java index be41777deedff..67e6dd8907934 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/util/PropertyUtils.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/util/PropertyUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.util; +package io.quarkus.creator.util; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/core/creator/src/main/java/org/jboss/shamrock/creator/util/ZipUtils.java b/core/creator/src/main/java/org/jboss/shamrock/creator/util/ZipUtils.java index 5bd0de592454d..d069ea8b3f1fb 100644 --- a/core/creator/src/main/java/org/jboss/shamrock/creator/util/ZipUtils.java +++ b/core/creator/src/main/java/org/jboss/shamrock/creator/util/ZipUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.creator.util; +package io.quarkus.creator.util; import java.io.IOException; import java.net.URI; diff --git a/core/creator/src/main/resources/META-INF/services/org.jboss.shamrock.creator.AppCreationPhase b/core/creator/src/main/resources/META-INF/services/org.jboss.shamrock.creator.AppCreationPhase index 0b7763e4367ba..1a69f8232b2a4 100644 --- a/core/creator/src/main/resources/META-INF/services/org.jboss.shamrock.creator.AppCreationPhase +++ b/core/creator/src/main/resources/META-INF/services/org.jboss.shamrock.creator.AppCreationPhase @@ -1,4 +1,4 @@ -org.jboss.shamrock.creator.phase.augment.AugmentPhase -org.jboss.shamrock.creator.phase.curate.CuratePhase -org.jboss.shamrock.creator.phase.nativeimage.NativeImagePhase -org.jboss.shamrock.creator.phase.runnerjar.RunnerJarPhase +io.quarkus.creator.phase.augment.AugmentPhase +io.quarkus.creator.phase.curate.CuratePhase +io.quarkus.creator.phase.nativeimage.NativeImagePhase +io.quarkus.creator.phase.runnerjar.RunnerJarPhase diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/Address.java b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/Address.java index 4c8b18f4ab274..b43d200289eb3 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/Address.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/Address.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.creator.config.test; +package io.quarkus.creator.config.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaInfo.java b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaInfo.java index 22b21d644c789..e90e35051d8aa 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaInfo.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaInfo.java @@ -1,7 +1,7 @@ /** * */ -package org.jboss.shamrock.creator.config.test; +package io.quarkus.creator.config.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaVm.java b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaVm.java index 60b960bdbdb2d..ba1ecd4d77f92 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaVm.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaVm.java @@ -1,7 +1,7 @@ /** * */ -package org.jboss.shamrock.creator.config.test; +package io.quarkus.creator.config.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaVmSpec.java b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaVmSpec.java index f936ba64a39c3..5638b68962cb7 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaVmSpec.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/JavaVmSpec.java @@ -1,7 +1,7 @@ /** * */ -package org.jboss.shamrock.creator.config.test; +package io.quarkus.creator.config.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/MappingTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/MappingTestCase.java index d07ca0b122747..e1d019e7fa4cc 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/MappingTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/MappingTestCase.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.test; +package io.quarkus.creator.config.test; -import org.jboss.shamrock.creator.config.reader.MappedPropertiesHandler; -import org.jboss.shamrock.creator.config.reader.PropertiesHandler; +import io.quarkus.creator.config.reader.MappedPropertiesHandler; +import io.quarkus.creator.config.reader.PropertiesHandler; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/Person.java b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/Person.java index a3bb3035f4316..1fe1c08c6322a 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/Person.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.creator.config.test; +package io.quarkus.creator.config.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/PersonAddressTestBase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/PersonAddressTestBase.java index 676c2e53ee365..05b27682cf2c6 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/PersonAddressTestBase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/PersonAddressTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.test; +package io.quarkus.creator.config.test; import static org.junit.Assert.assertEquals; @@ -26,10 +26,10 @@ import java.util.Map; import java.util.Properties; -import org.jboss.shamrock.creator.config.reader.PropertiesConfigReader; -import org.jboss.shamrock.creator.config.reader.PropertiesHandler; -import org.jboss.shamrock.creator.config.reader.PropertyLine; -import org.jboss.shamrock.creator.util.IoUtils; +import io.quarkus.creator.config.reader.PropertiesConfigReader; +import io.quarkus.creator.config.reader.PropertiesHandler; +import io.quarkus.creator.config.reader.PropertyLine; +import io.quarkus.creator.util.IoUtils; import org.junit.Test; /** diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/SmallryeTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/SmallryeTestCase.java index 7fd3ba206c287..e08402d17dd61 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/SmallryeTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/SmallryeTestCase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.test; +package io.quarkus.creator.config.test; import static org.junit.Assert.assertEquals; @@ -25,11 +25,11 @@ import java.util.List; import org.eclipse.microprofile.config.Config; -import org.jboss.shamrock.creator.config.reader.MappedPropertiesHandler; -import org.jboss.shamrock.creator.config.reader.MultirootedConfigHandler; -import org.jboss.shamrock.creator.config.reader.PropertiesConfigReader; -import org.jboss.shamrock.creator.config.reader.PropertiesHandler; -import org.jboss.shamrock.creator.config.reader.PropertyLine; +import io.quarkus.creator.config.reader.MappedPropertiesHandler; +import io.quarkus.creator.config.reader.MultirootedConfigHandler; +import io.quarkus.creator.config.reader.PropertiesConfigReader; +import io.quarkus.creator.config.reader.PropertiesHandler; +import io.quarkus.creator.config.reader.PropertyLine; import org.junit.Test; import io.smallrye.config.SmallRyeConfigProviderResolver; diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/SwitchTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/SwitchTestCase.java index 9b941da275341..92927ab0d5fb7 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/SwitchTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/SwitchTestCase.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.test; +package io.quarkus.creator.config.test; -import org.jboss.shamrock.creator.config.reader.PropertiesConfigReaderException; -import org.jboss.shamrock.creator.config.reader.PropertiesHandler; -import org.jboss.shamrock.creator.config.reader.PropertyContext; +import io.quarkus.creator.config.reader.PropertiesConfigReaderException; +import io.quarkus.creator.config.reader.PropertiesHandler; +import io.quarkus.creator.config.reader.PropertyContext; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/User.java b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/User.java index a6bf044bce09c..43e69b6849e3d 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/User.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/config/test/User.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.config.test; +package io.quarkus.creator.config.test; import java.nio.file.Path; diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/CircularDependencyTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/CircularDependencyTestCase.java index d2f96e54a7004..bdf0ca7eaa64b 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/CircularDependencyTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/CircularDependencyTestCase.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome.test; +package io.quarkus.creator.outcome.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.outcome.Errors; -import org.jboss.shamrock.creator.outcome.OutcomeMap; -import org.jboss.shamrock.creator.outcome.OutcomeProvider; -import org.jboss.shamrock.creator.outcome.OutcomeProviderRegistration; -import org.jboss.shamrock.creator.outcome.OutcomeResolver; -import org.jboss.shamrock.creator.outcome.OutcomeResolverFactory; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.outcome.Errors; +import io.quarkus.creator.outcome.OutcomeMap; +import io.quarkus.creator.outcome.OutcomeProvider; +import io.quarkus.creator.outcome.OutcomeProviderRegistration; +import io.quarkus.creator.outcome.OutcomeResolver; +import io.quarkus.creator.outcome.OutcomeResolverFactory; import org.junit.Test; /** diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/ManuallyProvidedOutcomeTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/ManuallyProvidedOutcomeTestCase.java index 6542ac065df4e..998ece39c2247 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/ManuallyProvidedOutcomeTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/ManuallyProvidedOutcomeTestCase.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome.test; +package io.quarkus.creator.outcome.test; import static org.junit.Assert.assertEquals; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.outcome.OutcomeMap; -import org.jboss.shamrock.creator.outcome.OutcomeProvider; -import org.jboss.shamrock.creator.outcome.OutcomeProviderRegistration; -import org.jboss.shamrock.creator.outcome.OutcomeResolver; -import org.jboss.shamrock.creator.outcome.OutcomeResolverFactory; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.outcome.OutcomeMap; +import io.quarkus.creator.outcome.OutcomeProvider; +import io.quarkus.creator.outcome.OutcomeProviderRegistration; +import io.quarkus.creator.outcome.OutcomeResolver; +import io.quarkus.creator.outcome.OutcomeResolverFactory; import org.junit.Test; /** diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/ProviderNotFoundForOutcomeTypeTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/ProviderNotFoundForOutcomeTypeTestCase.java index e566fa5cce445..d316b2361502f 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/ProviderNotFoundForOutcomeTypeTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/ProviderNotFoundForOutcomeTypeTestCase.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome.test; +package io.quarkus.creator.outcome.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.outcome.Errors; -import org.jboss.shamrock.creator.outcome.OutcomeMap; -import org.jboss.shamrock.creator.outcome.OutcomeProvider; -import org.jboss.shamrock.creator.outcome.OutcomeProviderRegistration; -import org.jboss.shamrock.creator.outcome.OutcomeResolver; -import org.jboss.shamrock.creator.outcome.OutcomeResolverFactory; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.outcome.Errors; +import io.quarkus.creator.outcome.OutcomeMap; +import io.quarkus.creator.outcome.OutcomeProvider; +import io.quarkus.creator.outcome.OutcomeProviderRegistration; +import io.quarkus.creator.outcome.OutcomeResolver; +import io.quarkus.creator.outcome.OutcomeResolverFactory; import org.junit.Test; /** diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/SimplePhaseSequenceTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/SimplePhaseSequenceTestCase.java index 22b19be203ae3..1f882a8d5d971 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/SimplePhaseSequenceTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/SimplePhaseSequenceTestCase.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome.test; +package io.quarkus.creator.outcome.test; import static org.junit.Assert.assertEquals; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.outcome.OutcomeMap; -import org.jboss.shamrock.creator.outcome.OutcomeProvider; -import org.jboss.shamrock.creator.outcome.OutcomeProviderRegistration; -import org.jboss.shamrock.creator.outcome.OutcomeResolver; -import org.jboss.shamrock.creator.outcome.OutcomeResolverFactory; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.outcome.OutcomeMap; +import io.quarkus.creator.outcome.OutcomeProvider; +import io.quarkus.creator.outcome.OutcomeProviderRegistration; +import io.quarkus.creator.outcome.OutcomeResolver; +import io.quarkus.creator.outcome.OutcomeResolverFactory; import org.junit.Test; /** diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/SinglePhaseTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/SinglePhaseTestCase.java index 92b60b339cd90..d54b0880da2d0 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/SinglePhaseTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/SinglePhaseTestCase.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome.test; +package io.quarkus.creator.outcome.test; import static org.junit.Assert.assertEquals; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.outcome.OutcomeMap; -import org.jboss.shamrock.creator.outcome.OutcomeProvider; -import org.jboss.shamrock.creator.outcome.OutcomeProviderRegistration; -import org.jboss.shamrock.creator.outcome.OutcomeResolver; -import org.jboss.shamrock.creator.outcome.OutcomeResolverFactory; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.outcome.OutcomeMap; +import io.quarkus.creator.outcome.OutcomeProvider; +import io.quarkus.creator.outcome.OutcomeProviderRegistration; +import io.quarkus.creator.outcome.OutcomeResolver; +import io.quarkus.creator.outcome.OutcomeResolverFactory; import org.junit.Test; /** diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/TestResult.java b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/TestResult.java index 603d362de49aa..7041a0bb62598 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/TestResult.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/outcome/test/TestResult.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.outcome.test; +package io.quarkus.creator.outcome.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/CollectDependenciesBase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/CollectDependenciesBase.java index 4075287ebbc1a..dd22a573c51ce 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/CollectDependenciesBase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/CollectDependenciesBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; import static org.junit.Assert.assertEquals; @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.List; -import org.jboss.shamrock.creator.AppDependency; +import io.quarkus.creator.AppDependency; import org.junit.Test; /** diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependenciesOnDifferentVersionsOfAnArtifactTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependenciesOnDifferentVersionsOfAnArtifactTestCase.java index d6ea2df0b1548..33c2ec2e92065 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependenciesOnDifferentVersionsOfAnArtifactTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependenciesOnDifferentVersionsOfAnArtifactTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphInCompileAndProvidedScopesTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphInCompileAndProvidedScopesTestCase.java index 1681f96a7072c..3a9b9cdd0284d 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphInCompileAndProvidedScopesTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphInCompileAndProvidedScopesTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphInCompileAndTestScopesTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphInCompileAndTestScopesTestCase.java index 3546531997d8d..25fd014d29859 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphInCompileAndTestScopesTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphInCompileAndTestScopesTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphTestCase.java index 0e27defadcd11..e8cc87d55e427 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphWithDifferentClassifierAndTypeTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphWithDifferentClassifierAndTypeTestCase.java index 0bd5ec758998b..578fa31233983 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphWithDifferentClassifierAndTypeTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DependencyPresentTwiceInTheGraphWithDifferentClassifierAndTypeTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DirectDependencyVersionOverridesTransitiveVersionTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DirectDependencyVersionOverridesTransitiveVersionTestCase.java index 23e6b2dde8346..f94444c29c0a9 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DirectDependencyVersionOverridesTransitiveVersionTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/DirectDependencyVersionOverridesTransitiveVersionTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/ExclusionsTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/ExclusionsTestCase.java index 565c8b7626b73..863ffbc2216b9 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/ExclusionsTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/ExclusionsTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/OnlyDirectProvidedDepsAreCollectedTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/OnlyDirectProvidedDepsAreCollectedTestCase.java index a83784fea2d10..f5568ff20e0a7 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/OnlyDirectProvidedDepsAreCollectedTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/OnlyDirectProvidedDepsAreCollectedTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/OptionalDepsNotCollectedTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/OptionalDepsNotCollectedTestCase.java index ef4b29187e508..141807735d059 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/OptionalDepsNotCollectedTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/OptionalDepsNotCollectedTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/ResolverSetupCleanup.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/ResolverSetupCleanup.java index ca539034537d8..ca632a9080819 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/ResolverSetupCleanup.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/ResolverSetupCleanup.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; import java.nio.file.Path; import java.util.Collections; import java.util.List; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.AppDependency; -import org.jboss.shamrock.creator.resolver.aether.AetherArtifactResolver; -import org.jboss.shamrock.creator.util.IoUtils; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.AppDependency; +import io.quarkus.creator.resolver.aether.AetherArtifactResolver; +import io.quarkus.creator.util.IoUtils; import org.junit.After; import org.junit.Before; diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TestScopeNotCollectedTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TestScopeNotCollectedTestCase.java index ad567b6e24040..f8f11f0085f9d 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TestScopeNotCollectedTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TestScopeNotCollectedTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TransitiveNonOptionalOverridesDirectOptionalVersionTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TransitiveNonOptionalOverridesDirectOptionalVersionTestCase.java index 90d1a42a6a22a..6d3a932381736 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TransitiveNonOptionalOverridesDirectOptionalVersionTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TransitiveNonOptionalOverridesDirectOptionalVersionTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TransitiveVersionOverridesTestCase.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TransitiveVersionOverridesTestCase.java index 6a356fe7fa909..b33f46f146402 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TransitiveVersionOverridesTestCase.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TransitiveVersionOverridesTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; /** * diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsArtifact.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsArtifact.java index 8cfe54c294993..1dde980fbc7ab 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsArtifact.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsArtifact.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.maven.model.Model; -import org.jboss.shamrock.creator.AppArtifact; +import io.quarkus.creator.AppArtifact; /** * @@ -29,7 +29,7 @@ */ public class TsArtifact { - static final String DEFAULT_GROUP_ID = "org.shamrock.creator.test"; + static final String DEFAULT_GROUP_ID = "org.quarkus.creator.test"; public static TsArtifact getGa(String groupId, String artifactId) { return new TsArtifact(groupId, artifactId, null); diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsDependency.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsDependency.java index bec69fe496d15..a41ddf9d6daa8 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsDependency.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsDependency.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; import java.util.ArrayList; import java.util.Collections; diff --git a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsRepoBuilder.java b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsRepoBuilder.java index d17381ecdc2f6..83ebe6fa225ad 100644 --- a/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsRepoBuilder.java +++ b/core/creator/src/test/java/org/jboss/shamrock/creator/resolver/test/TsRepoBuilder.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.jboss.shamrock.creator.resolver.test; +package io.quarkus.creator.resolver.test; import java.io.BufferedWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import org.jboss.shamrock.creator.AppArtifact; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.phase.curate.Utils; -import org.jboss.shamrock.creator.resolver.aether.AetherArtifactResolver; +import io.quarkus.creator.AppArtifact; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.phase.curate.Utils; +import io.quarkus.creator.resolver.aether.AetherArtifactResolver; /** * diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml index f47104a8054a5..74649f54492fc 100644 --- a/core/deployment/pom.xml +++ b/core/deployment/pom.xml @@ -21,14 +21,14 @@ 4.0.0 - org.jboss.shamrock - shamrock-core-parent + io.quarkus + quarkus-core-parent 1.0.0.Alpha1-SNAPSHOT ../ - shamrock-core-deployment - Shamrock - Core - Deployment + quarkus-core-deployment + Quarkus - Core - Deployment @@ -66,8 +66,8 @@ asm - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime org.jboss.gizmo @@ -80,8 +80,8 @@ junit - org.jboss.shamrock - shamrock-builder + io.quarkus + quarkus-builder @@ -92,8 +92,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/AccessorFinder.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/AccessorFinder.java index 7a2d507e203a2..2b1ee31a3f735 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/AccessorFinder.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/AccessorFinder.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment; +package io.quarkus.deployment; import static org.jboss.protean.gizmo.DescriptorUtils.isPrimitive; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ApplicationArchive.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ApplicationArchive.java index c3d58fe847596..d8215d622ec9f 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ApplicationArchive.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ApplicationArchive.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment; +package io.quarkus.deployment; import java.io.Closeable; import java.nio.file.Files; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ApplicationArchiveImpl.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ApplicationArchiveImpl.java index c340ae9b3fd90..689ad5d95aab6 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ApplicationArchiveImpl.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ApplicationArchiveImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment; +package io.quarkus.deployment; import java.io.Closeable; import java.io.IOException; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/BuildProducerImpl.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/BuildProducerImpl.java index baa4c5c5bf418..b30f94d6eb0ea 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/BuildProducerImpl.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/BuildProducerImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment; +package io.quarkus.deployment; import org.jboss.builder.BuildContext; import org.jboss.builder.item.BuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildProducer; /** * Producer class used by the source generated from the annotation processor diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/Capabilities.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/Capabilities.java index cc0c7ac85d514..c242c84c40122 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/Capabilities.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/Capabilities.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment; +package io.quarkus.deployment; import java.util.Set; @@ -25,8 +25,8 @@ */ public final class Capabilities extends SimpleBuildItem { - public static final String CDI_ARC = "org.jboss.shamrock.cdi"; - public static final String TRANSACTIONS = "org.jboss.shamrock.transactions"; + public static final String CDI_ARC = "io.quarkus.cdi"; + public static final String TRANSACTIONS = "io.quarkus.transactions"; private final Set capabilities; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ClassOutput.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ClassOutput.java index fb878950124c6..326d42703c25e 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ClassOutput.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ClassOutput.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment; +package io.quarkus.deployment; import java.io.IOException; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ExtensionLoader.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ExtensionLoader.java index bb60d90b8639f..4295c857c588c 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ExtensionLoader.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ExtensionLoader.java @@ -1,15 +1,15 @@ -package org.jboss.shamrock.deployment; +package io.quarkus.deployment; -import static org.jboss.shamrock.deployment.util.ReflectUtil.isBuildProducerOf; -import static org.jboss.shamrock.deployment.util.ReflectUtil.isConsumerOf; -import static org.jboss.shamrock.deployment.util.ReflectUtil.isListOf; -import static org.jboss.shamrock.deployment.util.ReflectUtil.isOptionalOf; -import static org.jboss.shamrock.deployment.util.ReflectUtil.isSupplierOf; -import static org.jboss.shamrock.deployment.util.ReflectUtil.isSupplierOfOptionalOf; -import static org.jboss.shamrock.deployment.util.ReflectUtil.rawTypeExtends; -import static org.jboss.shamrock.deployment.util.ReflectUtil.rawTypeIs; -import static org.jboss.shamrock.deployment.util.ReflectUtil.rawTypeOf; -import static org.jboss.shamrock.deployment.util.ReflectUtil.rawTypeOfParameter; +import static io.quarkus.deployment.util.ReflectUtil.isBuildProducerOf; +import static io.quarkus.deployment.util.ReflectUtil.isConsumerOf; +import static io.quarkus.deployment.util.ReflectUtil.isListOf; +import static io.quarkus.deployment.util.ReflectUtil.isOptionalOf; +import static io.quarkus.deployment.util.ReflectUtil.isSupplierOf; +import static io.quarkus.deployment.util.ReflectUtil.isSupplierOfOptionalOf; +import static io.quarkus.deployment.util.ReflectUtil.rawTypeExtends; +import static io.quarkus.deployment.util.ReflectUtil.rawTypeIs; +import static io.quarkus.deployment.util.ReflectUtil.rawTypeOf; +import static io.quarkus.deployment.util.ReflectUtil.rawTypeOfParameter; import java.io.IOException; import java.lang.reflect.AnnotatedElement; @@ -42,21 +42,21 @@ import org.jboss.builder.item.BuildItem; import org.jboss.builder.item.MultiBuildItem; import org.jboss.builder.item.SimpleBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem; -import org.jboss.shamrock.deployment.builditem.CapabilityBuildItem; -import org.jboss.shamrock.deployment.builditem.ConfigurationBuildItem; -import org.jboss.shamrock.deployment.builditem.MainBytecodeRecorderBuildItem; -import org.jboss.shamrock.deployment.builditem.StaticBytecodeRecorderBuildItem; -import org.jboss.shamrock.deployment.recording.BytecodeRecorderImpl; -import org.jboss.shamrock.deployment.recording.RecorderContext; -import org.jboss.shamrock.deployment.util.ReflectUtil; -import org.jboss.shamrock.deployment.util.ServiceUtil; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem; +import io.quarkus.deployment.builditem.CapabilityBuildItem; +import io.quarkus.deployment.builditem.ConfigurationBuildItem; +import io.quarkus.deployment.builditem.MainBytecodeRecorderBuildItem; +import io.quarkus.deployment.builditem.StaticBytecodeRecorderBuildItem; +import io.quarkus.deployment.recording.BytecodeRecorderImpl; +import io.quarkus.deployment.recording.RecorderContext; +import io.quarkus.deployment.util.ReflectUtil; +import io.quarkus.deployment.util.ServiceUtil; +import io.quarkus.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.Template; import org.wildfly.common.function.Functions; /** @@ -79,7 +79,7 @@ private static boolean isTemplate(AnnotatedElement element) { */ public static Consumer loadStepsFrom(ClassLoader classLoader) throws IOException, ClassNotFoundException { Consumer result = Functions.discardingConsumer(); - for (Class clazz : ServiceUtil.classesNamedIn(classLoader, "META-INF/shamrock-build-steps.list")) { + for (Class clazz : ServiceUtil.classesNamedIn(classLoader, "META-INF/quarkus-build-steps.list")) { result = result.andThen(ExtensionLoader.loadStepsFrom(clazz)); } return result; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockAugmentor.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockAugmentor.java index 7f20f4690e251..a734e20b8c3c0 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockAugmentor.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockAugmentor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment; +package io.quarkus.deployment; import java.nio.file.Path; import java.util.ArrayList; @@ -28,19 +28,19 @@ import org.jboss.builder.BuildResult; import org.jboss.builder.item.BuildItem; import org.jboss.logging.Logger; -import org.jboss.shamrock.deployment.builditem.ArchiveRootBuildItem; -import org.jboss.shamrock.deployment.builditem.ClassOutputBuildItem; -import org.jboss.shamrock.deployment.builditem.ExtensionClassLoaderBuildItem; -import org.jboss.shamrock.deployment.builditem.GeneratedClassBuildItem; -import org.jboss.shamrock.deployment.builditem.GeneratedResourceBuildItem; -import org.jboss.shamrock.deployment.builditem.LaunchModeBuildItem; -import org.jboss.shamrock.deployment.builditem.ShutdownContextBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateResourceBuildItem; -import org.jboss.shamrock.runtime.LaunchMode; +import io.quarkus.deployment.builditem.ArchiveRootBuildItem; +import io.quarkus.deployment.builditem.ClassOutputBuildItem; +import io.quarkus.deployment.builditem.ExtensionClassLoaderBuildItem; +import io.quarkus.deployment.builditem.GeneratedClassBuildItem; +import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; +import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.builditem.ShutdownContextBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem; +import io.quarkus.runtime.LaunchMode; -public class ShamrockAugmentor { +public class QuarkusAugmentor { - private static final Logger log = Logger.getLogger(ShamrockAugmentor.class); + private static final Logger log = Logger.getLogger(QuarkusAugmentor.class); private final ClassOutput output; private final ClassLoader classLoader; @@ -49,7 +49,7 @@ public class ShamrockAugmentor { private final List> buildChainCustomizers; private final LaunchMode launchMode; - ShamrockAugmentor(Builder builder) { + QuarkusAugmentor(Builder builder) { this.output = builder.output; this.classLoader = builder.classLoader; this.root = builder.root; @@ -60,7 +60,7 @@ public class ShamrockAugmentor { public BuildResult run() throws Exception { long time = System.currentTimeMillis(); - log.info("Beginning shamrock augmentation"); + log.info("Beginning quarkus augmentation"); ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader(); try { Thread.currentThread().setContextClassLoader(classLoader); @@ -71,7 +71,7 @@ public BuildResult run() throws Exception { chainBuilder.loadProviders(classLoader); chainBuilder - .addInitial(ShamrockConfig.class) + .addInitial(QuarkusConfig.class) .addInitial(SubstrateResourceBuildItem.class) .addInitial(ArchiveRootBuildItem.class) .addInitial(ShutdownContextBuildItem.class) @@ -92,7 +92,7 @@ public BuildResult run() throws Exception { .build(); BuildResult buildResult = chain.createExecutionBuilder("main") .produce(new SubstrateResourceBuildItem("META-INF/microprofile-config.properties")) - .produce(ShamrockConfig.INSTANCE) + .produce(QuarkusConfig.INSTANCE) .produce(new ArchiveRootBuildItem(root)) .produce(new ClassOutputBuildItem(output)) .produce(new ShutdownContextBuildItem()) @@ -107,7 +107,7 @@ public BuildResult run() throws Exception { for (GeneratedResourceBuildItem i : buildResult.consumeMulti(GeneratedResourceBuildItem.class)) { output.writeResource(i.getName(), i.getClassData()); } - log.info("Shamrock augmentation completed in " + (System.currentTimeMillis() - time) + "ms"); + log.info("Quarkus augmentation completed in " + (System.currentTimeMillis() - time) + "ms"); return buildResult; } finally { Thread.currentThread().setContextClassLoader(originalClassLoader); @@ -184,8 +184,8 @@ public Builder setRoot(Path root) { return this; } - public ShamrockAugmentor build() { - return new ShamrockAugmentor(this); + public QuarkusAugmentor build() { + return new QuarkusAugmentor(this); } } } diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockClassWriter.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockClassWriter.java index b936d5df2d5bd..89a95ac0b8f3f 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockClassWriter.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockClassWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment; +package io.quarkus.deployment; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; @@ -25,10 +25,10 @@ * * @author Stéphane Épardaud */ -public class ShamrockClassWriter extends ClassWriter { +public class QuarkusClassWriter extends ClassWriter { - public ShamrockClassWriter(final ClassReader classReader, final int flags) { + public QuarkusClassWriter(final ClassReader classReader, final int flags) { super(classReader, flags); } diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockConfig.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockConfig.java index a0eb227902d47..6458bb88ac041 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockConfig.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/ShamrockConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment; +package io.quarkus.deployment; import java.util.HashSet; import java.util.IdentityHashMap; @@ -25,15 +25,15 @@ import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.builder.item.SimpleBuildItem; -import org.jboss.shamrock.deployment.configuration.ConfigurationError; +import io.quarkus.deployment.configuration.ConfigurationError; -public final class ShamrockConfig extends SimpleBuildItem { +public final class QuarkusConfig extends SimpleBuildItem { - public static final ShamrockConfig INSTANCE = new ShamrockConfig(); + public static final QuarkusConfig INSTANCE = new QuarkusConfig(); private static final Map reverseMap = new IdentityHashMap<>(); - private ShamrockConfig() { + private QuarkusConfig() { //not to be constructed } diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/SslProcessor.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/SslProcessor.java index 873797b3fd589..be1ccc3d8137f 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/SslProcessor.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/SslProcessor.java @@ -1,12 +1,12 @@ -package org.jboss.shamrock.deployment; +package io.quarkus.deployment; import java.util.Optional; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.SslNativeConfigBuildItem; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.SslNativeConfigBuildItem; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; public class SslProcessor { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/BuildProducer.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/BuildProducer.java index 4c937e87547a8..3ce088e09cb42 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/BuildProducer.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/BuildProducer.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.annotations; +package io.quarkus.deployment.annotations; import org.jboss.builder.item.BuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/BuildStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/BuildStep.java index 0e67ad6886dd5..83cea435ac400 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/BuildStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/BuildStep.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.annotations; +package io.quarkus.deployment.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -12,8 +12,8 @@ import org.jboss.builder.item.BuildItem; import org.jboss.builder.item.MultiBuildItem; import org.jboss.builder.item.SimpleBuildItem; -import org.jboss.shamrock.deployment.recording.BytecodeRecorderImpl; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.deployment.recording.BytecodeRecorderImpl; +import io.quarkus.runtime.annotations.Template; /** * Indicates that a given method is a build step that is run at deployment time to diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/ExecutionTime.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/ExecutionTime.java index ec672271e785d..dcaf9981159a7 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/ExecutionTime.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/ExecutionTime.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.annotations; +package io.quarkus.deployment.annotations; /** * Enum that specifies at what time generated bytecode should be run diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/Record.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/Record.java index fe3a26aae6fe7..32e1720eaae5b 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/Record.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/annotations/Record.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.annotations; +package io.quarkus.deployment.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/AdditionalApplicationArchiveMarkerBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/AdditionalApplicationArchiveMarkerBuildItem.java index e0d415324010d..e19835a2d495f 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/AdditionalApplicationArchiveMarkerBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/AdditionalApplicationArchiveMarkerBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/AnnotationProxyBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/AnnotationProxyBuildItem.java index c5b48e5ea0e5c..35084f405afaf 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/AnnotationProxyBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/AnnotationProxyBuildItem.java @@ -1,12 +1,12 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import java.lang.annotation.Annotation; import org.jboss.builder.item.SimpleBuildItem; import org.jboss.jandex.AnnotationInstance; -import org.jboss.shamrock.deployment.recording.AnnotationProxyProvider; -import org.jboss.shamrock.deployment.recording.AnnotationProxyProvider.AnnotationProxyBuilder; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.deployment.recording.AnnotationProxyProvider; +import io.quarkus.deployment.recording.AnnotationProxyProvider.AnnotationProxyBuilder; +import io.quarkus.runtime.annotations.Template; /** * Create annotation proxies that can be used as {@link Template} parameters. diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationArchivesBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationArchivesBuildItem.java index 7947530bd8d64..6a2c358f3efe3 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationArchivesBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationArchivesBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import java.util.Collection; import java.util.Collections; @@ -22,7 +22,7 @@ import java.util.Set; import org.jboss.builder.item.SimpleBuildItem; -import org.jboss.shamrock.deployment.ApplicationArchive; +import io.quarkus.deployment.ApplicationArchive; //temp class public final class ApplicationArchivesBuildItem extends SimpleBuildItem { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationClassNameBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationClassNameBuildItem.java index ba55ded7bdf43..4ebe970008caa 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationClassNameBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationClassNameBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.SimpleBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationIndexBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationIndexBuildItem.java index ded41b77b00a8..7c6f49db3f0cb 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationIndexBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ApplicationIndexBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.SimpleBuildItem; import org.jboss.jandex.Index; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ArchiveRootBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ArchiveRootBuildItem.java index c901148645dc5..dc82c19d68c5b 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ArchiveRootBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ArchiveRootBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import java.nio.file.Path; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/BytecodeRecorderObjectLoaderBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/BytecodeRecorderObjectLoaderBuildItem.java index c25388edbb2f8..cd55c05f6b8d0 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/BytecodeRecorderObjectLoaderBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/BytecodeRecorderObjectLoaderBuildItem.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.deployment.recording.ObjectLoader; +import io.quarkus.deployment.recording.ObjectLoader; /** */ diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/BytecodeTransformerBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/BytecodeTransformerBuildItem.java index 16e118977a284..325fc1efdb318 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/BytecodeTransformerBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/BytecodeTransformerBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import java.util.function.BiFunction; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/CapabilityBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/CapabilityBuildItem.java index ba10e1fc00402..25b05e49ef3b4 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/CapabilityBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/CapabilityBuildItem.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.deployment.Capabilities; +import io.quarkus.deployment.Capabilities; /** * Registers an internal feature. diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ClassOutputBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ClassOutputBuildItem.java index 6af841b8c22e2..a49352b6ef9f1 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ClassOutputBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ClassOutputBuildItem.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.SimpleBuildItem; -import org.jboss.shamrock.deployment.ClassOutput; +import io.quarkus.deployment.ClassOutput; public final class ClassOutputBuildItem extends SimpleBuildItem { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/CombinedIndexBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/CombinedIndexBuildItem.java index a97ddfafa8111..b401596d417eb 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/CombinedIndexBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/CombinedIndexBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.SimpleBuildItem; import org.jboss.jandex.IndexView; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationBuildItem.java index a9732141bb52f..b3c2228098215 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationBuildItem.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.SimpleBuildItem; -import org.jboss.shamrock.deployment.configuration.ConfigDefinition; +import io.quarkus.deployment.configuration.ConfigDefinition; /** * The build item which carries the build time configuration. diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationCustomConverterBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationCustomConverterBuildItem.java index b44d7dda6e6fb..2dc178a26509f 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationCustomConverterBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationCustomConverterBuildItem.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.eclipse.microprofile.config.spi.Converter; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationTypeBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationTypeBuildItem.java index d98ee7dd8d692..9bb0966172aeb 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationTypeBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ConfigurationTypeBuildItem.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; import org.wildfly.common.Assert; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExecutorBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExecutorBuildItem.java index 45e1e3aae9013..ad5d348b1ff45 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExecutorBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExecutorBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import java.util.concurrent.Executor; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExtensionClassLoaderBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExtensionClassLoaderBuildItem.java index 2193d2b770d54..f566155ffb111 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExtensionClassLoaderBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExtensionClassLoaderBuildItem.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.SimpleBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExtensionSslNativeSupportBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExtensionSslNativeSupportBuildItem.java index 4eae1a206fbd8..5686b56b70db4 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExtensionSslNativeSupportBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ExtensionSslNativeSupportBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/FeatureBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/FeatureBuildItem.java index fb65321b73c6d..247a0a87c1df3 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/FeatureBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/FeatureBuildItem.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import java.util.Objects; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/GeneratedClassBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/GeneratedClassBuildItem.java index 99530b29cec01..c2a6d84d96f32 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/GeneratedClassBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/GeneratedClassBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/GeneratedResourceBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/GeneratedResourceBuildItem.java index 60123e4be7902..24cb02cb9bf70 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/GeneratedResourceBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/GeneratedResourceBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/HotDeploymentConfigFileBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/HotDeploymentConfigFileBuildItem.java index 0d26b22060b92..65548ee7679cf 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/HotDeploymentConfigFileBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/HotDeploymentConfigFileBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/HttpServerBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/HttpServerBuildItem.java index 719c266a6e92a..d92fa5f606486 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/HttpServerBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/HttpServerBuildItem.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.SimpleBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/LaunchModeBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/LaunchModeBuildItem.java index 95ba601283c71..a60087c5afa67 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/LaunchModeBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/LaunchModeBuildItem.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.SimpleBuildItem; -import org.jboss.shamrock.runtime.LaunchMode; +import io.quarkus.runtime.LaunchMode; /** * indicates the type of launch diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/LogCategoryBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/LogCategoryBuildItem.java index 481c292a6c4fc..ebfe047a71583 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/LogCategoryBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/LogCategoryBuildItem.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import java.util.logging.Level; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/MainBytecodeRecorderBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/MainBytecodeRecorderBuildItem.java index 79dfe08319cfa..2d9b6c6b4f360 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/MainBytecodeRecorderBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/MainBytecodeRecorderBuildItem.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.deployment.recording.BytecodeRecorderImpl; +import io.quarkus.deployment.recording.BytecodeRecorderImpl; public final class MainBytecodeRecorderBuildItem extends MultiBuildItem { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/MainClassBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/MainClassBuildItem.java index 4ccaa73b836fe..dc706561b8162 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/MainClassBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/MainClassBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.SimpleBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ObjectSubstitutionBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ObjectSubstitutionBuildItem.java index a045fa81185b7..39665f5a76ed3 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ObjectSubstitutionBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ObjectSubstitutionBuildItem.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.runtime.ObjectSubstitution; +import io.quarkus.runtime.ObjectSubstitution; /** * Used to capture object substitution information for non-serializable classes diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ProxyUnwrapperBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ProxyUnwrapperBuildItem.java index 435f0dfc130c7..ef0a7487450da 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ProxyUnwrapperBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ProxyUnwrapperBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import java.util.function.Function; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/RunTimeConfigurationDefaultBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/RunTimeConfigurationDefaultBuildItem.java index 80a3fef92dea5..38cd9e3e90b63 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/RunTimeConfigurationDefaultBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/RunTimeConfigurationDefaultBuildItem.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigItem; import org.wildfly.common.Assert; /** diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/RunTimeConfigurationSourceBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/RunTimeConfigurationSourceBuildItem.java index bf6fafb1f2e84..6022eeb916a12 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/RunTimeConfigurationSourceBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/RunTimeConfigurationSourceBuildItem.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import java.util.OptionalInt; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ServiceStartBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ServiceStartBuildItem.java index 57df26a4f7850..aa1ba4268dec0 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ServiceStartBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ServiceStartBuildItem.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.runtime.StartupEvent; +import io.quarkus.runtime.StartupEvent; /** * A symbolic class that represents a service start. diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ShutdownContextBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ShutdownContextBuildItem.java index e95d13b6b7eee..16d9a1d869b00 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ShutdownContextBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/ShutdownContextBuildItem.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.SimpleBuildItem; -import org.jboss.shamrock.deployment.recording.BytecodeRecorderImpl; -import org.jboss.shamrock.runtime.ShutdownContext; +import io.quarkus.deployment.recording.BytecodeRecorderImpl; +import io.quarkus.runtime.ShutdownContext; /** * A build item that can be used to register shutdown tasks in runtime templates diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/SslNativeConfigBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/SslNativeConfigBuildItem.java index b33a82c3f465e..f10d438ad4a94 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/SslNativeConfigBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/SslNativeConfigBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import java.util.Optional; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/StaticBytecodeRecorderBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/StaticBytecodeRecorderBuildItem.java index bd705c52527af..429c619ee1433 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/StaticBytecodeRecorderBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/StaticBytecodeRecorderBuildItem.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.deployment.recording.BytecodeRecorderImpl; +import io.quarkus.deployment.recording.BytecodeRecorderImpl; public final class StaticBytecodeRecorderBuildItem extends MultiBuildItem { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/SystemPropertyBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/SystemPropertyBuildItem.java index 079770f0688bb..01467b5f3a4bc 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/SystemPropertyBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/SystemPropertyBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/WiringClassBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/WiringClassBuildItem.java index e34f3a934c0d6..7083d5447a005 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/WiringClassBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/WiringClassBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem; +package io.quarkus.deployment.builditem; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveClassBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveClassBuildItem.java index b8eb7fe57acdb..ec223793ce2b0 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveClassBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveClassBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import java.util.Arrays; import java.util.List; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveFieldBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveFieldBuildItem.java index 10fba6a3b15cd..5ffe45cce27a7 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveFieldBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveFieldBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import java.lang.reflect.Field; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveHierarchyBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveHierarchyBuildItem.java index 2d0b5aab35b00..1d3efb7577d12 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveHierarchyBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveHierarchyBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import org.jboss.builder.item.MultiBuildItem; import org.jboss.jandex.Type; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveMethodBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveMethodBuildItem.java index 09d32975651af..24dabfbeca852 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveMethodBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ReflectiveMethodBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/RuntimeInitializedClassBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/RuntimeInitializedClassBuildItem.java index e0d26ac091786..e8ed8324df9b3 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/RuntimeInitializedClassBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/RuntimeInitializedClassBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/RuntimeReinitializedClassBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/RuntimeReinitializedClassBuildItem.java index 1249d128bffb2..22dfdb6b34d39 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/RuntimeReinitializedClassBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/RuntimeReinitializedClassBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ServiceProviderBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ServiceProviderBuildItem.java index 36d508472b065..5e2bab8f08f55 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ServiceProviderBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/ServiceProviderBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateConfigBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateConfigBuildItem.java index 888408aa6a487..ba58ff60a2985 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateConfigBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateConfigBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import java.util.Arrays; import java.util.Collections; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateOutputBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateOutputBuildItem.java index 4d0ce9a54cd92..06ea474e6b183 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateOutputBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateOutputBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateProxyDefinitionBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateProxyDefinitionBuildItem.java index 429d8c78c7ef5..df3ac7167bf49 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateProxyDefinitionBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateProxyDefinitionBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateResourceBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateResourceBuildItem.java index 9347f3a3bc8a4..39c47042f0fdb 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateResourceBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateResourceBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateResourceBundleBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateResourceBundleBuildItem.java index b265554fcfa4c..ac561516f73df 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateResourceBundleBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateResourceBundleBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateSystemPropertyBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateSystemPropertyBuildItem.java index ec486584a648c..c68f9690b6524 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateSystemPropertyBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/builditem/substrate/SubstrateSystemPropertyBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.builditem.substrate; +package io.quarkus.deployment.builditem.substrate; import org.jboss.builder.item.MultiBuildItem; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/BooleanConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/BooleanConfigType.java index 6b3f3ef5b16b2..d38b2183fc45f 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/BooleanConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/BooleanConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Field; import java.util.Optional; @@ -7,8 +7,8 @@ import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.configuration.NameIterator; /** */ diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/CompoundConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/CompoundConfigType.java index d3c29be3a17fe..a69599169e801 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/CompoundConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/CompoundConfigType.java @@ -1,9 +1,9 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import io.smallrye.config.SmallRyeConfig; import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.runtime.configuration.NameIterator; /** * A node which contains other nodes. diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigDefinition.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigDefinition.java index 0ada45b409a5d..5edcf6ae2df46 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigDefinition.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigDefinition.java @@ -1,16 +1,16 @@ -package org.jboss.shamrock.deployment.configuration; - -import static org.jboss.shamrock.deployment.steps.ConfigurationSetup.CONFIG_ROOT; -import static org.jboss.shamrock.deployment.steps.ConfigurationSetup.CONFIG_ROOT_FIELD; -import static org.jboss.shamrock.deployment.util.ReflectUtil.rawTypeOf; -import static org.jboss.shamrock.deployment.util.ReflectUtil.rawTypeOfParameter; -import static org.jboss.shamrock.deployment.util.ReflectUtil.typeOfParameter; -import static org.jboss.shamrock.deployment.util.StringUtil.camelHumpsIterator; -import static org.jboss.shamrock.deployment.util.StringUtil.hyphenate; -import static org.jboss.shamrock.deployment.util.StringUtil.join; -import static org.jboss.shamrock.deployment.util.StringUtil.lowerCase; -import static org.jboss.shamrock.deployment.util.StringUtil.lowerCaseFirst; -import static org.jboss.shamrock.deployment.util.StringUtil.withoutSuffix; +package io.quarkus.deployment.configuration; + +import static io.quarkus.deployment.steps.ConfigurationSetup.CONFIG_ROOT; +import static io.quarkus.deployment.steps.ConfigurationSetup.CONFIG_ROOT_FIELD; +import static io.quarkus.deployment.util.ReflectUtil.rawTypeOf; +import static io.quarkus.deployment.util.ReflectUtil.rawTypeOfParameter; +import static io.quarkus.deployment.util.ReflectUtil.typeOfParameter; +import static io.quarkus.deployment.util.StringUtil.camelHumpsIterator; +import static io.quarkus.deployment.util.StringUtil.hyphenate; +import static io.quarkus.deployment.util.StringUtil.join; +import static io.quarkus.deployment.util.StringUtil.lowerCase; +import static io.quarkus.deployment.util.StringUtil.lowerCaseFirst; +import static io.quarkus.deployment.util.StringUtil.withoutSuffix; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; @@ -36,12 +36,12 @@ import org.jboss.protean.gizmo.MethodCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.annotations.ConfigGroup; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.configuration.NameIterator; import org.objectweb.asm.Opcodes; import org.wildfly.common.Assert; @@ -297,7 +297,7 @@ public void loadConfiguration(SmallRyeConfig config) { initialize(config); for (String propertyName : config.getPropertyNames()) { final NameIterator name = new NameIterator(propertyName); - if (name.hasNext() && name.nextSegmentEquals("shamrock")) { + if (name.hasNext() && name.nextSegmentEquals("quarkus")) { name.next(); final LeafConfigType leafType = leafPatterns.match(name); if (leafType != null) { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigPatternMap.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigPatternMap.java index 322e582b69ce9..3747cb59a0b98 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigPatternMap.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigPatternMap.java @@ -1,11 +1,11 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Objects; import java.util.TreeMap; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.runtime.configuration.NameIterator; import org.wildfly.common.Assert; /** diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigType.java index 1496a12583c6d..0d993dfc6635e 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Field; import java.util.Collection; @@ -9,8 +9,8 @@ import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.configuration.NameIterator; /** */ diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigurationError.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigurationError.java index c97653b7abbd8..c637bfa20e8ac 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigurationError.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ConfigurationError.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; public class ConfigurationError extends RuntimeException { public ConfigurationError(final String message) { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/DoubleConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/DoubleConfigType.java index bffaa71c10c94..0e05c080db1f1 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/DoubleConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/DoubleConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Field; import java.util.OptionalDouble; @@ -7,8 +7,8 @@ import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.configuration.NameIterator; import org.wildfly.common.Assert; /** diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/FloatConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/FloatConfigType.java index e1ca87f155e67..93aaff6d8a6ed 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/FloatConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/FloatConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Field; @@ -8,8 +8,8 @@ import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.configuration.NameIterator; import org.wildfly.common.Assert; /** diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/GroupConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/GroupConfigType.java index 4c82ef11dc1f2..2970b795b36e4 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/GroupConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/GroupConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -14,8 +14,8 @@ import org.jboss.protean.gizmo.FieldDescriptor; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.configuration.NameIterator; import org.wildfly.common.Assert; /** diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/IntConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/IntConfigType.java index 2b238e6716c85..5707442756564 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/IntConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/IntConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Field; import java.util.OptionalInt; @@ -7,8 +7,8 @@ import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.configuration.NameIterator; import org.wildfly.common.Assert; /** diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/LeafConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/LeafConfigType.java index 36fec05b10ac7..00ad00faa726b 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/LeafConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/LeafConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Field; @@ -6,7 +6,7 @@ import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.runtime.configuration.NameIterator; import org.wildfly.common.annotation.NotNull; /** diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/LongConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/LongConfigType.java index 77fe3bfbb23e6..a9726ea58e8ea 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/LongConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/LongConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Field; import java.util.OptionalLong; @@ -7,8 +7,8 @@ import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.configuration.NameIterator; import org.wildfly.common.Assert; /** diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/MapConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/MapConfigType.java index 15b237a85dc90..0d3555ba5220f 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/MapConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/MapConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Field; import java.util.Map; @@ -9,8 +9,8 @@ import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.configuration.NameIterator; import org.wildfly.common.Assert; /** diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ObjectConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ObjectConfigType.java index 5447cf572ade6..c4efd3d2842ab 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ObjectConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ObjectConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Field; @@ -6,8 +6,8 @@ import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.configuration.NameIterator; /** */ diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ObjectListConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ObjectListConfigType.java index e7c1d9b84b0c7..e20a6e94d3a55 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ObjectListConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/ObjectListConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Field; import java.util.Collection; @@ -10,10 +10,10 @@ import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.configuration.ArrayListFactory; -import org.jboss.shamrock.runtime.configuration.ConfigUtils; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.configuration.ArrayListFactory; +import io.quarkus.runtime.configuration.ConfigUtils; +import io.quarkus.runtime.configuration.NameIterator; /** */ diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/OptionalObjectConfigType.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/OptionalObjectConfigType.java index aa48d988b084a..4fb5a9de2125e 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/OptionalObjectConfigType.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/OptionalObjectConfigType.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; import java.lang.reflect.Field; import java.util.Optional; @@ -7,8 +7,8 @@ import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.runtime.configuration.NameIterator; /** */ diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/PropertiesUtil.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/PropertiesUtil.java index 7c2b0e62679cc..66b521ce94d22 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/PropertiesUtil.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/configuration/PropertiesUtil.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.configuration; +package io.quarkus.deployment.configuration; public class PropertiesUtil { private PropertiesUtil() {} diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/devmode/HotReplacementContext.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/devmode/HotReplacementContext.java index 52a3f14c01b56..286f649d4628d 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/devmode/HotReplacementContext.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/devmode/HotReplacementContext.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.devmode; +package io.quarkus.deployment.devmode; import java.nio.file.Path; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/devmode/HotReplacementSetup.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/devmode/HotReplacementSetup.java index 047e02f9dce75..d31be0d921d2e 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/devmode/HotReplacementSetup.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/devmode/HotReplacementSetup.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.devmode; +package io.quarkus.deployment.devmode; /** * Service interface that is used to abstract away the details of how hot deployment is performed diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ApplicationArchiveBuildStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ApplicationArchiveBuildStep.java index 64e643f89ab7a..0a1c1e6358eaa 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ApplicationArchiveBuildStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ApplicationArchiveBuildStep.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.index; +package io.quarkus.deployment.index; import java.io.FileInputStream; import java.io.IOException; @@ -45,16 +45,16 @@ import org.jboss.jandex.IndexView; import org.jboss.jandex.Indexer; import org.jboss.logging.Logger; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.ApplicationArchive; -import org.jboss.shamrock.deployment.ApplicationArchiveImpl; -import org.jboss.shamrock.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem; -import org.jboss.shamrock.deployment.builditem.ApplicationArchivesBuildItem; -import org.jboss.shamrock.deployment.builditem.ApplicationIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.ArchiveRootBuildItem; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.ApplicationArchive; +import io.quarkus.deployment.ApplicationArchiveImpl; +import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem; +import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem; +import io.quarkus.deployment.builditem.ApplicationIndexBuildItem; +import io.quarkus.deployment.builditem.ArchiveRootBuildItem; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; public class ApplicationArchiveBuildStep { @@ -68,7 +68,7 @@ public class ApplicationArchiveBuildStep { static final class IndexDependencyConfiguration { /** * Artifacts on the class path that should also be indexed, which will allow classes in the index to be - * processed by shamrocks processors + * processed by quarkuss processors */ @ConfigItem(name = ConfigItem.PARENT) Map indexDependency; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ArtifactIndex.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ArtifactIndex.java index 9f119b1a881d5..b69f0be826c05 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ArtifactIndex.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ArtifactIndex.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.index; +package io.quarkus.deployment.index; import java.nio.file.Path; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ArtifactResolver.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ArtifactResolver.java index c91bde47a28b5..61b34498d34d1 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ArtifactResolver.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ArtifactResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.index; +package io.quarkus.deployment.index; /** * Resolves maven artifacts for indexing. diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ClassPathArtifactResolver.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ClassPathArtifactResolver.java index dcfe3e32c0642..7019f73feaa14 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ClassPathArtifactResolver.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ClassPathArtifactResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.index; +package io.quarkus.deployment.index; import java.io.IOException; import java.net.URI; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/IndexDependencyConfig.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/IndexDependencyConfig.java index cc296fb1967f0..347a95bec1e0f 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/IndexDependencyConfig.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/IndexDependencyConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.index; +package io.quarkus.deployment.index; -import org.jboss.shamrock.runtime.annotations.ConfigGroup; -import org.jboss.shamrock.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; @ConfigGroup public class IndexDependencyConfig { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/IndexingUtil.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/IndexingUtil.java index eaa1186172a6a..620a9d1b97638 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/IndexingUtil.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/IndexingUtil.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.index; +package io.quarkus.deployment.index; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -10,21 +10,21 @@ import org.jboss.jandex.IndexView; import org.jboss.jandex.Indexer; import org.jboss.logging.Logger; -import org.jboss.shamrock.deployment.util.IoUtil; +import io.quarkus.deployment.util.IoUtil; public class IndexingUtil { - private static final Logger log = Logger.getLogger("org.jboss.shamrock.deployment.index"); + private static final Logger log = Logger.getLogger("io.quarkus.deployment.index"); public static final DotName OBJECT = DotName.createSimple(Object.class.getName()); - public static void indexClass(String beanClass, Indexer indexer, IndexView shamrockIndex, + public static void indexClass(String beanClass, Indexer indexer, IndexView quarkusIndex, Set additionalIndex, ClassLoader classLoader) { DotName beanClassName = DotName.createSimple(beanClass); if (additionalIndex.contains(beanClassName)) { return; } - ClassInfo beanInfo = shamrockIndex.getClassByName(beanClassName); + ClassInfo beanInfo = quarkusIndex.getClassByName(beanClassName); if (beanInfo == null) { log.debugf("Index bean class: %s", beanClass); try (InputStream stream = IoUtil.readClass(classLoader, beanClass)) { @@ -34,11 +34,11 @@ public static void indexClass(String beanClass, Indexer indexer, IndexView shamr throw new IllegalStateException("Failed to index: " + beanClass, e); } } else { - // The class could be indexed by shamrock - we still need to distinguish framework classes + // The class could be indexed by quarkus - we still need to distinguish framework classes additionalIndex.add(beanClassName); } for (DotName annotationName : beanInfo.annotations().keySet()) { - if (!additionalIndex.contains(annotationName) && shamrockIndex.getClassByName(annotationName) == null) { + if (!additionalIndex.contains(annotationName) && quarkusIndex.getClassByName(annotationName) == null) { try (InputStream annotationStream = IoUtil.readClass(classLoader, annotationName.toString())) { log.debugf("Index annotation: %s", annotationName); indexer.index(annotationStream); @@ -49,18 +49,18 @@ public static void indexClass(String beanClass, Indexer indexer, IndexView shamr } } if (!beanInfo.superName().equals(OBJECT)) { - indexClass(beanInfo.superName().toString(), indexer, shamrockIndex, additionalIndex, classLoader); + indexClass(beanInfo.superName().toString(), indexer, quarkusIndex, additionalIndex, classLoader); } } public static void indexClass(String beanClass, Indexer indexer, - IndexView shamrockIndex, Set additionalIndex, + IndexView quarkusIndex, Set additionalIndex, ClassLoader classLoader, byte[] beanData) { DotName beanClassName = DotName.createSimple(beanClass); if (additionalIndex.contains(beanClassName)) { return; } - ClassInfo beanInfo = shamrockIndex.getClassByName(beanClassName); + ClassInfo beanInfo = quarkusIndex.getClassByName(beanClassName); if (beanInfo == null) { log.debugf("Index bean class: %s", beanClass); try (InputStream stream = new ByteArrayInputStream(beanData)) { @@ -70,11 +70,11 @@ public static void indexClass(String beanClass, Indexer indexer, throw new IllegalStateException("Failed to index: " + beanClass, e); } } else { - // The class could be indexed by shamrock - we still need to distinguish framework classes + // The class could be indexed by quarkus - we still need to distinguish framework classes additionalIndex.add(beanClassName); } for (DotName annotationName : beanInfo.annotations().keySet()) { - if (!additionalIndex.contains(annotationName) && shamrockIndex.getClassByName(annotationName) == null) { + if (!additionalIndex.contains(annotationName) && quarkusIndex.getClassByName(annotationName) == null) { try (InputStream annotationStream = IoUtil.readClass(classLoader, annotationName.toString())) { log.debugf("Index annotation: %s", annotationName); indexer.index(annotationStream); diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/MapArtifactResolver.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/MapArtifactResolver.java index 9bcc3d552d488..b6cb2aa4a20b5 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/MapArtifactResolver.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/MapArtifactResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.index; +package io.quarkus.deployment.index; import java.util.HashMap; import java.util.List; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ResolvedArtifact.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ResolvedArtifact.java index d390ccfd520a3..30cc674fa8923 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ResolvedArtifact.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/index/ResolvedArtifact.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.index; +package io.quarkus.deployment.index; import java.nio.file.Path; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/logging/LogCleanupFilterBuildItem.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/logging/LogCleanupFilterBuildItem.java index 42545b914d6dc..43f08789bf608 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/logging/LogCleanupFilterBuildItem.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/logging/LogCleanupFilterBuildItem.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.deployment.logging; +package io.quarkus.deployment.logging; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.runtime.logging.LogCleanupFilterElement; +import io.quarkus.runtime.logging.LogCleanupFilterElement; /** * Declare that a log filter should be applied to the specified loggerName, diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/logging/LoggingResourceProcessor.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/logging/LoggingResourceProcessor.java index 519ede6eeb909..77f6722b78455 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/logging/LoggingResourceProcessor.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/logging/LoggingResourceProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.logging; +package io.quarkus.deployment.logging; import java.nio.charset.StandardCharsets; import java.util.List; @@ -23,22 +23,22 @@ import java.util.stream.Collectors; import org.jboss.logmanager.EmbeddedConfigurator; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.ConfigurationCustomConverterBuildItem; -import org.jboss.shamrock.deployment.builditem.GeneratedResourceBuildItem; -import org.jboss.shamrock.deployment.builditem.LogCategoryBuildItem; -import org.jboss.shamrock.deployment.builditem.RunTimeConfigurationDefaultBuildItem; -import org.jboss.shamrock.deployment.builditem.SystemPropertyBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ServiceProviderBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateSystemPropertyBuildItem; -import org.jboss.shamrock.runtime.logging.InitialConfigurator; -import org.jboss.shamrock.runtime.logging.LevelConverter; -import org.jboss.shamrock.runtime.logging.LogConfig; -import org.jboss.shamrock.runtime.logging.LoggingSetupTemplate; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.ConfigurationCustomConverterBuildItem; +import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; +import io.quarkus.deployment.builditem.LogCategoryBuildItem; +import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem; +import io.quarkus.deployment.builditem.SystemPropertyBuildItem; +import io.quarkus.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; +import io.quarkus.deployment.builditem.substrate.ServiceProviderBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateSystemPropertyBuildItem; +import io.quarkus.runtime.logging.InitialConfigurator; +import io.quarkus.runtime.logging.LevelConverter; +import io.quarkus.runtime.logging.LogConfig; +import io.quarkus.runtime.logging.LoggingSetupTemplate; /** */ @@ -59,7 +59,7 @@ void setUpDefaultLevels(List categories, Consumer logCleanupFil for (LogCleanupFilterBuildItem logCleanupFilter : logCleanupFilters) { configOutput.accept( new RunTimeConfigurationDefaultBuildItem( - "shamrock.log.filters.\"" + logCleanupFilter.getFilterElement().getLoggerName() + "\".if-starts-with", + "quarkus.log.filters.\"" + logCleanupFilter.getFilterElement().getLoggerName() + "\".if-starts-with", logCleanupFilter.getFilterElement().getMessageStart() ) ); diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/AnnotationProxyBuildStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/AnnotationProxyBuildStep.java index 652cb7452478a..d83adaa9f06b0 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/AnnotationProxyBuildStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/AnnotationProxyBuildStep.java @@ -1,11 +1,11 @@ -package org.jboss.shamrock.deployment.recording; +package io.quarkus.deployment.recording; import org.jboss.protean.gizmo.ClassOutput; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.AnnotationProxyBuildItem; -import org.jboss.shamrock.deployment.builditem.ApplicationIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.GeneratedClassBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.AnnotationProxyBuildItem; +import io.quarkus.deployment.builditem.ApplicationIndexBuildItem; +import io.quarkus.deployment.builditem.GeneratedClassBuildItem; public class AnnotationProxyBuildStep { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/AnnotationProxyProvider.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/AnnotationProxyProvider.java index a323ed1b9a63c..161741104951b 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/AnnotationProxyProvider.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/AnnotationProxyProvider.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.recording; +package io.quarkus.deployment.recording; import static org.objectweb.asm.Opcodes.ACC_FINAL; import static org.objectweb.asm.Opcodes.ACC_PRIVATE; @@ -30,7 +30,7 @@ import org.jboss.protean.gizmo.FieldDescriptor; import org.jboss.protean.gizmo.MethodCreator; import org.jboss.protean.gizmo.MethodDescriptor; -import org.jboss.shamrock.deployment.util.IoUtil; +import io.quarkus.deployment.util.IoUtil; public class AnnotationProxyProvider { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/BytecodeRecorderImpl.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/BytecodeRecorderImpl.java index ed335f07e1f00..7d7a862716f23 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/BytecodeRecorderImpl.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/BytecodeRecorderImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.recording; +package io.quarkus.deployment.recording; import static org.jboss.protean.gizmo.MethodDescriptor.ofConstructor; import static org.jboss.protean.gizmo.MethodDescriptor.ofMethod; @@ -59,12 +59,12 @@ import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; import org.jboss.protean.gizmo.TryBlock; -import org.jboss.shamrock.deployment.ClassOutput; -import org.jboss.shamrock.deployment.recording.AnnotationProxyProvider.AnnotationProxy; -import org.jboss.shamrock.runtime.ObjectSubstitution; -import org.jboss.shamrock.runtime.RuntimeValue; -import org.jboss.shamrock.runtime.StartupContext; -import org.jboss.shamrock.runtime.StartupTask; +import io.quarkus.deployment.ClassOutput; +import io.quarkus.deployment.recording.AnnotationProxyProvider.AnnotationProxy; +import io.quarkus.runtime.ObjectSubstitution; +import io.quarkus.runtime.RuntimeValue; +import io.quarkus.runtime.StartupContext; +import io.quarkus.runtime.StartupTask; import org.wildfly.common.Assert; /** @@ -91,7 +91,7 @@ public class BytecodeRecorderImpl implements RecorderContext { private static final AtomicInteger COUNT = new AtomicInteger(); private static final AtomicInteger OUTPUT_COUNT = new AtomicInteger(); - private static final String BASE_PACKAGE = "org.jboss.shamrock.deployment.steps."; + private static final String BASE_PACKAGE = "io.quarkus.deployment.steps."; private static final String PROXY_KEY = "proxykey"; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/ObjectLoader.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/ObjectLoader.java index ed8162d895fc3..ba6d588201129 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/ObjectLoader.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/ObjectLoader.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.recording; +package io.quarkus.deployment.recording; import org.jboss.protean.gizmo.BytecodeCreator; import org.jboss.protean.gizmo.ResultHandle; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/RecorderContext.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/RecorderContext.java index bf1a3ad27a341..489e5e735b7ce 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/RecorderContext.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/recording/RecorderContext.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.recording; +package io.quarkus.deployment.recording; import java.lang.reflect.Constructor; import java.util.List; import java.util.function.Function; -import org.jboss.shamrock.runtime.ObjectSubstitution; -import org.jboss.shamrock.runtime.RuntimeValue; +import io.quarkus.runtime.ObjectSubstitution; +import io.quarkus.runtime.RuntimeValue; /** * An injectable utility class that contains methods that can be needed for dealing with templates diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ApplicationIndexBuildStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ApplicationIndexBuildStep.java index 5630de8016171..3f2daaceb35d7 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ApplicationIndexBuildStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ApplicationIndexBuildStep.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; import java.io.IOException; import java.io.InputStream; @@ -26,9 +26,9 @@ import org.jboss.jandex.Index; import org.jboss.jandex.Indexer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.ApplicationIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.ArchiveRootBuildItem; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.ApplicationIndexBuildItem; +import io.quarkus.deployment.builditem.ArchiveRootBuildItem; public class ApplicationIndexBuildStep { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/CapabilityAggregationStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/CapabilityAggregationStep.java index a1465d73c5c34..f42149ccb940a 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/CapabilityAggregationStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/CapabilityAggregationStep.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; import java.util.HashSet; import java.util.List; @@ -22,10 +22,10 @@ import javax.inject.Inject; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.Capabilities; -import org.jboss.shamrock.deployment.builditem.CapabilityBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.Capabilities; +import io.quarkus.deployment.builditem.CapabilityBuildItem; public class CapabilityAggregationStep { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/CombinedIndexBuildStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/CombinedIndexBuildStep.java index 06e322016fcc0..89be08e6daec0 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/CombinedIndexBuildStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/CombinedIndexBuildStep.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; import java.util.ArrayList; import java.util.List; import org.jboss.jandex.CompositeIndex; import org.jboss.jandex.IndexView; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.ApplicationArchive; -import org.jboss.shamrock.deployment.builditem.ApplicationArchivesBuildItem; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.ApplicationArchive; +import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; public class CombinedIndexBuildStep { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ConfigurationSetup.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ConfigurationSetup.java index 2a78b78c5472a..2fe2aab100fae 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ConfigurationSetup.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ConfigurationSetup.java @@ -1,6 +1,6 @@ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; -import static org.jboss.shamrock.deployment.util.ReflectUtil.toError; +import static io.quarkus.deployment.util.ReflectUtil.toError; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -40,33 +40,33 @@ import org.jboss.protean.gizmo.MethodCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.deployment.AccessorFinder; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.BytecodeRecorderObjectLoaderBuildItem; -import org.jboss.shamrock.deployment.builditem.ConfigurationBuildItem; -import org.jboss.shamrock.deployment.builditem.ConfigurationCustomConverterBuildItem; -import org.jboss.shamrock.deployment.builditem.ExtensionClassLoaderBuildItem; -import org.jboss.shamrock.deployment.builditem.GeneratedClassBuildItem; -import org.jboss.shamrock.deployment.builditem.GeneratedResourceBuildItem; -import org.jboss.shamrock.deployment.builditem.RunTimeConfigurationDefaultBuildItem; -import org.jboss.shamrock.deployment.builditem.RunTimeConfigurationSourceBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.RuntimeReinitializedClassBuildItem; -import org.jboss.shamrock.deployment.configuration.ConfigDefinition; -import org.jboss.shamrock.deployment.configuration.ConfigPatternMap; -import org.jboss.shamrock.deployment.configuration.LeafConfigType; -import org.jboss.shamrock.deployment.recording.ObjectLoader; -import org.jboss.shamrock.deployment.util.ServiceUtil; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.configuration.CidrAddressConverter; -import org.jboss.shamrock.runtime.configuration.ConverterFactory; -import org.jboss.shamrock.runtime.configuration.DefaultConfigSource; -import org.jboss.shamrock.runtime.configuration.ExpandingConfigSource; -import org.jboss.shamrock.runtime.configuration.InetAddressConverter; -import org.jboss.shamrock.runtime.configuration.InetSocketAddressConverter; -import org.jboss.shamrock.runtime.configuration.NameIterator; -import org.jboss.shamrock.runtime.configuration.RegexConverter; -import org.jboss.shamrock.runtime.configuration.SimpleConfigurationProviderResolver; +import io.quarkus.deployment.AccessorFinder; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.BytecodeRecorderObjectLoaderBuildItem; +import io.quarkus.deployment.builditem.ConfigurationBuildItem; +import io.quarkus.deployment.builditem.ConfigurationCustomConverterBuildItem; +import io.quarkus.deployment.builditem.ExtensionClassLoaderBuildItem; +import io.quarkus.deployment.builditem.GeneratedClassBuildItem; +import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; +import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem; +import io.quarkus.deployment.builditem.RunTimeConfigurationSourceBuildItem; +import io.quarkus.deployment.builditem.substrate.RuntimeReinitializedClassBuildItem; +import io.quarkus.deployment.configuration.ConfigDefinition; +import io.quarkus.deployment.configuration.ConfigPatternMap; +import io.quarkus.deployment.configuration.LeafConfigType; +import io.quarkus.deployment.recording.ObjectLoader; +import io.quarkus.deployment.util.ServiceUtil; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.configuration.CidrAddressConverter; +import io.quarkus.runtime.configuration.ConverterFactory; +import io.quarkus.runtime.configuration.DefaultConfigSource; +import io.quarkus.runtime.configuration.ExpandingConfigSource; +import io.quarkus.runtime.configuration.InetAddressConverter; +import io.quarkus.runtime.configuration.InetSocketAddressConverter; +import io.quarkus.runtime.configuration.NameIterator; +import io.quarkus.runtime.configuration.RegexConverter; +import io.quarkus.runtime.configuration.SimpleConfigurationProviderResolver; import org.objectweb.asm.Opcodes; import org.wildfly.common.net.CidrAddress; @@ -75,11 +75,11 @@ */ public class ConfigurationSetup { - private static final Logger log = Logger.getLogger("org.jboss.shamrock.configuration"); + private static final Logger log = Logger.getLogger("io.quarkus.configuration"); - public static final String CONFIG_HELPER = "org.jboss.shamrock.runtime.generated.ConfigHelper"; - public static final String CONFIG_HELPER_DATA = "org.jboss.shamrock.runtime.generated.ConfigHelperData"; - public static final String CONFIG_ROOT = "org.jboss.shamrock.runtime.generated.ConfigRoot"; + public static final String CONFIG_HELPER = "io.quarkus.runtime.generated.ConfigHelper"; + public static final String CONFIG_HELPER_DATA = "io.quarkus.runtime.generated.ConfigHelperData"; + public static final String CONFIG_ROOT = "io.quarkus.runtime.generated.ConfigRoot"; public static final FieldDescriptor CONFIG_ROOT_FIELD = FieldDescriptor.of(CONFIG_HELPER_DATA, "configRoot", CONFIG_ROOT); @@ -151,7 +151,7 @@ public ConfigurationBuildItem initializeConfiguration( final SmallRyeConfig src = (SmallRyeConfig) builder.build(); final ConfigDefinition configDefinition = new ConfigDefinition(); // populate it with all known types - for (Class clazz : ServiceUtil.classesNamedIn(extensionClassLoaderBuildItem.getExtensionClassLoader(), "META-INF/shamrock-config-roots.list")) { + for (Class clazz : ServiceUtil.classesNamedIn(extensionClassLoaderBuildItem.getExtensionClassLoader(), "META-INF/quarkus-config-roots.list")) { configDefinition.registerConfigRoot(clazz); } SmallRyeConfigProviderResolver.instance().registerConfig(src, Thread.currentThread().getContextClassLoader()); @@ -414,9 +414,9 @@ private void writeParsing(final ClassCreator cc, final BytecodeCreator body, fin final ResultHandle keyIter = hasNext.newInstance(MethodDescriptor.ofConstructor(NameIterator.class, String.class), key); // if (! keyIter.hasNext()) continue loop; hasNext.ifNonZero(hasNext.invokeVirtualMethod(NI_HAS_NEXT, keyIter)).falseBranch().continueScope(loop); - // if (! keyIter.nextSegmentEquals("shamrock")) continue loop; - hasNext.ifNonZero(hasNext.invokeVirtualMethod(NI_NEXT_EQUALS, keyIter, hasNext.load("shamrock"))).falseBranch().continueScope(loop); - // keyIter.next(); // skip "shamrock" + // if (! keyIter.nextSegmentEquals("quarkus")) continue loop; + hasNext.ifNonZero(hasNext.invokeVirtualMethod(NI_NEXT_EQUALS, keyIter, hasNext.load("quarkus"))).falseBranch().continueScope(loop); + // keyIter.next(); // skip "quarkus" hasNext.invokeVirtualMethod(NI_NEXT, keyIter); // parse(config, keyIter); hasNext.invokeStaticMethod(generateParserBody(cc, keyMap, new StringBuilder("parseKey"), new HashMap<>()), config, keyIter); diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/DevModeBuildStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/DevModeBuildStep.java index bcd046579f468..63d466eca078c 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/DevModeBuildStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/DevModeBuildStep.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.HotDeploymentConfigFileBuildItem; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.HotDeploymentConfigFileBuildItem; class DevModeBuildStep { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/MainClassBuildStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/MainClassBuildStep.java index 6241a36682876..73d0ccee44105 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/MainClassBuildStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/MainClassBuildStep.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; import static org.jboss.protean.gizmo.MethodDescriptor.ofConstructor; import static org.jboss.protean.gizmo.MethodDescriptor.ofMethod; @@ -33,29 +33,29 @@ import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; import org.jboss.protean.gizmo.TryBlock; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.ClassOutput; -import org.jboss.shamrock.deployment.builditem.ApplicationClassNameBuildItem; -import org.jboss.shamrock.deployment.builditem.BytecodeRecorderObjectLoaderBuildItem; -import org.jboss.shamrock.deployment.builditem.ClassOutputBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.HttpServerBuildItem; -import org.jboss.shamrock.deployment.builditem.MainBytecodeRecorderBuildItem; -import org.jboss.shamrock.deployment.builditem.MainClassBuildItem; -import org.jboss.shamrock.deployment.builditem.ObjectSubstitutionBuildItem; -import org.jboss.shamrock.deployment.builditem.StaticBytecodeRecorderBuildItem; -import org.jboss.shamrock.deployment.builditem.SystemPropertyBuildItem; -import org.jboss.shamrock.deployment.recording.BytecodeRecorderImpl; -import org.jboss.shamrock.runtime.Application; -import org.jboss.shamrock.runtime.StartupContext; -import org.jboss.shamrock.runtime.StartupTask; -import org.jboss.shamrock.runtime.Timing; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.ClassOutput; +import io.quarkus.deployment.builditem.ApplicationClassNameBuildItem; +import io.quarkus.deployment.builditem.BytecodeRecorderObjectLoaderBuildItem; +import io.quarkus.deployment.builditem.ClassOutputBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.HttpServerBuildItem; +import io.quarkus.deployment.builditem.MainBytecodeRecorderBuildItem; +import io.quarkus.deployment.builditem.MainClassBuildItem; +import io.quarkus.deployment.builditem.ObjectSubstitutionBuildItem; +import io.quarkus.deployment.builditem.StaticBytecodeRecorderBuildItem; +import io.quarkus.deployment.builditem.SystemPropertyBuildItem; +import io.quarkus.deployment.recording.BytecodeRecorderImpl; +import io.quarkus.runtime.Application; +import io.quarkus.runtime.StartupContext; +import io.quarkus.runtime.StartupTask; +import io.quarkus.runtime.Timing; class MainClassBuildStep { - private static final String APP_CLASS = "org.jboss.shamrock.runner.ApplicationImpl"; - private static final String MAIN_CLASS = "org.jboss.shamrock.runner.GeneratedMain"; + private static final String APP_CLASS = "io.quarkus.runner.ApplicationImpl"; + private static final String MAIN_CLASS = "io.quarkus.runner.GeneratedMain"; private static final String STARTUP_CONTEXT = "STARTUP_CONTEXT"; private static final AtomicInteger COUNT = new AtomicInteger(); @@ -115,7 +115,7 @@ MainClassBuildItem build(List staticInitTasks, CatchBlockCreator cb = tryBlock.addCatch(Throwable.class); cb.invokeVirtualMethod(ofMethod(StartupContext.class, "close", void.class), startupContext); - cb.throwException(RuntimeException.class, "Failed to start shamrock", cb.getCaughtException()); + cb.throwException(RuntimeException.class, "Failed to start quarkus", cb.getCaughtException()); // Application class: start method @@ -156,7 +156,7 @@ MainClassBuildItem build(List staticInitTasks, cb = tryBlock.addCatch(Throwable.class); cb.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), cb.getCaughtException()); cb.invokeVirtualMethod(ofMethod(StartupContext.class, "close", void.class), startupContext); - cb.throwException(RuntimeException.class, "Failed to start shamrock", cb.getCaughtException()); + cb.throwException(RuntimeException.class, "Failed to start quarkus", cb.getCaughtException()); mv.returnValue(null); // Application class: stop method diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ReflectiveHierarchyStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ReflectiveHierarchyStep.java index d48ddc55f9258..2f56d33261674 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ReflectiveHierarchyStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ReflectiveHierarchyStep.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; import java.util.HashSet; import java.util.List; @@ -32,13 +32,13 @@ import org.jboss.jandex.UnresolvedTypeVariable; import org.jboss.jandex.VoidType; import org.jboss.logging.Logger; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.BuildProducer; import javax.inject.Inject; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveHierarchyBuildItem; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveHierarchyBuildItem; public class ReflectiveHierarchyStep { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/RegisterForReflectionBuildStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/RegisterForReflectionBuildStep.java index a28db78b6291c..4608cbb467041 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/RegisterForReflectionBuildStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/RegisterForReflectionBuildStep.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; import javax.inject.Inject; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; -import org.jboss.shamrock.runtime.annotations.RegisterForReflection; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; +import io.quarkus.runtime.annotations.RegisterForReflection; public class RegisterForReflectionBuildStep { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/StaticInitDebugStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/StaticInitDebugStep.java index bcfb145555453..d2d0084a9dd98 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/StaticInitDebugStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/StaticInitDebugStep.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; import java.util.ArrayList; import java.util.List; import java.util.function.BiFunction; import org.graalvm.nativeimage.ImageInfo; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.BytecodeTransformerBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem; +import io.quarkus.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateAutoFeatureStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateAutoFeatureStep.java index 30d29b97e4727..0151a579f6169 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateAutoFeatureStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateAutoFeatureStep.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; import static org.jboss.protean.gizmo.MethodDescriptor.ofMethod; @@ -37,15 +37,15 @@ import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; import org.jboss.protean.gizmo.TryBlock; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.ClassOutput; -import org.jboss.shamrock.deployment.builditem.ClassOutputBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.*; -import org.jboss.shamrock.runtime.ResourceHelper; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.ClassOutput; +import io.quarkus.deployment.builditem.ClassOutputBuildItem; +import io.quarkus.deployment.builditem.substrate.*; +import io.quarkus.runtime.ResourceHelper; public class SubstrateAutoFeatureStep { - private static final String GRAAL_AUTOFEATURE = "org/jboss/shamrock/runner/AutoFeature"; + private static final String GRAAL_AUTOFEATURE = "io.quarkus/runner/AutoFeature"; @BuildStep SubstrateOutputBuildItem generateFeature(ClassOutputBuildItem output, @@ -245,7 +245,7 @@ SubstrateOutputBuildItem generateFeature(ClassOutputBuildItem output, print.invokeVirtualMethod(ofMethod(Throwable.class, "printStackTrace", void.class), print.getCaughtException()); - beforeAn.loadClass("org.jboss.shamrock.runner.ApplicationImpl"); + beforeAn.loadClass("io.quarkus.runner.ApplicationImpl"); beforeAn.returnValue(null); file.close(); diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateConfigBuildStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateConfigBuildStep.java index c5845a40d036f..39519f12ed1c0 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateConfigBuildStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateConfigBuildStep.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; import java.nio.file.Files; import java.nio.file.Path; @@ -25,17 +25,17 @@ import org.graalvm.nativeimage.ImageInfo; import org.jboss.logging.Logger; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.ExtensionSslNativeSupportBuildItem; -import org.jboss.shamrock.deployment.builditem.SslNativeConfigBuildItem; -import org.jboss.shamrock.deployment.builditem.SystemPropertyBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.RuntimeReinitializedClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateConfigBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateResourceBundleBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateSystemPropertyBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; +import io.quarkus.deployment.builditem.SslNativeConfigBuildItem; +import io.quarkus.deployment.builditem.SystemPropertyBuildItem; +import io.quarkus.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; +import io.quarkus.deployment.builditem.substrate.RuntimeReinitializedClassBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateConfigBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateResourceBundleBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateSystemPropertyBuildItem; //TODO: this should go away, once we decide on which one of the API's we want class SubstrateConfigBuildStep { @@ -103,7 +103,7 @@ void build(List substrateConfigBuildItems, } } - nativeImage.produce(new SubstrateSystemPropertyBuildItem("shamrock.ssl.native", sslNativeEnabled.toString())); + nativeImage.produce(new SubstrateSystemPropertyBuildItem("quarkus.ssl.native", sslNativeEnabled.toString())); } private Boolean isSslNativeEnabled(SslNativeConfigBuildItem sslNativeConfig, List extensionSslNativeSupport) { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateSystemPropertiesBuildStep.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateSystemPropertiesBuildStep.java index af38246e747aa..9fa27c4b60432 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateSystemPropertiesBuildStep.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateSystemPropertiesBuildStep.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; import java.io.File; import java.io.FileOutputStream; @@ -23,10 +23,10 @@ import java.util.List; import java.util.Properties; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.ArchiveRootBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateOutputBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateSystemPropertyBuildItem; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.ArchiveRootBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateOutputBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateSystemPropertyBuildItem; public class SubstrateSystemPropertiesBuildStep { diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ThreadPoolSetup.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ThreadPoolSetup.java index 2bb72f76cd5e4..6a2db44b3ae13 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ThreadPoolSetup.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/steps/ThreadPoolSetup.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.steps; +package io.quarkus.deployment.steps; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.ExecutorBuildItem; -import org.jboss.shamrock.deployment.builditem.ShutdownContextBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; -import org.jboss.shamrock.runtime.ExecutorTemplate; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.ExecutorBuildItem; +import io.quarkus.deployment.builditem.ShutdownContextBuildItem; +import io.quarkus.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; +import io.quarkus.runtime.ExecutorTemplate; /** */ diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/HashUtil.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/HashUtil.java index 3a432c8d6636e..8a150a3b64d9e 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/HashUtil.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/HashUtil.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.util; +package io.quarkus.deployment.util; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/IoUtil.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/IoUtil.java index 869057ae19c04..14815826459d5 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/IoUtil.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/IoUtil.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.util; +package io.quarkus.deployment.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/ReflectUtil.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/ReflectUtil.java index 8b332bb2f832e..b26872a1efb9d 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/ReflectUtil.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/ReflectUtil.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.util; +package io.quarkus.deployment.util; import java.lang.reflect.Array; import java.lang.reflect.Field; @@ -10,7 +10,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import org.jboss.shamrock.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildProducer; /** */ diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/ServiceUtil.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/ServiceUtil.java index e47b785893e29..35d579b27ab92 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/ServiceUtil.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/ServiceUtil.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.util; +package io.quarkus.deployment.util; import java.io.BufferedInputStream; import java.io.BufferedReader; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/StringUtil.java b/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/StringUtil.java index 2a3c335a325e9..9f47cde9065e2 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/StringUtil.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/deployment/util/StringUtil.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.util; +package io.quarkus.deployment.util; import java.util.Iterator; import java.util.Locale; diff --git a/core/deployment/src/main/java/org/jboss/shamrock/runner/RuntimeClassLoader.java b/core/deployment/src/main/java/org/jboss/shamrock/runner/RuntimeClassLoader.java index 081546cb31195..5d6755c44ccf3 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/runner/RuntimeClassLoader.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/runner/RuntimeClassLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runner; +package io.quarkus.runner; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -44,8 +44,8 @@ import java.util.function.BiFunction; import org.jboss.logging.Logger; -import org.jboss.shamrock.deployment.ClassOutput; -import org.jboss.shamrock.deployment.ShamrockClassWriter; +import io.quarkus.deployment.ClassOutput; +import io.quarkus.deployment.QuarkusClassWriter; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; @@ -90,7 +90,7 @@ public Enumeration getResources(String nm) throws IOException { // TODO: some superugly hack for bean provider byte[] data = resources.get(name); if (data != null) { - URL url = new URL(null, "shamrock:" + name + "/", new URLStreamHandler() { + URL url = new URL(null, "quarkus:" + name + "/", new URLStreamHandler() { @Override protected URLConnection openConnection(final URL u) throws IOException { return new URLConnection(u) { @@ -225,7 +225,7 @@ private byte[] handleTransform(String name, byte[] bytes) { ClassReader cr = new ClassReader(bytes); - ClassWriter writer = new ShamrockClassWriter(cr, ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); + ClassWriter writer = new QuarkusClassWriter(cr, ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); ClassVisitor visitor = writer; for (BiFunction i : transformers) { visitor = i.apply(name, visitor); @@ -275,7 +275,7 @@ public void writeClass(boolean applicationClass, String className, byte[] data) String dotName = className.replace('/', '.'); appClasses.put(dotName, data); try { - File debugPath = new File("/tmp/shamrock-classes"); + File debugPath = new File("/tmp/quarkus-classes"); if (!debugPath.exists()) { debugPath.mkdir(); } diff --git a/core/deployment/src/main/java/org/jboss/shamrock/runner/RuntimeRunner.java b/core/deployment/src/main/java/org/jboss/shamrock/runner/RuntimeRunner.java index e4d28e102f3fd..3e6f503431b59 100644 --- a/core/deployment/src/main/java/org/jboss/shamrock/runner/RuntimeRunner.java +++ b/core/deployment/src/main/java/org/jboss/shamrock/runner/RuntimeRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runner; +package io.quarkus.runner; import java.io.Closeable; import java.io.IOException; @@ -29,15 +29,15 @@ import org.jboss.builder.BuildChainBuilder; import org.jboss.builder.BuildResult; -import org.jboss.shamrock.deployment.ShamrockAugmentor; -import org.jboss.shamrock.deployment.builditem.ApplicationClassNameBuildItem; -import org.jboss.shamrock.deployment.builditem.BytecodeTransformerBuildItem; -import org.jboss.shamrock.runtime.Application; -import org.jboss.shamrock.runtime.LaunchMode; +import io.quarkus.deployment.QuarkusAugmentor; +import io.quarkus.deployment.builditem.ApplicationClassNameBuildItem; +import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem; +import io.quarkus.runtime.Application; +import io.quarkus.runtime.LaunchMode; import org.objectweb.asm.ClassVisitor; /** - * Class that can be used to run shamrock directly, executing the build and runtime + * Class that can be used to run quarkus directly, executing the build and runtime * steps in the same JVM */ public class RuntimeRunner implements Runnable, Closeable { @@ -68,7 +68,7 @@ public void close() throws IOException { public void run() { Thread.currentThread().setContextClassLoader(loader); try { - ShamrockAugmentor.Builder builder = ShamrockAugmentor.builder(); + QuarkusAugmentor.Builder builder = QuarkusAugmentor.builder(); builder.setRoot(target); builder.setClassLoader(loader); builder.setOutput(loader); diff --git a/core/deployment/src/test/java/org/jboss/shamrock/deployment/index/ClassPathArtifactResolverTestCase.java b/core/deployment/src/test/java/org/jboss/shamrock/deployment/index/ClassPathArtifactResolverTestCase.java index f1273de305840..04b03a098fc56 100644 --- a/core/deployment/src/test/java/org/jboss/shamrock/deployment/index/ClassPathArtifactResolverTestCase.java +++ b/core/deployment/src/test/java/org/jboss/shamrock/deployment/index/ClassPathArtifactResolverTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.index; +package io.quarkus.deployment.index; import static org.junit.Assert.assertNotNull; diff --git a/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/BytecodeRecorderTestCase.java b/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/BytecodeRecorderTestCase.java index 6c2a778d368d7..a868d9eb72bd5 100644 --- a/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/BytecodeRecorderTestCase.java +++ b/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/BytecodeRecorderTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.recording; +package io.quarkus.deployment.recording; import java.io.IOException; import java.util.ArrayList; @@ -25,16 +25,16 @@ import java.util.function.Consumer; import org.jboss.protean.gizmo.TestClassLoader; -import org.jboss.shamrock.deployment.ClassOutput; -import org.jboss.shamrock.runtime.RuntimeValue; -import org.jboss.shamrock.runtime.StartupContext; -import org.jboss.shamrock.runtime.StartupTask; +import io.quarkus.deployment.ClassOutput; +import io.quarkus.runtime.RuntimeValue; +import io.quarkus.runtime.StartupContext; +import io.quarkus.runtime.StartupTask; import org.junit.Assert; import org.junit.Test; public class BytecodeRecorderTestCase { - private static final String TEST_CLASS = "com.shamrock.test.GenClass"; + private static final String TEST_CLASS = "com.quarkus.test.GenClass"; @Test public void testPrimitiveParams() throws Exception { diff --git a/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/NonSerializable.java b/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/NonSerializable.java index 51f5c85f1f634..dff7bd8a546af 100644 --- a/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/NonSerializable.java +++ b/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/NonSerializable.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.recording; +package io.quarkus.deployment.recording; import java.util.Objects; -import org.jboss.shamrock.runtime.ObjectSubstitution; +import io.quarkus.runtime.ObjectSubstitution; public class NonSerializable { diff --git a/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/TestJavaBean.java b/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/TestJavaBean.java index b71677c46424d..59c8b9b79f64f 100644 --- a/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/TestJavaBean.java +++ b/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/TestJavaBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.recording; +package io.quarkus.deployment.recording; import java.util.Objects; diff --git a/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/TestTemplate.java b/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/TestTemplate.java index 49bfb25505490..1b554399e57e4 100644 --- a/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/TestTemplate.java +++ b/core/deployment/src/test/java/org/jboss/shamrock/deployment/recording/TestTemplate.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jboss.shamrock.deployment.recording; +package io.quarkus.deployment.recording; import java.util.ArrayDeque; import java.util.List; import java.util.Map; import java.util.Set; -import org.jboss.shamrock.runtime.RuntimeValue; +import io.quarkus.runtime.RuntimeValue; public class TestTemplate { diff --git a/core/deployment/src/test/java/org/jboss/shamrock/deployment/util/HashUtilTest.java b/core/deployment/src/test/java/org/jboss/shamrock/deployment/util/HashUtilTest.java index 0c2fdfa8e5ee6..dfc7a486d85be 100644 --- a/core/deployment/src/test/java/org/jboss/shamrock/deployment/util/HashUtilTest.java +++ b/core/deployment/src/test/java/org/jboss/shamrock/deployment/util/HashUtilTest.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.deployment.util; +package io.quarkus.deployment.util; import static org.junit.Assert.assertEquals; diff --git a/core/deployment/src/test/java/org/jboss/shamrock/deployment/util/StringUtilTestCase.java b/core/deployment/src/test/java/org/jboss/shamrock/deployment/util/StringUtilTestCase.java index 937f3d933cd2f..826d08d91de4e 100644 --- a/core/deployment/src/test/java/org/jboss/shamrock/deployment/util/StringUtilTestCase.java +++ b/core/deployment/src/test/java/org/jboss/shamrock/deployment/util/StringUtilTestCase.java @@ -1,13 +1,13 @@ -package org.jboss.shamrock.deployment.util; +package io.quarkus.deployment.util; import org.junit.Assert; import org.junit.Test; -import static org.jboss.shamrock.deployment.util.StringUtil.camelHumpsIterator; -import static org.jboss.shamrock.deployment.util.StringUtil.join; -import static org.jboss.shamrock.deployment.util.StringUtil.lowerCase; -import static org.jboss.shamrock.deployment.util.StringUtil.lowerCaseFirst; -import static org.jboss.shamrock.deployment.util.StringUtil.withoutSuffix; +import static io.quarkus.deployment.util.StringUtil.camelHumpsIterator; +import static io.quarkus.deployment.util.StringUtil.join; +import static io.quarkus.deployment.util.StringUtil.lowerCase; +import static io.quarkus.deployment.util.StringUtil.lowerCaseFirst; +import static io.quarkus.deployment.util.StringUtil.withoutSuffix; /** * Tests of the {@linkplain StringUtil} methods diff --git a/core/devmode/pom.xml b/core/devmode/pom.xml index c442ed4f953f5..919d843e3cd4c 100644 --- a/core/devmode/pom.xml +++ b/core/devmode/pom.xml @@ -19,20 +19,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-development-mode - Shamrock - Development mode + quarkus-development-mode + Quarkus - Development mode - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment org.jboss.logmanager @@ -47,8 +47,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/core/devmode/src/main/java/org/jboss/shamrock/dev/ClassLoaderCompiler.java b/core/devmode/src/main/java/org/jboss/shamrock/dev/ClassLoaderCompiler.java index a0a06789c27e6..13f924ef2977d 100644 --- a/core/devmode/src/main/java/org/jboss/shamrock/dev/ClassLoaderCompiler.java +++ b/core/devmode/src/main/java/org/jboss/shamrock/dev/ClassLoaderCompiler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.dev; +package io.quarkus.dev; import java.io.BufferedReader; import java.io.File; diff --git a/core/devmode/src/main/java/org/jboss/shamrock/dev/CopyUtils.java b/core/devmode/src/main/java/org/jboss/shamrock/dev/CopyUtils.java index 3f9ca5a89a008..a4e0a47f012b9 100644 --- a/core/devmode/src/main/java/org/jboss/shamrock/dev/CopyUtils.java +++ b/core/devmode/src/main/java/org/jboss/shamrock/dev/CopyUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.dev; +package io.quarkus.dev; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/core/devmode/src/main/java/org/jboss/shamrock/dev/DevModeMain.java b/core/devmode/src/main/java/org/jboss/shamrock/dev/DevModeMain.java index 78f93a56cfa85..896dc0a6ffead 100644 --- a/core/devmode/src/main/java/org/jboss/shamrock/dev/DevModeMain.java +++ b/core/devmode/src/main/java/org/jboss/shamrock/dev/DevModeMain.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.dev; +package io.quarkus.dev; import java.io.Closeable; import java.io.File; @@ -23,9 +23,9 @@ import java.net.URLClassLoader; import org.eclipse.microprofile.config.Config; import org.jboss.logging.Logger; -import org.jboss.shamrock.runner.RuntimeRunner; -import org.jboss.shamrock.runtime.LaunchMode; -import org.jboss.shamrock.runtime.Timing; +import io.quarkus.runner.RuntimeRunner; +import io.quarkus.runtime.LaunchMode; +import io.quarkus.runtime.Timing; import io.smallrye.config.PropertiesConfigSource; import io.smallrye.config.SmallRyeConfigProviderResolver; @@ -101,7 +101,7 @@ public void run() { } } } - }, "Shamrock Shutdown Thread")); + }, "Quarkus Shutdown Thread")); } private static synchronized void doStart() { @@ -127,7 +127,7 @@ private static synchronized void doStart() { } } catch (Throwable t) { deploymentProblem = t; - log.error("Failed to start shamrock", t); + log.error("Failed to start quarkus", t); } } diff --git a/core/devmode/src/main/java/org/jboss/shamrock/dev/HotDeploymentConfigFileBuildStep.java b/core/devmode/src/main/java/org/jboss/shamrock/dev/HotDeploymentConfigFileBuildStep.java index 57e67f4b8b470..f2fdf8b13b308 100644 --- a/core/devmode/src/main/java/org/jboss/shamrock/dev/HotDeploymentConfigFileBuildStep.java +++ b/core/devmode/src/main/java/org/jboss/shamrock/dev/HotDeploymentConfigFileBuildStep.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jboss.shamrock.dev; +package io.quarkus.dev; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.HotDeploymentConfigFileBuildItem; -import org.jboss.shamrock.deployment.builditem.ServiceStartBuildItem; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.HotDeploymentConfigFileBuildItem; +import io.quarkus.deployment.builditem.ServiceStartBuildItem; public class HotDeploymentConfigFileBuildStep { diff --git a/core/devmode/src/main/java/org/jboss/shamrock/dev/RuntimeCompilationSetup.java b/core/devmode/src/main/java/org/jboss/shamrock/dev/RuntimeCompilationSetup.java index e24a284795d9d..1038bcee2477a 100644 --- a/core/devmode/src/main/java/org/jboss/shamrock/dev/RuntimeCompilationSetup.java +++ b/core/devmode/src/main/java/org/jboss/shamrock/dev/RuntimeCompilationSetup.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.dev; +package io.quarkus.dev; import java.io.File; import java.nio.file.Paths; @@ -22,16 +22,16 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.jboss.shamrock.deployment.devmode.HotReplacementSetup; +import io.quarkus.deployment.devmode.HotReplacementSetup; public class RuntimeCompilationSetup { private static Logger log = Logger.getLogger(RuntimeCompilationSetup.class.getName()); public static RuntimeUpdatesProcessor setup() throws Exception { - String classesDir = System.getProperty("shamrock.runner.classes"); - String sourcesDir = System.getProperty("shamrock.runner.sources"); - String resourcesDir = System.getProperty("shamrock.runner.resources"); + String classesDir = System.getProperty("quarkus.runner.classes"); + String sourcesDir = System.getProperty("quarkus.runner.sources"); + String resourcesDir = System.getProperty("quarkus.runner.resources"); if (classesDir != null) { ClassLoaderCompiler compiler = null; try { diff --git a/core/devmode/src/main/java/org/jboss/shamrock/dev/RuntimeUpdatesProcessor.java b/core/devmode/src/main/java/org/jboss/shamrock/dev/RuntimeUpdatesProcessor.java index c46754df5945f..6186e97fef66f 100644 --- a/core/devmode/src/main/java/org/jboss/shamrock/dev/RuntimeUpdatesProcessor.java +++ b/core/devmode/src/main/java/org/jboss/shamrock/dev/RuntimeUpdatesProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.dev; +package io.quarkus.dev; import java.io.File; import java.io.FileOutputStream; @@ -31,7 +31,7 @@ import java.util.stream.Stream; import org.jboss.logging.Logger; -import org.jboss.shamrock.deployment.devmode.HotReplacementContext; +import io.quarkus.deployment.devmode.HotReplacementContext; public class RuntimeUpdatesProcessor implements HotReplacementContext { diff --git a/core/pom.xml b/core/pom.xml index 1411abd8acd48..e2f89a7057230 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../build-parent/pom.xml 4.0.0 - shamrock-core-parent - Shamrock - Core + quarkus-core-parent + Quarkus - Core pom deployment diff --git a/core/processor/pom.xml b/core/processor/pom.xml index 92cf1b4251605..55e5b644bf518 100644 --- a/core/processor/pom.xml +++ b/core/processor/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - org.jboss.shamrock - shamrock-core-parent + io.quarkus + quarkus-core-parent 1.0.0.Alpha1-SNAPSHOT ../ - shamrock-extension-processor - Shamrock - Core - Extension Processor + quarkus-extension-processor + Quarkus - Core - Extension Processor diff --git a/core/processor/src/main/java/org/jboss/shamrock/annotation/processor/ExtensionAnnotationProcessor.java b/core/processor/src/main/java/org/jboss/shamrock/annotation/processor/ExtensionAnnotationProcessor.java index cce7541cfcef2..a0befad6ad637 100644 --- a/core/processor/src/main/java/org/jboss/shamrock/annotation/processor/ExtensionAnnotationProcessor.java +++ b/core/processor/src/main/java/org/jboss/shamrock/annotation/processor/ExtensionAnnotationProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.annotation.processor; +package io.quarkus.annotation.processor; import static javax.lang.model.util.ElementFilter.constructorsIn; import static javax.lang.model.util.ElementFilter.fieldsIn; @@ -81,11 +81,11 @@ public class ExtensionAnnotationProcessor extends AbstractProcessor { - private static final String ANNOTATION_BUILD_STEP = "org.jboss.shamrock.deployment.annotations.BuildStep"; - private static final String ANNOTATION_CONFIG_GROUP = "org.jboss.shamrock.runtime.annotations.ConfigGroup"; - private static final String ANNOTATION_CONFIG_ITEM = "org.jboss.shamrock.runtime.annotations.ConfigItem"; - private static final String ANNOTATION_CONFIG_ROOT = "org.jboss.shamrock.runtime.annotations.ConfigRoot"; - private static final String ANNOTATION_TEMPLATE = "org.jboss.shamrock.runtime.annotations.Template"; + private static final String ANNOTATION_BUILD_STEP = "io.quarkus.deployment.annotations.BuildStep"; + private static final String ANNOTATION_CONFIG_GROUP = "io.quarkus.runtime.annotations.ConfigGroup"; + private static final String ANNOTATION_CONFIG_ITEM = "io.quarkus.runtime.annotations.ConfigItem"; + private static final String ANNOTATION_CONFIG_ROOT = "io.quarkus.runtime.annotations.ConfigRoot"; + private static final String ANNOTATION_TEMPLATE = "io.quarkus.runtime.annotations.Template"; private static final String INSTANCE_SYM = "__instance"; private final Set generatedAccessors = new ConcurrentHashMap().keySet(Boolean.TRUE); @@ -228,7 +228,7 @@ public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "File walk failed: " + e); } if (! bscListClasses.isEmpty()) try { - final FileObject listResource = filer.createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/shamrock-build-steps.list"); + final FileObject listResource = filer.createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/quarkus-build-steps.list"); try (OutputStream os = listResource.openOutputStream()) { try (BufferedOutputStream bos = new BufferedOutputStream(os)) { try (OutputStreamWriter osw = new OutputStreamWriter(bos, StandardCharsets.UTF_8)) { @@ -246,7 +246,7 @@ public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) return; } if (! crListClasses.isEmpty()) try { - final FileObject listResource = filer.createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/shamrock-config-roots.list"); + final FileObject listResource = filer.createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/quarkus-config-roots.list"); try (OutputStream os = listResource.openOutputStream()) { try (BufferedOutputStream bos = new BufferedOutputStream(os)) { try (OutputStreamWriter osw = new OutputStreamWriter(bos, StandardCharsets.UTF_8)) { @@ -264,7 +264,7 @@ public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) return; } try { - final FileObject listResource = filer.createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/shamrock-javadoc.properties"); + final FileObject listResource = filer.createResource(StandardLocation.CLASS_OUTPUT, "", "META-INF/quarkus-javadoc.properties"); try (OutputStream os = listResource.openOutputStream()) { try (BufferedOutputStream bos = new BufferedOutputStream(os)) { try (OutputStreamWriter osw = new OutputStreamWriter(bos, StandardCharsets.UTF_8)) { diff --git a/core/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/core/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 2d5bf506211f4..f2b25864a8779 100644 --- a/core/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/core/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1 +1 @@ -org.jboss.shamrock.annotation.processor.ExtensionAnnotationProcessor +io.quarkus.annotation.processor.ExtensionAnnotationProcessor diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml index 22accb1a0a5f3..e4b32c212c00f 100644 --- a/core/runtime/pom.xml +++ b/core/runtime/pom.xml @@ -21,14 +21,14 @@ 4.0.0 - org.jboss.shamrock - shamrock-core-parent + io.quarkus + quarkus-core-parent 1.0.0.Alpha1-SNAPSHOT ../ - shamrock-core-runtime - Shamrock - Core - Runtime + quarkus-core-runtime + Quarkus - Core - Runtime @@ -85,8 +85,8 @@ If we move the extension processor to a separate project, this can be removed. --> - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} provided @@ -113,8 +113,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/Application.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/Application.java index 67a1f5d002870..ab453cf06be1d 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/Application.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/Application.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; @@ -22,7 +22,7 @@ import org.graalvm.nativeimage.ImageInfo; import org.jboss.logging.Logger; -import org.jboss.shamrock.runtime.graal.DiagnosticPrinter; +import io.quarkus.runtime.graal.DiagnosticPrinter; import org.jboss.threads.Locks; import org.wildfly.common.Assert; import sun.misc.Signal; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ConfigHelper.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ConfigHelper.java index a2ff2e6fab17b..875c957b68810 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ConfigHelper.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ConfigHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; import java.util.Optional; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ExecutorTemplate.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ExecutorTemplate.java index 3947bada8fa82..95ef6f50789fa 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ExecutorTemplate.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ExecutorTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; import java.util.Optional; import java.util.concurrent.Executor; @@ -22,7 +22,7 @@ import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.runtime.annotations.Template; import org.jboss.threads.EnhancedQueueExecutor; import org.jboss.threads.JBossExecutors; import org.jboss.threads.JBossThreadFactory; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/LaunchMode.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/LaunchMode.java index 32b449eb4f682..aa2673b81836f 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/LaunchMode.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/LaunchMode.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; public enum LaunchMode { /** @@ -7,7 +7,7 @@ public enum LaunchMode { */ NORMAL, /** - * shamrock:dev or an IDE launch (when we support IDE launch) + * quarkus:dev or an IDE launch (when we support IDE launch) */ DEVELOPMENT, /** diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ObjectSubstitution.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ObjectSubstitution.java index 27d644b659d93..a050785dc6313 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ObjectSubstitution.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ObjectSubstitution.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; /** * An interface that can be used to substitute a non-bytecode serializable class diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ResourceHelper.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ResourceHelper.java index b97a77dee95a2..53b8581c10798 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ResourceHelper.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ResourceHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; import java.io.InputStream; import java.lang.reflect.Method; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/RuntimeValue.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/RuntimeValue.java index 03e6292912696..cff91dfce6d1f 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/RuntimeValue.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/RuntimeValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; /** * Represents a proxyable object that can be returned from a bytecode recorder, diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/Shamrock.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/Shamrock.java index 4016110b1dd8e..ee20f08ab0f1a 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/Shamrock.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/Shamrock.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; import java.lang.reflect.Method; /** - * The main entry point class, calling main allows you to bootstrap shamrock + * The main entry point class, calling main allows you to bootstrap quarkus *

- * Note that at native image generation time this is replaced by {@link org.jboss.shamrock.runtime.graal.ShamrockReplacement} + * Note that at native image generation time this is replaced by {@link io.quarkus.runtime.graal.QuarkusReplacement} * which will avoid the need for reflection. *

* TODO: how do we deal with static init */ -public class Shamrock { +public class Quarkus { public static void main(String... args) throws Exception { - Class main = Class.forName("org.jboss.shamrock.runner.GeneratedMain"); + Class main = Class.forName("io.quarkus.runner.GeneratedMain"); Method mainMethod = main.getDeclaredMethod("main", String[].class); mainMethod.invoke(null, (Object) args); } diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ShutdownContext.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ShutdownContext.java index 09446039b760d..9949731d2659c 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ShutdownContext.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ShutdownContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; /** * A context that can be passed into runtime templates that allows for shutdown tasks to be added. diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ShutdownEvent.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ShutdownEvent.java index b7872e129fddd..e57820acc8c5b 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/ShutdownEvent.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/ShutdownEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; /** * Event that is fired before shutdown. diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupContext.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupContext.java index 97b3664262cb0..ec1b39b0cf65a 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupContext.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; import java.io.Closeable; import java.util.ArrayList; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupEvent.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupEvent.java index fd1dcc706e342..94453ecb844fb 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupEvent.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; /** * Event class that is fired on startup. diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupTask.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupTask.java index c54d0b29a0d74..8053653f6967c 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupTask.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/StartupTask.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; /** * A task that is run on startup. Generally this will be provided by generated bytecode, and should not be used directly diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/Timing.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/Timing.java index 3d00efed4b64c..cd76939f198f7 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/Timing.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/Timing.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime; +package io.quarkus.runtime; import java.math.BigDecimal; @@ -23,7 +23,7 @@ /** * Class that is responsible for printing out timing results. *

- * It is modified on substrate by {@link org.jboss.shamrock.runtime.graal.TimingReplacement}, in that mainStarted it rewritten to + * It is modified on substrate by {@link io.quarkus.runtime.graal.TimingReplacement}, in that mainStarted it rewritten to * actually update the start time. */ public class Timing { @@ -56,18 +56,18 @@ public static void restart() { public static void printStartupTime(String version, String features, String httpServer) { final long bootTimeNanoSeconds = System.nanoTime() - bootStartTime; - final Logger logger = Logger.getLogger("org.jboss.shamrock"); + final Logger logger = Logger.getLogger("io.quarkus"); //Use a BigDecimal so we can render in seconds with 3 digits precision, as requested: final BigDecimal secondsRepresentation = convertToBigDecimalSeconds(bootTimeNanoSeconds); - logger.infof("Shamrock %s started in %ss. %s", version, secondsRepresentation, httpServer); + logger.infof("Quarkus %s started in %ss. %s", version, secondsRepresentation, httpServer); logger.infof("Installed features: [%s]", features); } public static void printStopTime() { final long stopTimeNanoSeconds = System.nanoTime() - bootStopTime; - final Logger logger = Logger.getLogger("org.jboss.shamrock"); + final Logger logger = Logger.getLogger("io.quarkus"); final BigDecimal secondsRepresentation = convertToBigDecimalSeconds(stopTimeNanoSeconds); - logger.infof("Shamrock stopped in %ss", secondsRepresentation); + logger.infof("Quarkus stopped in %ss", secondsRepresentation); } private static BigDecimal convertToBigDecimalSeconds (final long timeNanoSeconds) { diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigGroup.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigGroup.java index 016858a39aa76..828dd5f7c4423 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigGroup.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigGroup.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.annotations; +package io.quarkus.runtime.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -13,13 +13,13 @@ * that a group property can be disabled, this should be done using a {@code boolean} property (preferably the unnamed * property or a {@code enabled} property). For example: 


-shamrock.extra-fast-mode         = yes
-shamrock.extra-fast-mode.gadgets = 20
+quarkus.extra-fast-mode         = yes
+quarkus.extra-fast-mode.gadgets = 20
* Or: 

-shamrock.laser-beam.enabled    = true
-shamrock.laser-beam.mount-mode = sharks
+quarkus.laser-beam.enabled    = true
+quarkus.laser-beam.mount-mode = sharks
*/ @Retention(RetentionPolicy.RUNTIME) diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigItem.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigItem.java index 04fca85bf302f..aa6a40c44a4ce 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigItem.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigItem.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.annotations; +package io.quarkus.runtime.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.PARAMETER; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigPhase.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigPhase.java index 2b01fd68e004c..491c796acc0f2 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigPhase.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigPhase.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.annotations; +package io.quarkus.runtime.annotations; public enum ConfigPhase { /** diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigRoot.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigRoot.java index 178aac6709e18..84599bf55e5aa 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigRoot.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/ConfigRoot.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.runtime.annotations; +package io.quarkus.runtime.annotations; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static org.jboss.shamrock.runtime.annotations.ConfigPhase.BUILD_TIME; +import static io.quarkus.runtime.annotations.ConfigPhase.BUILD_TIME; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/RegisterForReflection.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/RegisterForReflection.java index 18c5832b9d603..9c1de432695bf 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/RegisterForReflection.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/RegisterForReflection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.annotations; +package io.quarkus.runtime.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/Template.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/Template.java index 8cdea8fd42fca..14ab9d81480cc 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/Template.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/annotations/Template.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.annotations; +package io.quarkus.runtime.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/AbstractDelegatingConfigSource.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/AbstractDelegatingConfigSource.java index 4ec1eab851a40..5a85ea6d1a663 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/AbstractDelegatingConfigSource.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/AbstractDelegatingConfigSource.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.util.Map; import java.util.Set; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/Aliased.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/Aliased.java index ae386ff63daef..445863fcbf2df 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/Aliased.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/Aliased.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.util.Collection; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ArrayListFactory.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ArrayListFactory.java index 5e0d5feda4915..10b6773a1e6f0 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ArrayListFactory.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ArrayListFactory.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.util.ArrayList; import java.util.function.IntFunction; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/CidrAddressConverter.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/CidrAddressConverter.java index 9aa6270a3abf2..aeea3e5a448f7 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/CidrAddressConverter.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/CidrAddressConverter.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import org.eclipse.microprofile.config.spi.Converter; import org.wildfly.common.net.CidrAddress; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConfigExpander.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConfigExpander.java index 05920218bb0f0..472801a1d1a93 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConfigExpander.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConfigExpander.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.util.Optional; import java.util.function.BiConsumer; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConfigUtils.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConfigUtils.java index 23d1b44b915b8..f2261a05c7e96 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConfigUtils.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConfigUtils.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.util.Collection; import java.util.function.IntFunction; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConverterFactory.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConverterFactory.java index bedc92d6873cb..978d1dd190829 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConverterFactory.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ConverterFactory.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/DefaultConfigSource.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/DefaultConfigSource.java index 6213986c67025..0a63806dbece8 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/DefaultConfigSource.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/DefaultConfigSource.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.io.IOException; import java.io.InputStream; @@ -16,7 +16,7 @@ public final class DefaultConfigSource extends PropertiesConfigSource { private static final long serialVersionUID = - 6482737535291300045L; - public static final String DEFAULT_CONFIG_PROPERTIES_NAME = "META-INF/shamrock-default-config.properties"; + public static final String DEFAULT_CONFIG_PROPERTIES_NAME = "META-INF/quarkus-default-config.properties"; /** * Construct a new instance. diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/DeploymentProfileConfigSource.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/DeploymentProfileConfigSource.java index 6fa8ce3a61213..6cceb18a657c0 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/DeploymentProfileConfigSource.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/DeploymentProfileConfigSource.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.util.AbstractSet; import java.util.Iterator; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ExpandingConfigSource.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ExpandingConfigSource.java index 5b8592fb19235..fd0451d8e881b 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ExpandingConfigSource.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/ExpandingConfigSource.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/FastCachedConfigSource.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/FastCachedConfigSource.java index 93a69a030bb56..93ac94c2c588a 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/FastCachedConfigSource.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/FastCachedConfigSource.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.util.HashMap; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/InetAddressConverter.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/InetAddressConverter.java index 36bbccc035ecd..ec42b14b42e2d 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/InetAddressConverter.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/InetAddressConverter.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/InetSocketAddressConverter.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/InetSocketAddressConverter.java index f82894ec5bcef..58b6fc49e859b 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/InetSocketAddressConverter.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/InetSocketAddressConverter.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/NameIterator.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/NameIterator.java index dad9ae0a3cb3a..4460e6b5b875b 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/NameIterator.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/NameIterator.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.util.NoSuchElementException; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/RegexConverter.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/RegexConverter.java index 24e880f95921f..3674b237c5163 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/RegexConverter.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/RegexConverter.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import java.util.regex.Pattern; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/SimpleConfigurationProviderResolver.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/SimpleConfigurationProviderResolver.java index a31debdb4ed07..aec8d44b9e0c6 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/SimpleConfigurationProviderResolver.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/SimpleConfigurationProviderResolver.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import io.smallrye.config.SmallRyeConfigBuilder; import org.eclipse.microprofile.config.Config; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/Substitutions.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/Substitutions.java index 64e98f8b245f8..5f63f0d34ebdc 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/Substitutions.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/configuration/Substitutions.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.Delete; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ConstructorReplacement.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ConstructorReplacement.java index d723c01b2686e..036f55c8be0f0 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ConstructorReplacement.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ConstructorReplacement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.graal; +package io.quarkus.runtime.graal; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedType; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/DiagnosticPrinter.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/DiagnosticPrinter.java index 234900297a39f..1945bdf4401c6 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/DiagnosticPrinter.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/DiagnosticPrinter.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.graal; +package io.quarkus.runtime.graal; import java.io.PrintStream; import java.time.Instant; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/FieldReplacement.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/FieldReplacement.java index 52187dc27db75..80a278f5b3d77 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/FieldReplacement.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/FieldReplacement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.graal; +package io.quarkus.runtime.graal; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedType; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/LoggingSubstitutions.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/LoggingSubstitutions.java index e94c7bb313703..a5419230088d2 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/LoggingSubstitutions.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/LoggingSubstitutions.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.graal; +package io.quarkus.runtime.graal; import java.util.logging.Handler; import org.jboss.logmanager.handlers.DelayedHandler; -import org.jboss.shamrock.runtime.logging.InitialConfigurator; +import io.quarkus.runtime.logging.InitialConfigurator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,7 +48,7 @@ public static Logger getLogger(Class clazz) { } @TargetClass(InitialConfigurator.class) -final class Target_org_jboss_shamrock_runtime_logging_InitialConfigurator { +final class Target_io_quarkus_runtime_logging_InitialConfigurator { @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias) @Alias public static DelayedHandler DELAYED_HANDLER = new DelayedHandler(); diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/MappedByteBufferReplacement.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/MappedByteBufferReplacement.java index 2cba8ad26c5d8..682ae0bd3ddc5 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/MappedByteBufferReplacement.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/MappedByteBufferReplacement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.graal; +package io.quarkus.runtime.graal; import java.io.FileDescriptor; import java.nio.MappedByteBuffer; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/MethodReplacement.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/MethodReplacement.java index dbcda64bcd3d7..e9a2e659edcca 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/MethodReplacement.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/MethodReplacement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.graal; +package io.quarkus.runtime.graal; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedType; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ParameterReplacement.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ParameterReplacement.java index 4a11fdf384ced..5720cb1ead770 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ParameterReplacement.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ParameterReplacement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.graal; +package io.quarkus.runtime.graal; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedType; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ShamrockReplacement.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ShamrockReplacement.java index 2380d4ec3fac1..60f7ae3618b17 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ShamrockReplacement.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/ShamrockReplacement.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.graal; +package io.quarkus.runtime.graal; -import org.jboss.shamrock.runtime.Shamrock; +import io.quarkus.runtime.Quarkus; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; /** - * class that avoids the use of reflection in Shamrock when actually running + * class that avoids the use of reflection in Quarkus when actually running * on Graal. *

* Graal does not seem to like registering the program entry point as availble for reflection */ -@TargetClass(Shamrock.class) -final class ShamrockReplacement { +@TargetClass(Quarkus.class) +final class QuarkusReplacement { @Substitute public static void main(String... args) throws Exception { @@ -37,7 +37,7 @@ public static void main(String... args) throws Exception { } - @TargetClass(className = "org.jboss.shamrock.runner.GeneratedMain") + @TargetClass(className = "io.quarkus.runner.GeneratedMain") static final class GenMain { @Alias diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/Target_javax_management_JMX.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/Target_javax_management_JMX.java index 50ec234a52baf..b5ce92c3f515f 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/Target_javax_management_JMX.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/Target_javax_management_JMX.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.graal; +package io.quarkus.runtime.graal; import javax.management.JMX; import javax.management.MBeanServerConnection; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/Target_javax_xml_TransformerException.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/Target_javax_xml_TransformerException.java index 7ed8cec52a43b..8cbdab4a757e7 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/Target_javax_xml_TransformerException.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/Target_javax_xml_TransformerException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.graal; +package io.quarkus.runtime.graal; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/TimingReplacement.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/TimingReplacement.java index 99d510a6037a3..0304f7fb9a279 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/TimingReplacement.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/graal/TimingReplacement.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.graal; +package io.quarkus.runtime.graal; -import org.jboss.shamrock.runtime.Timing; +import io.quarkus.runtime.Timing; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.Substitute; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/CategoryConfig.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/CategoryConfig.java index 81787f02a99e6..f7d88cf7ad229 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/CategoryConfig.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/CategoryConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.logging; +package io.quarkus.runtime.logging; -import org.jboss.shamrock.runtime.annotations.ConfigGroup; -import org.jboss.shamrock.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; @ConfigGroup public class CategoryConfig { diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/CleanupFilterConfig.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/CleanupFilterConfig.java index 03c91a041dbc9..308947705f678 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/CleanupFilterConfig.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/CleanupFilterConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.logging; +package io.quarkus.runtime.logging; -import org.jboss.shamrock.runtime.annotations.ConfigGroup; -import org.jboss.shamrock.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; @ConfigGroup public class CleanupFilterConfig { diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/ConsoleConfig.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/ConsoleConfig.java index a99f158f906a9..d35e852882dfc 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/ConsoleConfig.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/ConsoleConfig.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.logging; +package io.quarkus.runtime.logging; import java.util.logging.Level; -import org.jboss.shamrock.runtime.annotations.ConfigGroup; -import org.jboss.shamrock.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; @ConfigGroup public class ConsoleConfig { diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/FileConfig.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/FileConfig.java index 8e3468125b1dc..a02bb2b47a93f 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/FileConfig.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/FileConfig.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jboss.shamrock.runtime.logging; +package io.quarkus.runtime.logging; import java.io.File; import java.util.logging.Level; -import org.jboss.shamrock.runtime.annotations.ConfigGroup; -import org.jboss.shamrock.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; @ConfigGroup public class FileConfig { @@ -46,7 +46,7 @@ public class FileConfig { /** * The file logging log level */ - @ConfigItem(defaultValue = "shamrock.log") + @ConfigItem(defaultValue = "quarkus.log") File path; } diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/InitialConfigurator.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/InitialConfigurator.java index 3ba9a37a96a39..f7c6db14b67f1 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/InitialConfigurator.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/InitialConfigurator.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.logging; +package io.quarkus.runtime.logging; import java.util.logging.Handler; import java.util.logging.Level; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LevelConverter.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LevelConverter.java index fd62b79534b58..d6ea5befdf981 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LevelConverter.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LevelConverter.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.logging; +package io.quarkus.runtime.logging; import java.util.logging.Level; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogCleanupFilter.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogCleanupFilter.java index 977b033cd60f9..740d8bd413bfd 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogCleanupFilter.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogCleanupFilter.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.logging; +package io.quarkus.runtime.logging; import java.util.HashMap; import java.util.List; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogCleanupFilterElement.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogCleanupFilterElement.java index 2fa6aab233a6c..e72891fcbd91f 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogCleanupFilterElement.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogCleanupFilterElement.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.logging; +package io.quarkus.runtime.logging; public class LogCleanupFilterElement { private String loggerName; diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogConfig.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogConfig.java index 62d8d5b2b9d42..815d3bef41be2 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogConfig.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LogConfig.java @@ -1,12 +1,12 @@ -package org.jboss.shamrock.runtime.logging; +package io.quarkus.runtime.logging; import java.util.Map; import java.util.Optional; import java.util.logging.Level; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; /** * diff --git a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LoggingSetupTemplate.java b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LoggingSetupTemplate.java index 0ca5f67c79601..7df195d65d2f9 100644 --- a/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LoggingSetupTemplate.java +++ b/core/runtime/src/main/java/org/jboss/shamrock/runtime/logging/LoggingSetupTemplate.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.logging; +package io.quarkus.runtime.logging; import java.io.FileNotFoundException; import java.util.ArrayList; @@ -19,7 +19,7 @@ import org.jboss.logmanager.formatters.PatternFormatter; import org.jboss.logmanager.handlers.ConsoleHandler; import org.jboss.logmanager.handlers.FileHandler; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.runtime.annotations.Template; /** * diff --git a/core/runtime/src/main/resources/META-INF/services/org.jboss.logmanager.EmbeddedConfigurator b/core/runtime/src/main/resources/META-INF/services/org.jboss.logmanager.EmbeddedConfigurator index 0ed31c8b784d9..a74fa0168f778 100644 --- a/core/runtime/src/main/resources/META-INF/services/org.jboss.logmanager.EmbeddedConfigurator +++ b/core/runtime/src/main/resources/META-INF/services/org.jboss.logmanager.EmbeddedConfigurator @@ -1 +1 @@ -org.jboss.shamrock.runtime.logging.InitialConfigurator \ No newline at end of file +io.quarkus.runtime.logging.InitialConfigurator \ No newline at end of file diff --git a/core/runtime/src/test/java/org/jboss/shamrock/runtime/configuration/ConverterTestCase.java b/core/runtime/src/test/java/org/jboss/shamrock/runtime/configuration/ConverterTestCase.java index 105fca31d31f7..f43fcce6f6028 100644 --- a/core/runtime/src/test/java/org/jboss/shamrock/runtime/configuration/ConverterTestCase.java +++ b/core/runtime/src/test/java/org/jboss/shamrock/runtime/configuration/ConverterTestCase.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import static org.junit.Assert.assertEquals; @@ -6,9 +6,9 @@ import java.net.InetSocketAddress; import java.net.UnknownHostException; -import org.jboss.shamrock.runtime.configuration.CidrAddressConverter; -import org.jboss.shamrock.runtime.configuration.InetAddressConverter; -import org.jboss.shamrock.runtime.configuration.InetSocketAddressConverter; +import io.quarkus.runtime.configuration.CidrAddressConverter; +import io.quarkus.runtime.configuration.InetAddressConverter; +import io.quarkus.runtime.configuration.InetSocketAddressConverter; import org.junit.AssumptionViolatedException; import org.junit.Test; import org.wildfly.common.net.CidrAddress; diff --git a/core/runtime/src/test/java/org/jboss/shamrock/runtime/configuration/NameIteratorTestCase.java b/core/runtime/src/test/java/org/jboss/shamrock/runtime/configuration/NameIteratorTestCase.java index 444673abf2594..e93503c812946 100644 --- a/core/runtime/src/test/java/org/jboss/shamrock/runtime/configuration/NameIteratorTestCase.java +++ b/core/runtime/src/test/java/org/jboss/shamrock/runtime/configuration/NameIteratorTestCase.java @@ -1,10 +1,10 @@ -package org.jboss.shamrock.runtime.configuration; +package io.quarkus.runtime.configuration; import static org.junit.Assert.*; import java.util.NoSuchElementException; -import org.jboss.shamrock.runtime.configuration.NameIterator; +import io.quarkus.runtime.configuration.NameIterator; import org.junit.Test; /** diff --git a/core/test-extension/deployment/pom.xml b/core/test-extension/deployment/pom.xml index c13d6d4ec5834..6d7e51806d266 100644 --- a/core/test-extension/deployment/pom.xml +++ b/core/test-extension/deployment/pom.xml @@ -20,13 +20,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> test-extension - org.jboss.shamrock + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 test-extension-deployment - Shamrock - Core Test Extension - Deployment + Quarkus - Core Test Extension - Deployment @@ -34,27 +34,27 @@ undertow-servlet - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-undertow-runtime + io.quarkus + quarkus-undertow-runtime - org.jboss.shamrock + io.quarkus test-extension-runtime 1.0.0.Alpha1-SNAPSHOT - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal test @@ -71,8 +71,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/core/test-extension/deployment/src/main/java/org/jboss/shamrock/extest/TestProcessor.java b/core/test-extension/deployment/src/main/java/org/jboss/shamrock/extest/TestProcessor.java index 4d697014c6390..aa0e1f90f75bb 100644 --- a/core/test-extension/deployment/src/main/java/org/jboss/shamrock/extest/TestProcessor.java +++ b/core/test-extension/deployment/src/main/java/org/jboss/shamrock/extest/TestProcessor.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; import java.util.Collection; @@ -7,19 +7,19 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; import org.jboss.logging.Logger; -import org.jboss.shamrock.arc.deployment.BeanArchiveIndexBuildItem; -import org.jboss.shamrock.arc.deployment.BeanContainerListenerBuildItem; -import org.jboss.shamrock.arc.deployment.BeanDefiningAnnotationBuildItem; -import org.jboss.shamrock.arc.runtime.BeanContainerListener; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.LaunchModeBuildItem; -import org.jboss.shamrock.deployment.builditem.ServiceStartBuildItem; +import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem; +import io.quarkus.arc.deployment.BeanContainerListenerBuildItem; +import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem; +import io.quarkus.arc.runtime.BeanContainerListener; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.builditem.ServiceStartBuildItem; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.RUNTIME_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT; /** * A test extension deployment processor @@ -36,7 +36,7 @@ public final class TestProcessor { * Register a extension capability and feature * @return test-extension feature build item */ - @BuildStep(providesCapabilities = "org.jboss.shamrock.test-extension") + @BuildStep(providesCapabilities = "io.quarkus.test-extension") FeatureBuildItem featureBuildItem() { return new FeatureBuildItem("test-extension"); } @@ -84,11 +84,11 @@ void checkConfig() { if(buildTimeConfig.allValues.longPrimitive != 1234567891L) { throw new IllegalStateException("buildTimeConfig.allValues.longPrimitive != 1234567891L; "+buildTimeConfig.allValues.longPrimitive); } - // shamrock.bt.all-values.double-primitive=3.1415926535897932384 + // quarkus.bt.all-values.double-primitive=3.1415926535897932384 if(Math.IEEEremainder(buildTimeConfig.allValues.doublePrimitive, 3.1415926535897932384) != 0) { throw new IllegalStateException("buildTimeConfig.allValues.doublePrimitive != 3.1415926535897932384; "+buildTimeConfig.allValues.doublePrimitive); } - // shamrock.bt.all-values.opt-double-value=3.1415926535897932384 + // quarkus.bt.all-values.opt-double-value=3.1415926535897932384 if(Math.IEEEremainder(buildTimeConfig.allValues.optDoubleValue.getAsDouble(), 3.1415926535897932384) != 0) { throw new IllegalStateException("buildTimeConfig.allValues.optDoubleValue != 3.1415926535897932384; "+buildTimeConfig.allValues.optDoubleValue); } @@ -104,7 +104,7 @@ void checkConfig() { if(buildTimeConfig.allValues.nestedConfigMap.size() != 2) { throw new IllegalStateException("buildTimeConfig.allValues.simpleMap.size != 2; "+buildTimeConfig.allValues.nestedConfigMap.size()); } - //shamrock.bt.all-values.string-list=value1,value2 + //quarkus.bt.all-values.string-list=value1,value2 if(buildTimeConfig.allValues.stringList.size() != 2) { throw new IllegalStateException("buildTimeConfig.allValues.stringList.size != 2; "+buildTimeConfig.allValues.stringList.size()); } @@ -114,7 +114,7 @@ void checkConfig() { if(!buildTimeConfig.allValues.stringList.get(1).equals("value2")) { throw new IllegalStateException("buildTimeConfig.allValues.stringList[1] != value2; "+buildTimeConfig.allValues.stringList.get(1)); } - // shamrock.rt.all-values.long-list=1,2,3 + // quarkus.rt.all-values.long-list=1,2,3 if(buildTimeConfig.allValues.longList.size() != 3) { throw new IllegalStateException("buildTimeConfig.allValues.longList.size != 3; "+buildTimeConfig.allValues.longList.size()); } diff --git a/core/test-extension/deployment/src/test/java/org/jboss/shamrock/extest/ConfiguredBean.java b/core/test-extension/deployment/src/test/java/org/jboss/shamrock/extest/ConfiguredBean.java index 69f575110f138..78fff453b2eb2 100644 --- a/core/test-extension/deployment/src/test/java/org/jboss/shamrock/extest/ConfiguredBean.java +++ b/core/test-extension/deployment/src/test/java/org/jboss/shamrock/extest/ConfiguredBean.java @@ -1,10 +1,10 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shamrock.runtime.StartupEvent; +import io.quarkus.runtime.StartupEvent; /** * A sample bean diff --git a/core/test-extension/deployment/src/test/java/org/jboss/shamrock/extest/ConfiguredBeanTest.java b/core/test-extension/deployment/src/test/java/org/jboss/shamrock/extest/ConfiguredBeanTest.java index 99bcc7ce2eb87..7ebd768c6d1b2 100644 --- a/core/test-extension/deployment/src/test/java/org/jboss/shamrock/extest/ConfiguredBeanTest.java +++ b/core/test-extension/deployment/src/test/java/org/jboss/shamrock/extest/ConfiguredBeanTest.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; import javax.inject.Inject; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; @@ -15,7 +15,7 @@ */ public class ConfiguredBeanTest { @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(ConfiguredBean.class) .addAsManifestResource("microprofile-config.properties") @@ -37,10 +37,10 @@ public void validateConfiguredBean() { /** * Validate that the TestBuildAndRunTimeConfig is the same as seen at build time - * Currently disabled due to https://github.com/jbossas/protean-shamrock/issues/962 + * Currently disabled due to https://github.com/jbossas/quarkus/issues/962 */ @Test - @Disabled("https://github.com/jbossas/protean-shamrock/issues/962") + @Disabled("https://github.com/jbossas/quarkus/issues/962") public void validateBuildTimeConfig() { TestBuildAndRunTimeConfig buildTimeConfig = configuredBean.getBuildTimeConfig(); Assertions.assertEquals("StringBasedValue", buildTimeConfig.btSBV.getValue(), @@ -50,9 +50,9 @@ public void validateBuildTimeConfig() { Assertions.assertEquals("btStringOptValue", buildTimeConfig.btStringOpt, "buildTimeConfig.btStringOpt != btStringOptValue; "+buildTimeConfig.btStringOpt); - // shamrock.btrt.all-values.double-primitive=3.1415926535897932384 + // quarkus.btrt.all-values.double-primitive=3.1415926535897932384 Assertions.assertEquals(3.1415926535897932384, buildTimeConfig.allValues.doublePrimitive, 0.00000001); - // shamrock.btrt.all-values.opt-double-value=3.1415926535897932384 + // quarkus.btrt.all-values.opt-double-value=3.1415926535897932384 Assertions.assertTrue(buildTimeConfig.allValues.optDoubleValue.isPresent(), "runTimeConfig.allValues.optDoubleValue.isPresent"); Assertions.assertEquals(3.1415926535897932384, buildTimeConfig.allValues.optDoubleValue.getAsDouble(), 0.00000001); @@ -94,35 +94,35 @@ public void validateBuildTimeConfig() { @Test public void validateRuntimeConfig() { TestRunTimeConfig runTimeConfig = configuredBean.getRunTimeConfig(); - // shamrock.rt.rt-string-opt=rtStringOptValue + // quarkus.rt.rt-string-opt=rtStringOptValue Assertions.assertEquals("rtStringOptValue", runTimeConfig.rtStringOpt); - // shamrock.rt.rt-string-opt-with-default=rtStringOptWithDefaultValue + // quarkus.rt.rt-string-opt-with-default=rtStringOptWithDefaultValue Assertions.assertEquals("rtStringOptWithDefaultValue", runTimeConfig.rtStringOptWithDefault); - //shamrock.rt.all-values.oov=configPart1+configPart2 + //quarkus.rt.all-values.oov=configPart1+configPart2 Assertions.assertEquals(new ObjectOfValue("configPart1","configPart2"), runTimeConfig.allValues.oov); - //shamrock.rt.all-values.ovo=configPart1+configPart2 + //quarkus.rt.all-values.ovo=configPart1+configPart2 Assertions.assertEquals(new ObjectValueOf("configPart1","configPart2"), runTimeConfig.allValues.ovo); - // shamrock.rt.all-values.long-primitive=12345678911 + // quarkus.rt.all-values.long-primitive=12345678911 Assertions.assertEquals(12345678911l, runTimeConfig.allValues.longPrimitive); - // shamrock.rt.all-values.long-value=12345678921 + // quarkus.rt.all-values.long-value=12345678921 Assertions.assertEquals(12345678921l, runTimeConfig.allValues.longValue.longValue()); - // shamrock.rt.all-values.opt-long-value=12345678931 + // quarkus.rt.all-values.opt-long-value=12345678931 Assertions.assertTrue(runTimeConfig.allValues.optLongValue.isPresent(), "runTimeConfig.allValues.optLongValue.isPresent"); Assertions.assertEquals(12345678931l, runTimeConfig.allValues.optLongValue.getAsLong()); - // shamrock.rt.all-values.optional-long-value=12345678941 + // quarkus.rt.all-values.optional-long-value=12345678941 Assertions.assertTrue(runTimeConfig.allValues.optionalLongValue.isPresent(), "runTimeConfig.allValues.optionalLongValue.isPresent"); Assertions.assertEquals(12345678941l, runTimeConfig.allValues.optionalLongValue.get().longValue()); - // shamrock.btrt.all-values.double-primitive=3.1415926535897932384 + // quarkus.btrt.all-values.double-primitive=3.1415926535897932384 Assertions.assertEquals(3.1415926535897932384, runTimeConfig.allValues.doublePrimitive, 0.00000001); - // shamrock.btrt.all-values.opt-double-value=3.1415926535897932384 + // quarkus.btrt.all-values.opt-double-value=3.1415926535897932384 Assertions.assertTrue(runTimeConfig.allValues.optDoubleValue.isPresent(), "runTimeConfig.allValues.optDoubleValue.isPresent"); Assertions.assertEquals(3.1415926535897932384, runTimeConfig.allValues.optDoubleValue.getAsDouble(), 0.00000001); - // shamrock.rt.all-values.string-list=value1,value2 + // quarkus.rt.all-values.string-list=value1,value2 Assertions.assertEquals(2, runTimeConfig.allValues.stringList.size()); Assertions.assertEquals("value1", runTimeConfig.allValues.stringList.get(0)); Assertions.assertEquals("value2", runTimeConfig.allValues.stringList.get(1)); - // shamrock.rt.all-values.long-list=1,2,3 + // quarkus.rt.all-values.long-list=1,2,3 Assertions.assertEquals(3, runTimeConfig.allValues.longList.size()); Assertions.assertEquals(1, runTimeConfig.allValues.longList.get(0).longValue()); Assertions.assertEquals(2, runTimeConfig.allValues.longList.get(1).longValue()); @@ -133,18 +133,18 @@ public void validateRuntimeConfig() { * Break out the validation of the RUN_TIME config nested map as that currently is not working. */ @Test - @Disabled("https://github.com/jbossas/protean-shamrock/issues/956") + @Disabled("https://github.com/jbossas/quarkus/issues/956") public void validateRuntimeConfigMap() { TestRunTimeConfig runTimeConfig = configuredBean.getRunTimeConfig(); Assertions.assertEquals(2, runTimeConfig.allValues.nestedConfigMap.size()); - //shamrock.rt.all-values.nested-config-map.key1.nested-value=value1 - //shamrock.rt.all-values.nested-config-map.key1.oov=value1.1+value1.2 + //quarkus.rt.all-values.nested-config-map.key1.nested-value=value1 + //quarkus.rt.all-values.nested-config-map.key1.oov=value1.1+value1.2 NestedConfig nc1 = runTimeConfig.allValues.nestedConfigMap.get("key1"); Assertions.assertNotNull(nc1); Assertions.assertEquals("value1", nc1.nestedValue); Assertions.assertEquals(new ObjectOfValue("value1.1", "value1.2"), nc1.oov); - //shamrock.rt.all-values.nested-config-map.key2.nested-value=value2 - //shamrock.rt.all-values.nested-config-map.key2.oov=value2.1+value2.2 + //quarkus.rt.all-values.nested-config-map.key2.nested-value=value2 + //quarkus.rt.all-values.nested-config-map.key2.oov=value2.1+value2.2 NestedConfig nc2 = runTimeConfig.allValues.nestedConfigMap.get("key2"); Assertions.assertNotNull(nc2); Assertions.assertEquals("value2", nc2.nestedValue); diff --git a/core/test-extension/deployment/src/test/resources/microprofile-config.properties b/core/test-extension/deployment/src/test/resources/microprofile-config.properties index 87783b21d75a3..59dab7ef1e1c8 100644 --- a/core/test-extension/deployment/src/test/resources/microprofile-config.properties +++ b/core/test-extension/deployment/src/test/resources/microprofile-config.properties @@ -1,56 +1,56 @@ ### Configuration settings for the TestBuildTimeConfig config root -shamrock.bt.bt-string-opt=btStringOptValue -shamrock.bt.bt-sbv=StringBasedValue +quarkus.bt.bt-string-opt=btStringOptValue +quarkus.bt.bt-sbv=StringBasedValue # This is not set so that we should get the @ConfigItem defaultValue -#shamrock.bt.bt-sbv-with-default=StringBasedValue -shamrock.bt.all-values.oov=configPart1+configPart2 -shamrock.bt.all-values.ovo=configPart1+configPart2 +#quarkus.bt.bt-sbv-with-default=StringBasedValue +quarkus.bt.all-values.oov=configPart1+configPart2 +quarkus.bt.all-values.ovo=configPart1+configPart2 # This is not set so that we should get the @ConfigItem defaultValue -#shamrock.bt.bt-oov-with-default=ObjectOfValue -shamrock.bt.all-values.long-primitive=1234567891 -shamrock.bt.all-values.double-primitive=3.1415926535897932384 -shamrock.bt.all-values.long-value=1234567892 -shamrock.bt.all-values.opt-long-value=1234567893 -shamrock.bt.all-values.opt-double-value=3.1415926535897932384 -shamrock.bt.all-values.optional-long-value=1234567894 -shamrock.bt.all-values.nested-config-map.key1.nested-value=value1 -shamrock.bt.all-values.nested-config-map.key1.oov=value1.1+value1.2 -shamrock.bt.all-values.nested-config-map.key2.nested-value=value2 -shamrock.bt.all-values.nested-config-map.key2.oov=value2.1+value2.2 -shamrock.bt.all-values.string-list=value1,value2 -shamrock.bt.all-values.long-list=1,2,3 +#quarkus.bt.bt-oov-with-default=ObjectOfValue +quarkus.bt.all-values.long-primitive=1234567891 +quarkus.bt.all-values.double-primitive=3.1415926535897932384 +quarkus.bt.all-values.long-value=1234567892 +quarkus.bt.all-values.opt-long-value=1234567893 +quarkus.bt.all-values.opt-double-value=3.1415926535897932384 +quarkus.bt.all-values.optional-long-value=1234567894 +quarkus.bt.all-values.nested-config-map.key1.nested-value=value1 +quarkus.bt.all-values.nested-config-map.key1.oov=value1.1+value1.2 +quarkus.bt.all-values.nested-config-map.key2.nested-value=value2 +quarkus.bt.all-values.nested-config-map.key2.oov=value2.1+value2.2 +quarkus.bt.all-values.string-list=value1,value2 +quarkus.bt.all-values.long-list=1,2,3 ### Duplicate settings for the TestBuildAndRunTimeConfig. May be able to drop if ConfigRoot inheritance is added -shamrock.btrt.bt-string-opt=btStringOptValue -shamrock.btrt.bt-sbv=StringBasedValue -shamrock.btrt.all-values.oov=configPart1+configPart2 -shamrock.btrt.all-values.ovo=configPart1+configPart2 -shamrock.btrt.all-values.long-primitive=1234567891 -shamrock.btrt.all-values.double-primitive=3.1415926535897932384 -shamrock.btrt.all-values.long-value=1234567892 -shamrock.btrt.all-values.opt-long-value=1234567893 -shamrock.btrt.all-values.opt-double-value=3.1415926535897932384 -shamrock.btrt.all-values.optional-long-value=1234567894 -shamrock.btrt.all-values.nested-config-map.key1.nested-value=value1 -shamrock.btrt.all-values.nested-config-map.key1.oov=value1.1+value1.2 -shamrock.btrt.all-values.nested-config-map.key2.nested-value=value2 -shamrock.btrt.all-values.nested-config-map.key2.oov=value2.1+value2.2 +quarkus.btrt.bt-string-opt=btStringOptValue +quarkus.btrt.bt-sbv=StringBasedValue +quarkus.btrt.all-values.oov=configPart1+configPart2 +quarkus.btrt.all-values.ovo=configPart1+configPart2 +quarkus.btrt.all-values.long-primitive=1234567891 +quarkus.btrt.all-values.double-primitive=3.1415926535897932384 +quarkus.btrt.all-values.long-value=1234567892 +quarkus.btrt.all-values.opt-long-value=1234567893 +quarkus.btrt.all-values.opt-double-value=3.1415926535897932384 +quarkus.btrt.all-values.optional-long-value=1234567894 +quarkus.btrt.all-values.nested-config-map.key1.nested-value=value1 +quarkus.btrt.all-values.nested-config-map.key1.oov=value1.1+value1.2 +quarkus.btrt.all-values.nested-config-map.key2.nested-value=value2 +quarkus.btrt.all-values.nested-config-map.key2.oov=value2.1+value2.2 ### Configuration settings for the TestRunTimeConfig config root -shamrock.rt.rt-string-opt=rtStringOptValue -shamrock.rt.rt-string-opt-with-default=rtStringOptWithDefaultValue -shamrock.rt.all-values.oov=configPart1+configPart2 -shamrock.rt.all-values.ovo=configPart1+configPart2 -shamrock.rt.all-values.long-primitive=12345678911 -shamrock.rt.all-values.double-primitive=3.1415926535897932384 -shamrock.rt.all-values.long-value=12345678921 -shamrock.rt.all-values.opt-long-value=12345678931 -shamrock.rt.all-values.opt-double-value=3.1415926535897932384 -shamrock.rt.all-values.optional-long-value=12345678941 -shamrock.rt.all-values.nested-config-map.key1.nested-value=value1 -shamrock.rt.all-values.nested-config-map.key1.oov=value1.1+value1.2 -shamrock.rt.all-values.nested-config-map.key2.nested-value=value2 -shamrock.rt.all-values.nested-config-map.key2.oov=value2.1+value2.2 -shamrock.rt.all-values.string-list=value1,value2 -shamrock.rt.all-values.long-list=1,2,3 +quarkus.rt.rt-string-opt=rtStringOptValue +quarkus.rt.rt-string-opt-with-default=rtStringOptWithDefaultValue +quarkus.rt.all-values.oov=configPart1+configPart2 +quarkus.rt.all-values.ovo=configPart1+configPart2 +quarkus.rt.all-values.long-primitive=12345678911 +quarkus.rt.all-values.double-primitive=3.1415926535897932384 +quarkus.rt.all-values.long-value=12345678921 +quarkus.rt.all-values.opt-long-value=12345678931 +quarkus.rt.all-values.opt-double-value=3.1415926535897932384 +quarkus.rt.all-values.optional-long-value=12345678941 +quarkus.rt.all-values.nested-config-map.key1.nested-value=value1 +quarkus.rt.all-values.nested-config-map.key1.oov=value1.1+value1.2 +quarkus.rt.all-values.nested-config-map.key2.nested-value=value2 +quarkus.rt.all-values.nested-config-map.key2.oov=value2.1+value2.2 +quarkus.rt.all-values.string-list=value1,value2 +quarkus.rt.all-values.long-list=1,2,3 diff --git a/core/test-extension/pom.xml b/core/test-extension/pom.xml index d600896e907dd..ea4b602e65ec6 100644 --- a/core/test-extension/pom.xml +++ b/core/test-extension/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.jboss.shamrock - shamrock-core-parent + io.quarkus + quarkus-core-parent 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 test-extension - Shamrock - Core Test Extension + Quarkus - Core Test Extension pom deployment diff --git a/core/test-extension/runtime/pom.xml b/core/test-extension/runtime/pom.xml index aa1d2e7a2846d..fb4bd3fd652b0 100644 --- a/core/test-extension/runtime/pom.xml +++ b/core/test-extension/runtime/pom.xml @@ -20,18 +20,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> test-extension - org.jboss.shamrock + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 test-extension-runtime - Shamrock - Core Test Extension - Runtime + Quarkus - Core Test Extension - Runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime com.oracle.substratevm @@ -50,8 +50,8 @@ xnio-api - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime @@ -65,8 +65,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/AllValuesConfig.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/AllValuesConfig.java index 78d577a70656a..f5f1e598f3484 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/AllValuesConfig.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/AllValuesConfig.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; import java.util.List; import java.util.Map; @@ -6,8 +6,8 @@ import java.util.OptionalDouble; import java.util.OptionalLong; -import org.jboss.shamrock.runtime.annotations.ConfigGroup; -import org.jboss.shamrock.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; @ConfigGroup public class AllValuesConfig { diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/IConfigConsumer.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/IConfigConsumer.java index 53f928cd4656d..76e48379c1740 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/IConfigConsumer.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/IConfigConsumer.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; /** * Interface used to pass the runtime configuration to an application bean for validation diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/NestedConfig.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/NestedConfig.java index 30debc7f67be0..1d8e4945b4ec1 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/NestedConfig.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/NestedConfig.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; -import org.jboss.shamrock.runtime.annotations.ConfigGroup; -import org.jboss.shamrock.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; @ConfigGroup public class NestedConfig { diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/ObjectOfValue.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/ObjectOfValue.java index d40c106d5f68d..2403df12ff0bc 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/ObjectOfValue.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/ObjectOfValue.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; /** * A configuration type that has a static {@linkplain ObjectOfValue#of(String)} conversion method diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/ObjectValueOf.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/ObjectValueOf.java index 687844cdb7f4b..a9c2e2c29656b 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/ObjectValueOf.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/ObjectValueOf.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; /** * A configuration type that has a static {@linkplain ObjectValueOf#valueOf(String)} conversion method diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/StringBasedValue.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/StringBasedValue.java index 9974153f3bca9..453a7d2f0330d 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/StringBasedValue.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/StringBasedValue.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; public class StringBasedValue { private String value; diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestAnnotation.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestAnnotation.java index b5db7ee3bb754..51d018250002b 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestAnnotation.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestAnnotation.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; import java.lang.annotation.Documented; import java.lang.annotation.Inherited; diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestBuildAndRunTimeConfig.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestBuildAndRunTimeConfig.java index 610f8f26aba75..bdabd81372b60 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestBuildAndRunTimeConfig.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestBuildAndRunTimeConfig.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; /** * This is a duplicate of {@linkplain TestBuildTimeConfig} with a {@linkplain ConfigPhase#BUILD_AND_RUN_TIME_FIXED} diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestBuildTimeConfig.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestBuildTimeConfig.java index b409dfae947aa..faafb71550ce5 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestBuildTimeConfig.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestBuildTimeConfig.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; /** * A root config object for use during build time diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestConfigValidator.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestConfigValidator.java index 4805b87fd4dde..d0ec44561ec1b 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestConfigValidator.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestConfigValidator.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; public interface TestConfigValidator { } diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestRunTimeConfig.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestRunTimeConfig.java index 9565fae8442aa..489dea7645792 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestRunTimeConfig.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestRunTimeConfig.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; @ConfigRoot(name = "rt", phase = ConfigPhase.RUN_TIME) public class TestRunTimeConfig { diff --git a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestTemplate.java b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestTemplate.java index d29a4a7d4f9a1..69ec4a357a2d6 100644 --- a/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestTemplate.java +++ b/core/test-extension/runtime/src/main/java/org/jboss/shamrock/extest/TestTemplate.java @@ -1,9 +1,9 @@ -package org.jboss.shamrock.extest; +package io.quarkus.extest; import org.jboss.logging.Logger; -import org.jboss.shamrock.arc.runtime.BeanContainer; -import org.jboss.shamrock.arc.runtime.BeanContainerListener; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.arc.runtime.BeanContainerListener; +import io.quarkus.runtime.annotations.Template; /** * The runtime template diff --git a/devtools/Devtools_Specification.md b/devtools/Devtools_Specification.md index 4eaf04c56ed72..07965e126bf6b 100644 --- a/devtools/Devtools_Specification.md +++ b/devtools/Devtools_Specification.md @@ -1,20 +1,20 @@ # Devtools Specification -This document will attempt to specify the expected behavior of the various tools (æsh, maven, forge, etc.) developed to help developers onboard and manage their shamrock based work. Much of this will presume maven based projects as gradle has not even come up in discussion as yet. There are a few scenarios to cover: +This document will attempt to specify the expected behavior of the various tools (æsh, maven, forge, etc.) developed to help developers onboard and manage their quarkus based work. Much of this will presume maven based projects as gradle has not even come up in discussion as yet. There are a few scenarios to cover: 1. Creating a new project -2. Updating an existing pom to support shamrock +2. Updating an existing pom to support quarkus 3. To a deployable project (a "jar" project) 4. To a parent project (a "pom" project) 3. Adding extensions to an existing project - 4. To a pom that doesn't have shamrock support yet - 5. To a pom already configured for shamrock support + 4. To a pom that doesn't have quarkus support yet + 5. To a pom already configured for quarkus support ## The Initial Conditions 1. Path to project defaulting to the current folder (may not exist yet) 2. 7 values for the project 2. Optional list of additional extensions -3. Optional prefix name the names generated Resource and Application classes (default: Shamrock) +3. Optional prefix name the names generated Resource and Application classes (default: Quarkus) 4. Optional package name 3. ??? @@ -22,12 +22,12 @@ This document will attempt to specify the expected behavior of the various tools Regardless of the initial conditions, the final product should include: 1. Dependencies on: - 2. The shamrock BOM in dependenciesManagement - 3. shamrock-jaxrs-deployment - 4. shamrock-junit4 -5. The shamrock-maven-plugin + 2. The quarkus BOM in dependenciesManagement + 3. quarkus-jaxrs-deployment + 4. quarkus-junit4 +5. The quarkus-maven-plugin 5. The `native` profile -6. A common property to track shamrock versions (Debatable!) +6. A common property to track quarkus versions (Debatable!) ## Target applications: @@ -40,19 +40,19 @@ Regardless of the initial conditions, the final product should include: Creating a project from scratch introduces the fewest barriers of course. A basic template containing these is trivial to produce. ## Updating an existing pom -Updating existing poms falls, generally, in to three categories: 1) adding initial shamrock support to a pristine pom, 2) running `create` on a pom already configured for shamrock, and 3) adding extensions to a pom that already supports shamrock. +Updating existing poms falls, generally, in to three categories: 1) adding initial quarkus support to a pristine pom, 2) running `create` on a pom already configured for quarkus, and 3) adding extensions to a pom that already supports quarkus. -### Initial shamrock support +### Initial quarkus support In these cases, some of the initial conditions no longer apply. Even though collected because the various interfaces will have them marked as required, the GAV values are now redundant. These values are to be ignored in favor of the extant values found in the pom. 1. The pom should be updated to include the bom in the dependenciesManagement section. One exception to this could be if a parent pom defines this bom then it could be skipped here. Resolving that could be complicated and/or time consuming, however, so declaring it locally might still be the simpler solution especially as it's largely harmless -1. The shamrock-maven-plugin should be added to the plugins section of the build section. Both sections should be created if they do not already exist. -1. A property should be created to store the shamrock version (named `shamrock.version`) for convenience. -1. References to the "core" shamrock extensions should be added to the dependencies section creating that section if necessary +1. The quarkus-maven-plugin should be added to the plugins section of the build section. Both sections should be created if they do not already exist. +1. A property should be created to store the quarkus version (named `quarkus.version`) for convenience. +1. References to the "core" quarkus extensions should be added to the dependencies section creating that section if necessary 2. Any extensions listed as one of the options should be added -3. None of these extensions should directly reference ${shamrock.version} but should rely on the bom definitions. +3. None of these extensions should directly reference ${quarkus.version} but should rely on the bom definitions. -### Shamrock already configured +### Quarkus already configured If the bom and the plugin have already been configured, the update process should terminate. An argument could be made for checking the version and potentially updating it but this would be inappropriate. Some versions might require more boilerplate and such an update might be unexpected and unwanted. ### Differing pom types @@ -60,7 +60,7 @@ If the packaging type is "jar" work should proceed as described above. If the p 1. Add the bom to the dependencesManagement section as described above. 2. Add the plugin to the pluginManagement section creating any missing nesting sections as necessary. -3. It is unecessary to add any dependencies on this level as that will be handled by updating the appropriate modules to use the shamrock plugin directly. +3. It is unecessary to add any dependencies on this level as that will be handled by updating the appropriate modules to use the quarkus plugin directly. ### Adding Extensions Adding extensions should presume the existence of a bom and the plugin. The added extensions should not explicitly declare a version. If not bom is present in the dependencyManagement section, one should be added. diff --git a/devtools/aesh/pom.xml b/devtools/aesh/pom.xml index fb5295728d87d..7e04dd8c2f4f1 100644 --- a/devtools/aesh/pom.xml +++ b/devtools/aesh/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-cli - Shamrock - Dev tools - CLI Native Tool + quarkus-cli + Quarkus - Dev tools - CLI Native Tool INFO @@ -38,8 +38,8 @@ - org.jboss.shamrock - shamrock-devtools-common + io.quarkus + quarkus-devtools-common ${project.version} @@ -72,7 +72,7 @@ true - org.jboss.shamrock.cli.ProteanCli + io.quarkus.cli.QuarkusCli @@ -155,7 +155,7 @@ --verbose -H:+ReportUnsupportedElementsAtRuntime - -H:ReflectionConfigurationFiles=../reflectconfigs/shamrockcli.json + -H:ReflectionConfigurationFiles=../reflectconfigs/quarkuscli.json -jar ${project.build.finalName}.jar diff --git a/devtools/aesh/reflectconfigs/shamrockcli.json b/devtools/aesh/reflectconfigs/shamrockcli.json index e50ac6f17b807..a5bb70bb4167a 100644 --- a/devtools/aesh/reflectconfigs/shamrockcli.json +++ b/devtools/aesh/reflectconfigs/shamrockcli.json @@ -1,6 +1,6 @@ [ { - "name" : "org.jboss.shamrock.cli.commands.AddExtensionCommand", + "name" : "io.quarkus.cli.commands.AddExtensionCommand", "allDeclaredConstructors" : true, "allPublicConstructors" : true, "allDeclaredMethods" : true, @@ -10,7 +10,7 @@ ] }, { - "name" : "org.jboss.shamrock.cli.commands.CreateProjectCommand", + "name" : "io.quarkus.cli.commands.CreateProjectCommand", "allDeclaredConstructors" : true, "allPublicConstructors" : true, "allDeclaredMethods" : true, @@ -24,7 +24,7 @@ ] }, { - "name" : "org.jboss.shamrock.cli.commands.ListExtensionsCommand", + "name" : "io.quarkus.cli.commands.ListExtensionsCommand", "allDeclaredConstructors" : true, "allPublicConstructors" : true, "allDeclaredMethods" : true, @@ -34,7 +34,7 @@ ] }, { - "name" : "org.jboss.shamrock.cli.commands.ProteanCommand", + "name" : "io.quarkus.cli.commands.QuarkusCommand", "allDeclaredConstructors" : true, "allPublicConstructors" : true, "allDeclaredMethods" : true, diff --git a/devtools/aesh/src/main/java/org/jboss/shamrock/cli/ProteanCli.java b/devtools/aesh/src/main/java/org/jboss/shamrock/cli/ProteanCli.java index 854502df9c1c9..8edd8b79763fd 100644 --- a/devtools/aesh/src/main/java/org/jboss/shamrock/cli/ProteanCli.java +++ b/devtools/aesh/src/main/java/org/jboss/shamrock/cli/ProteanCli.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.cli; +package io.quarkus.cli; import java.io.IOException; @@ -11,18 +11,18 @@ import org.aesh.command.registry.CommandRegistryException; import org.aesh.command.validator.CommandValidatorException; import org.aesh.command.validator.OptionValidatorException; -import org.jboss.shamrock.cli.commands.ProteanCommand; +import io.quarkus.cli.commands.QuarkusCommand; -public class ProteanCli { +public class QuarkusCli { public static void main(String[] args) throws CommandRegistryException { CommandRuntime runtime = AeshCommandRuntimeBuilder .builder() - .commandRegistry(AeshCommandRegistryBuilder.builder().command(ProteanCommand.class).create()) + .commandRegistry(AeshCommandRegistryBuilder.builder().command(QuarkusCommand.class).create()) .build(); if (args.length > 0) { - StringBuilder sb = new StringBuilder(ProteanCommand.COMMAND_NAME).append(" "); + StringBuilder sb = new StringBuilder(QuarkusCommand.COMMAND_NAME).append(" "); if (args.length == 1) { sb.append(args[0]); } else { @@ -53,6 +53,6 @@ private static void showHelpIfNeeded(CommandRuntime runtime, Exception e) { if (e != null) { System.err.println(e.getMessage()); } - System.err.println(runtime.commandInfo(ProteanCommand.COMMAND_NAME)); + System.err.println(runtime.commandInfo(QuarkusCommand.COMMAND_NAME)); } } diff --git a/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/AddExtensionCommand.java b/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/AddExtensionCommand.java index 4f066655803f0..9832248112ed1 100644 --- a/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/AddExtensionCommand.java +++ b/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/AddExtensionCommand.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.cli.commands; +package io.quarkus.cli.commands; import java.io.File; import java.io.IOException; @@ -12,8 +12,8 @@ import org.aesh.command.option.Argument; import org.aesh.command.option.Option; import org.aesh.io.Resource; -import org.jboss.shamrock.dependencies.Extension; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.dependencies.Extension; +import io.quarkus.maven.utilities.MojoUtils; /** * @author Ståle Pedersen @@ -33,7 +33,7 @@ public class AddExtensionCommand implements Command{ @Override public CommandResult execute(CommandInvocation commandInvocation) throws CommandException, InterruptedException { if(help) { - commandInvocation.println(commandInvocation.getHelpInfo("protean add-extension")); + commandInvocation.println(commandInvocation.getHelpInfo("quarkus add-extension")); return CommandResult.SUCCESS; } else { diff --git a/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/CreateProjectCommand.java b/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/CreateProjectCommand.java index 0f25d9e85242e..8d1859f879608 100644 --- a/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/CreateProjectCommand.java +++ b/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/CreateProjectCommand.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.cli.commands; +package io.quarkus.cli.commands; import org.aesh.command.Command; import org.aesh.command.CommandDefinition; @@ -15,7 +15,7 @@ /** * @author Ståle Pedersen */ -@CommandDefinition(name = "create-project", description = "Creates a base Shamrock maven project") +@CommandDefinition(name = "create-project", description = "Creates a base Quarkus maven project") public class CreateProjectCommand implements Command { @Option(shortName = 'h', hasValue = false) @@ -24,7 +24,7 @@ public class CreateProjectCommand implements Command { @Option(shortName = 'g', defaultValue = "com.acme") private String groupid; - @Option(shortName = 'a', defaultValue = "shamrocks") + @Option(shortName = 'a', defaultValue = "quarkuss") private String artifactid; @Option(shortName = 'v', defaultValue = "1.0.0-SNAPSHOT") @@ -35,7 +35,7 @@ public class CreateProjectCommand implements Command { public CommandResult execute(CommandInvocation commandInvocation) { if (help) { - commandInvocation.println(commandInvocation.getHelpInfo("protean create-project")); + commandInvocation.println(commandInvocation.getHelpInfo("quarkus create-project")); return CommandResult.SUCCESS; } diff --git a/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/ListExtensionsCommand.java b/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/ListExtensionsCommand.java index 93dc2551ded0a..c55cc67b26cd9 100644 --- a/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/ListExtensionsCommand.java +++ b/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/ListExtensionsCommand.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.cli.commands; +package io.quarkus.cli.commands; import org.aesh.command.Command; import org.aesh.command.CommandDefinition; @@ -8,8 +8,8 @@ import org.aesh.command.option.Argument; import org.aesh.command.option.Arguments; import org.aesh.command.option.Option; -import org.jboss.shamrock.dependencies.Extension; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.dependencies.Extension; +import io.quarkus.maven.utilities.MojoUtils; /** * @author Ståle Pedersen @@ -28,7 +28,7 @@ public class ListExtensionsCommand implements Command { public CommandResult execute(CommandInvocation commandInvocation) throws CommandException, InterruptedException { if(help) { - commandInvocation.println(commandInvocation.getHelpInfo("protean list-extensions")); + commandInvocation.println(commandInvocation.getHelpInfo("quarkus list-extensions")); } else if(name) { for(Extension ext : MojoUtils.loadExtensions()) { diff --git a/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/ProteanCommand.java b/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/ProteanCommand.java index 24c359bccfe3a..7783a5ca0405c 100644 --- a/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/ProteanCommand.java +++ b/devtools/aesh/src/main/java/org/jboss/shamrock/cli/commands/ProteanCommand.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.cli.commands; +package io.quarkus.cli.commands; import org.aesh.command.Command; import org.aesh.command.CommandException; @@ -10,19 +10,19 @@ /** * @author Ståle Pedersen */ -@GroupCommandDefinition(name = ProteanCommand.COMMAND_NAME, groupCommands = {ListExtensionsCommand.class, +@GroupCommandDefinition(name = QuarkusCommand.COMMAND_NAME, groupCommands = {ListExtensionsCommand.class, AddExtensionCommand.class, CreateProjectCommand.class}, -description = " [] \n\nThese are the common protean commands used in various situations") -public class ProteanCommand implements Command { - public static final String COMMAND_NAME = "protean"; +description = " [] \n\nThese are the common quarkus commands used in various situations") +public class QuarkusCommand implements Command { + public static final String COMMAND_NAME = "quarkus"; @Option(shortName = 'h', hasValue = false) private boolean help; public CommandResult execute(CommandInvocation commandInvocation) throws CommandException, InterruptedException { if(help) - commandInvocation.println(commandInvocation.getHelpInfo("protean")); + commandInvocation.println(commandInvocation.getHelpInfo("quarkus")); return CommandResult.SUCCESS; } diff --git a/devtools/common-core/pom.xml b/devtools/common-core/pom.xml index 3a2fe2e0fa5be..cc7bc4e300586 100644 --- a/devtools/common-core/pom.xml +++ b/devtools/common-core/pom.xml @@ -21,13 +21,13 @@ 4.0.0 - org.jboss.shamrock - shamrock-devtools-all + io.quarkus + quarkus-devtools-all 1.0.0.Alpha1-SNAPSHOT - shamrock-devtools-common-core - Shamrock - Dev tools - Common Core + quarkus-devtools-common-core + Quarkus - Dev tools - Common Core diff --git a/devtools/common-core/src/main/java/org/jboss/shamrock/dependencies/Extension.java b/devtools/common-core/src/main/java/org/jboss/shamrock/dependencies/Extension.java index 1c53331331d5f..fff6ed38ccd28 100644 --- a/devtools/common-core/src/main/java/org/jboss/shamrock/dependencies/Extension.java +++ b/devtools/common-core/src/main/java/org/jboss/shamrock/dependencies/Extension.java @@ -14,7 +14,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.jboss.shamrock.dependencies; +package io.quarkus.dependencies; import org.apache.maven.model.Dependency; diff --git a/devtools/common/pom.xml b/devtools/common/pom.xml index 2d97d18332cbc..360e0689a4e0d 100644 --- a/devtools/common/pom.xml +++ b/devtools/common/pom.xml @@ -5,13 +5,13 @@ 4.0.0 - org.jboss.shamrock - shamrock-devtools-all + io.quarkus + quarkus-devtools-all 1.0.0.Alpha1-SNAPSHOT - shamrock-devtools-common - Shamrock - Dev tools - Common Code + quarkus-devtools-common + Quarkus - Dev tools - Common Code @@ -24,7 +24,7 @@ ${project.basedir}/../../bom - shamrock-bom + quarkus-bom false pom.xml @@ -33,8 +33,8 @@ - org.jboss.shamrock - shamrock-extension-plugin + io.quarkus + quarkus-extension-plugin ${project.version} @@ -50,8 +50,8 @@ - org.jboss.shamrock - shamrock-devtools-common-core + io.quarkus + quarkus-devtools-common-core org.apache.maven diff --git a/devtools/common/src/main/filtered/extensions.json b/devtools/common/src/main/filtered/extensions.json index d1746fb0be091..98a32206ff4ba 100644 --- a/devtools/common/src/main/filtered/extensions.json +++ b/devtools/common/src/main/filtered/extensions.json @@ -5,8 +5,8 @@ "agroal", "database-connection-pool" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-agroal-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-agroal-deployment" }, { "name": "Arc", @@ -16,8 +16,8 @@ "dependency-injection", "di" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-arc-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-arc-deployment" }, { "name": "Hibernate Validator", @@ -26,8 +26,8 @@ "bean-validation", "validation" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-hibernate-validator-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-hibernate-validator-deployment" }, { "name": "SmallRye Fault Tolerance", @@ -38,8 +38,8 @@ "circuit-breaker", "bulkhead" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-smallrye-fault-tolerance-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-smallrye-fault-tolerance-deployment" }, { "name": "SmallRye Health", @@ -50,8 +50,8 @@ "microprofile-health", "microprofile-health-check" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-smallrye-health-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-smallrye-health-deployment" }, { "name": "Infinispan Client", @@ -59,8 +59,8 @@ "infinispan-client", "data-grid-client" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-infinispan-client-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-infinispan-client-deployment" }, { "name": "RESTEasy", @@ -70,8 +70,8 @@ "web", "rest" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-resteasy-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-resteasy-deployment" }, { "name": "RESTEasy - JSON-B", @@ -84,8 +84,8 @@ "json", "jsonb" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-resteasy-jsonb-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-resteasy-jsonb-deployment" }, { "name": "Hibernate ORM", @@ -94,8 +94,8 @@ "jpa", "hibernate" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-hibernate-orm-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-hibernate-orm-deployment" }, { "name": "SmallRye Metrics", @@ -106,8 +106,8 @@ "prometheus", "monitoring" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-smallrye-metrics-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-smallrye-metrics-deployment" }, { "name": "SmallRye OpenAPI", @@ -116,8 +116,8 @@ "openapi", "open-api" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-smallrye-openapi-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-smallrye-openapi-deployment" }, { "name": "SmallRye OpenTracing", @@ -128,8 +128,8 @@ "distributed-tracing", "jaeger" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-smallrye-opentracing-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-smallrye-opentracing-deployment" }, { "name": "SmallRye Reactive Streams Operators", @@ -141,8 +141,8 @@ "microprofile-reactive-streams", "reactive" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-smallrye-reactive-streams-operators-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-smallrye-reactive-streams-operators-deployment" }, { "name": "SmallRye Reactive Type Converters", @@ -154,8 +154,8 @@ "microprofile-reactive-streams", "reactive" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-smallrye-reactive-type-converters-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-smallrye-reactive-type-converters-deployment" }, { "name": "SmallRye Reactive Messaging", @@ -164,8 +164,8 @@ "reactive-messaging", "reactive" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-smallrye-reactive-messaging-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-smallrye-reactive-messaging-deployment" }, { "name": "Rest Client", @@ -174,8 +174,8 @@ "web-client", "microprofile-rest-client" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-rest-client-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-rest-client-deployment" }, { "name": "Scheduler", @@ -184,8 +184,8 @@ "tasks", "periodic-tasks" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-scheduler-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-scheduler-deployment" }, { "name": "Narayana JTA", @@ -198,8 +198,8 @@ "tx", "txs" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-narayana-jta-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-narayana-jta-deployment" }, { "name": "Undertow", @@ -207,8 +207,8 @@ "undertow", "servlet" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-undertow-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-undertow-deployment" }, { "name": "Eclipse Vert.x", @@ -218,8 +218,8 @@ "vert.x", "reactive" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-vertx-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-vertx-deployment" }, { "name": "Undertow WebSockets", @@ -231,24 +231,24 @@ "web-socket", "web-sockets" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-undertow-websockets-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-undertow-websockets-deployment" }, { "name": "Spring DI compatibility layer", "labels": [ "spring-di" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-spring-di-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-spring-di-deployment" }, { "name": "Security", "labels": [ "security" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-security-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-security-deployment" }, { "name": "SmallRye JWT", @@ -258,7 +258,7 @@ "json-web-token", "rbac" ], - "groupId": "org.jboss.shamrock", - "artifactId": "shamrock-smallrye-jwt-deployment" + "groupId": "io.quarkus", + "artifactId": "quarkus-smallrye-jwt-deployment" } ] diff --git a/devtools/common/src/main/filtered/shamrock.properties b/devtools/common/src/main/filtered/shamrock.properties index 14d40c00e9efe..953fdfadf685b 100644 --- a/devtools/common/src/main/filtered/shamrock.properties +++ b/devtools/common/src/main/filtered/shamrock.properties @@ -16,13 +16,13 @@ # # Values used in the generated projects -doc-root=http://10.0.144.40/nfs/protean -bom-artifactId=shamrock-bom +doc-root=http://10.0.144.40/nfs/quarkus +bom-artifactId=quarkus-bom # Versions defined in jboss-parent rest-assured-version=${rest-assured.version} surefire-plugin-version=${version.surefire.plugin} # Plugin metadata plugin-groupId=${project.groupId} -plugin-artifactId=shamrock-maven-plugin +plugin-artifactId=quarkus-maven-plugin plugin-version=${project.version} diff --git a/devtools/common/src/main/java/org/jboss/shamrock/BasicRest.java b/devtools/common/src/main/java/org/jboss/shamrock/BasicRest.java index 3a3f81c914b47..376b3c5f44521 100644 --- a/devtools/common/src/main/java/org/jboss/shamrock/BasicRest.java +++ b/devtools/common/src/main/java/org/jboss/shamrock/BasicRest.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock; +package io.quarkus; import org.apache.maven.model.Model; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.maven.utilities.MojoUtils; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -20,7 +20,7 @@ import static java.lang.String.format; -public class BasicRest extends ShamrockTemplate { +public class BasicRest extends QuarkusTemplate { private Map context; private String className; private String path = "/hello"; diff --git a/devtools/common/src/main/java/org/jboss/shamrock/ShamrockTemplate.java b/devtools/common/src/main/java/org/jboss/shamrock/ShamrockTemplate.java index 1d46f959feb44..d2f80a88b18a1 100644 --- a/devtools/common/src/main/java/org/jboss/shamrock/ShamrockTemplate.java +++ b/devtools/common/src/main/java/org/jboss/shamrock/ShamrockTemplate.java @@ -1,14 +1,14 @@ -package org.jboss.shamrock; +package io.quarkus; import java.io.File; import java.io.IOException; import java.util.Map; -public abstract class ShamrockTemplate { +public abstract class QuarkusTemplate { public static final String PROJECT_GROUP_ID = "project_groupId"; public static final String PROJECT_ARTIFACT_ID = "project_artifactId"; public static final String PROJECT_VERSION = "project_version"; - public static final String SHAMROCK_VERSION = "shamrock_version"; + public static final String SHAMROCK_VERSION = "quarkus_version"; public static final String PACKAGE_NAME = "package_name"; public static final String CLASS_NAME = "class_name"; public static final String RESOURCE_PATH = "path"; diff --git a/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/AddExtensions.java b/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/AddExtensions.java index 0b36e7278b4d1..156802fae950e 100644 --- a/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/AddExtensions.java +++ b/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/AddExtensions.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.cli.commands; +package io.quarkus.cli.commands; -import static org.jboss.shamrock.maven.utilities.MojoUtils.getBomArtifactId; -import static org.jboss.shamrock.maven.utilities.MojoUtils.readPom; +import static io.quarkus.maven.utilities.MojoUtils.getBomArtifactId; +import static io.quarkus.maven.utilities.MojoUtils.readPom; import java.io.File; import java.io.IOException; @@ -11,8 +11,8 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; -import org.jboss.shamrock.dependencies.Extension; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.dependencies.Extension; +import io.quarkus.maven.utilities.MojoUtils; public class AddExtensions { private Model model; @@ -73,7 +73,7 @@ public boolean addExtensions(final Set extensions) throws IOException { private List getDependenciesFromBom() { try { - return readPom(getClass().getResourceAsStream("/shamrock-bom/pom.xml")) + return readPom(getClass().getResourceAsStream("/quarkus-bom/pom.xml")) .getDependencyManagement() .getDependencies(); } catch (IOException e) { diff --git a/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/CreateProject.java b/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/CreateProject.java index a025384ce79b6..57175e23ebbe2 100644 --- a/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/CreateProject.java +++ b/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/CreateProject.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.cli.commands; +package io.quarkus.cli.commands; import org.apache.maven.model.Activation; @@ -12,8 +12,8 @@ import org.apache.maven.model.PluginExecution; import org.apache.maven.model.PluginManagement; import org.apache.maven.model.Profile; -import org.jboss.shamrock.BasicRest; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.BasicRest; +import io.quarkus.maven.utilities.MojoUtils; import java.io.File; import java.io.IOException; @@ -22,10 +22,10 @@ import java.util.Map; import java.util.Properties; -import static org.jboss.shamrock.ShamrockTemplate.*; -import static org.jboss.shamrock.maven.utilities.MojoUtils.*; -import static org.jboss.shamrock.maven.utilities.MojoUtils.configuration; -import static org.jboss.shamrock.maven.utilities.MojoUtils.plugin; +import static io.quarkus.QuarkusTemplate.*; +import static io.quarkus.maven.utilities.MojoUtils.*; +import static io.quarkus.maven.utilities.MojoUtils.configuration; +import static io.quarkus.maven.utilities.MojoUtils.plugin; /** * @author Ståle Pedersen @@ -154,7 +154,7 @@ private void addMainPluginConfig(Model model) { Plugin plugin = plugin(getPluginGroupId(), getPluginArtifactId(), SHAMROCK_VERSION_PROPERTY); if (isParentPom(model)) { addPluginManagementSection(model, plugin); - //strip the shamrockVersion off + //strip the quarkusVersion off plugin = plugin(getPluginGroupId(), getPluginArtifactId()); } PluginExecution pluginExec = new PluginExecution(); @@ -212,7 +212,7 @@ private void addVersionProperty(Model model) { properties = new Properties(); model.setProperties(properties); } - properties.putIfAbsent("shamrock.version", getPluginVersion()); + properties.putIfAbsent("quarkus.version", getPluginVersion()); } private boolean isParentPom(Model model) { diff --git a/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/ListExtensions.java b/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/ListExtensions.java index 139b68d87292a..9fd2e836e4577 100644 --- a/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/ListExtensions.java +++ b/devtools/common/src/main/java/org/jboss/shamrock/cli/commands/ListExtensions.java @@ -1,11 +1,11 @@ -package org.jboss.shamrock.cli.commands; +package io.quarkus.cli.commands; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.Model; -import org.jboss.shamrock.dependencies.Extension; -import org.jboss.shamrock.maven.utilities.MojoUtils; -import org.jboss.shamrock.maven.utilities.ShamrockDependencyPredicate; +import io.quarkus.dependencies.Extension; +import io.quarkus.maven.utilities.MojoUtils; +import io.quarkus.maven.utilities.QuarkusDependencyPredicate; import java.util.Collections; import java.util.List; @@ -13,9 +13,9 @@ import java.util.TreeMap; import static java.util.stream.Collectors.toList; -import static org.jboss.shamrock.maven.utilities.MojoUtils.credentials; -import static org.jboss.shamrock.maven.utilities.MojoUtils.getPluginVersion; -import static org.jboss.shamrock.maven.utilities.MojoUtils.loadExtensions; +import static io.quarkus.maven.utilities.MojoUtils.credentials; +import static io.quarkus.maven.utilities.MojoUtils.getPluginVersion; +import static io.quarkus.maven.utilities.MojoUtils.loadExtensions; public class ListExtensions { private static final String FORMAT = "%-8s %-20s %-50s %s"; @@ -26,7 +26,7 @@ public ListExtensions(final Model model) { } public void listExtensions() { - System.out.println("\nCurrent Shamrock extensions available: "); + System.out.println("\nCurrent Quarkus extensions available: "); System.out.println(String.format(FORMAT, "Status", "Extension", "ArtifactId", "Updated Version")); final Map installed = findInstalled(); @@ -84,7 +84,7 @@ private Map mapDependencies(final List dependenc if (dependencies != null) { final List listed = dependencies.stream() - .filter(new ShamrockDependencyPredicate()) + .filter(new QuarkusDependencyPredicate()) .collect(toList()); listed.forEach(d -> { diff --git a/devtools/common/src/main/java/org/jboss/shamrock/maven/utilities/MojoUtils.java b/devtools/common/src/main/java/org/jboss/shamrock/maven/utilities/MojoUtils.java index e228b4021e510..6069d281dd916 100644 --- a/devtools/common/src/main/java/org/jboss/shamrock/maven/utilities/MojoUtils.java +++ b/devtools/common/src/main/java/org/jboss/shamrock/maven/utilities/MojoUtils.java @@ -15,7 +15,7 @@ * permissions and limitations under the License. */ -package org.jboss.shamrock.maven.utilities; +package io.quarkus.maven.utilities; import com.fasterxml.jackson.core.JsonParser; @@ -29,7 +29,7 @@ import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import org.jboss.shamrock.dependencies.Extension; +import io.quarkus.dependencies.Extension; import java.io.File; import java.io.FileInputStream; @@ -47,7 +47,7 @@ public class MojoUtils { public static final String JAVA_EXTENSION = ".java"; - private static final String PLUGIN_VERSION_PROPERTY_NAME = "shamrock.version"; + private static final String PLUGIN_VERSION_PROPERTY_NAME = "quarkus.version"; public static final String SHAMROCK_VERSION_PROPERTY = "${" + PLUGIN_VERSION_PROPERTY_NAME + "}"; private static final Properties properties = new Properties(); @@ -84,12 +84,12 @@ public static String getBomArtifactId() { } private static void loadProperties() { - URL url = MojoUtils.class.getClassLoader().getResource("shamrock.properties"); + URL url = MojoUtils.class.getClassLoader().getResource("quarkus.properties"); Objects.requireNonNull(url); try (InputStream in = url.openStream()) { properties.load(in); } catch (IOException e) { - throw new IllegalStateException("The shamrock.properties file cannot be read", e); + throw new IllegalStateException("The quarkus.properties file cannot be read", e); } } diff --git a/devtools/common/src/main/java/org/jboss/shamrock/maven/utilities/ShamrockDependencyPredicate.java b/devtools/common/src/main/java/org/jboss/shamrock/maven/utilities/ShamrockDependencyPredicate.java index c1cc61c062491..2abd7cb948ef8 100644 --- a/devtools/common/src/main/java/org/jboss/shamrock/maven/utilities/ShamrockDependencyPredicate.java +++ b/devtools/common/src/main/java/org/jboss/shamrock/maven/utilities/ShamrockDependencyPredicate.java @@ -1,12 +1,12 @@ -package org.jboss.shamrock.maven.utilities; +package io.quarkus.maven.utilities; import org.apache.maven.model.Dependency; import java.util.function.Predicate; -import static org.jboss.shamrock.maven.utilities.MojoUtils.getPluginGroupId; +import static io.quarkus.maven.utilities.MojoUtils.getPluginGroupId; -public class ShamrockDependencyPredicate implements Predicate { +public class QuarkusDependencyPredicate implements Predicate { @Override public boolean test(final Dependency d) { return d.getGroupId().equalsIgnoreCase(getPluginGroupId()); diff --git a/devtools/common/src/main/resources/templates/dockerfile.ftl b/devtools/common/src/main/resources/templates/dockerfile.ftl index 7cfee130fbb47..fa4f3ba3c959f 100644 --- a/devtools/common/src/main/resources/templates/dockerfile.ftl +++ b/devtools/common/src/main/resources/templates/dockerfile.ftl @@ -5,11 +5,11 @@ # # Then, build the image with: # -# docker build -f src/main/docker/Dockerfile -t shamrock/${project_artifactId} . +# docker build -f src/main/docker/Dockerfile -t quarkus/${project_artifactId} . # # Then run the container using: # -# docker run -i --rm -p 8080:8080 shamrock/${project_artifactId} +# docker run -i --rm -p 8080:8080 quarkus/${project_artifactId} # ### FROM registry.fedoraproject.org/fedora-minimal @@ -17,4 +17,4 @@ WORKDIR /work/ COPY target/*-runner /work/application RUN chmod 775 /work EXPOSE 8080 -CMD ["./application", "-Dshamrock.http.host=0.0.0.0"] \ No newline at end of file +CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] \ No newline at end of file diff --git a/devtools/common/src/main/resources/templates/index.ftl b/devtools/common/src/main/resources/templates/index.ftl index ff0f5d8e256fd..28e982275848c 100644 --- a/devtools/common/src/main/resources/templates/index.ftl +++ b/devtools/common/src/main/resources/templates/index.ftl @@ -105,16 +105,16 @@

-

Congratulations, you have created a new Shamrock application.

+

Congratulations, you have created a new Quarkus application.

Why do you see this?

-

This page is served by Shamrock. The source is in +

This page is served by Quarkus. The source is in src/main/resources/META-INF/resources/index.html.

What can I do from here?

-

If not already done, run the application in dev mode using: mvn compile shamrock:dev. +

If not already done, run the application in dev mode using: mvn compile quarkus:dev.

  • Add REST resources, Servlets, functions and other services in src/main/java.
    • @@ -133,7 +133,7 @@
  • GroupId: ${project_groupId}
  • ArtifactId: ${project_artifactId}
  • Version: ${project_version}
    • -
  • Shamrock Version: ${shamrock_version}
    • +
  • Quarkus Version: ${quarkus_version}
diff --git a/devtools/common/src/main/resources/templates/native-test-resource-template.ftl b/devtools/common/src/main/resources/templates/native-test-resource-template.ftl index f4478ab1793e3..c228cd1d785cc 100644 --- a/devtools/common/src/main/resources/templates/native-test-resource-template.ftl +++ b/devtools/common/src/main/resources/templates/native-test-resource-template.ftl @@ -1,6 +1,6 @@ package ${package_name}; -import org.jboss.shamrock.test.junit.SubstrateTest; +import io.quarkus.test.junit.SubstrateTest; @SubstrateTest public class Native${class_name}IT extends ${class_name}Test { diff --git a/devtools/common/src/main/resources/templates/pom-template.ftl b/devtools/common/src/main/resources/templates/pom-template.ftl index 0f0c4ea945cfe..c0705bcd525e3 100644 --- a/devtools/common/src/main/resources/templates/pom-template.ftl +++ b/devtools/common/src/main/resources/templates/pom-template.ftl @@ -11,7 +11,7 @@ 1.8 1.8 - ${shamrock_version} + ${quarkus_version} ${rest_assured_version} ${surefire_plugin_version} @@ -21,7 +21,7 @@ ${plugin_groupId} ${bom_artifactId} - ${shamrock.version} + ${quarkus.version} pom import @@ -30,18 +30,18 @@ - org.jboss.shamrock - shamrock-resteasy-deployment + io.quarkus + quarkus-resteasy-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-junit5 + io.quarkus + quarkus-junit5 io.rest-assured @@ -56,7 +56,7 @@ ${plugin_groupId} ${plugin_artifactId} - ${shamrock.version} + ${quarkus.version} @@ -86,7 +86,7 @@ ${plugin_groupId} ${plugin_artifactId} - ${shamrock.version} + ${quarkus.version} diff --git a/devtools/common/src/main/resources/templates/test-resource-template.ftl b/devtools/common/src/main/resources/templates/test-resource-template.ftl index cf0f0e20e2ed4..d1b78cbd0e87d 100644 --- a/devtools/common/src/main/resources/templates/test-resource-template.ftl +++ b/devtools/common/src/main/resources/templates/test-resource-template.ftl @@ -1,12 +1,12 @@ package ${package_name}; -import org.jboss.shamrock.test.junit.ShamrockTest; +import io.quarkus.test.junit.QuarkusTest; import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; -@ShamrockTest +@QuarkusTest public class ${class_name}Test { @Test diff --git a/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/AddExtensionsTest.java b/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/AddExtensionsTest.java index ea75c769f942f..af47d8023557d 100644 --- a/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/AddExtensionsTest.java +++ b/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/AddExtensionsTest.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.cli.commands; +package io.quarkus.cli.commands; import static java.util.Arrays.asList; @@ -8,7 +8,7 @@ import java.util.HashSet; import org.apache.maven.model.Model; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.maven.utilities.MojoUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -28,9 +28,9 @@ public void addExtension() throws IOException { .addExtensions(new HashSet<>(asList("agroal", "arc", " hibernate-validator"))); Model model = MojoUtils.readPom(pom); - hasDependency(model, "shamrock-agroal-deployment"); - hasDependency(model, "shamrock-arc-deployment"); - hasDependency(model, "shamrock-hibernate-validator-deployment"); + hasDependency(model, "quarkus-agroal-deployment"); + hasDependency(model, "quarkus-arc-deployment"); + hasDependency(model, "quarkus-hibernate-validator-deployment"); } private void hasDependency(final Model model, final String artifactId) { diff --git a/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/CreateProjectTest.java b/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/CreateProjectTest.java index 73dda0b71f374..28604f0ea1237 100644 --- a/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/CreateProjectTest.java +++ b/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/CreateProjectTest.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.cli.commands; +package io.quarkus.cli.commands; import org.apache.commons.io.FileUtils; import org.apache.maven.model.Model; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.maven.utilities.MojoUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -16,14 +16,14 @@ import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; -import static org.jboss.shamrock.maven.utilities.MojoUtils.*; +import static io.quarkus.maven.utilities.MojoUtils.*; public class CreateProjectTest { @Test public void create() throws IOException { final File file = new File("target/basic-rest"); delete(file); - final CreateProject createProject = new CreateProject(file).groupId("org.jboss.shamrock") + final CreateProject createProject = new CreateProject(file).groupId("io.quarkus") .artifactId("basic-rest") .version("1.0.0-SNAPSHOT"); diff --git a/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/ListExtensionsTest.java b/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/ListExtensionsTest.java index 7861acd7cbaf2..2dd0506b3a702 100644 --- a/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/ListExtensionsTest.java +++ b/devtools/common/src/test/java/org/jboss/shamrock/cli/commands/ListExtensionsTest.java @@ -1,9 +1,9 @@ -package org.jboss.shamrock.cli.commands; +package io.quarkus.cli.commands; import static java.util.Arrays.asList; -import static org.jboss.shamrock.maven.utilities.MojoUtils.getPluginGroupId; -import static org.jboss.shamrock.maven.utilities.MojoUtils.getPluginVersion; -import static org.jboss.shamrock.maven.utilities.MojoUtils.readPom; +import static io.quarkus.maven.utilities.MojoUtils.getPluginGroupId; +import static io.quarkus.maven.utilities.MojoUtils.getPluginVersion; +import static io.quarkus.maven.utilities.MojoUtils.readPom; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; @@ -16,8 +16,8 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; -import org.jboss.shamrock.maven.utilities.MojoUtils; -import org.jboss.shamrock.maven.utilities.ShamrockDependencyPredicate; +import io.quarkus.maven.utilities.MojoUtils; +import io.quarkus.maven.utilities.QuarkusDependencyPredicate; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -45,7 +45,7 @@ public void listWithBom() throws IOException { final Map installed = listExtensions.findInstalled(); - Assertions.assertNotNull(installed.get(getPluginGroupId() + ":shamrock-agroal-deployment")); + Assertions.assertNotNull(installed.get(getPluginGroupId() + ":quarkus-agroal-deployment")); } /** @@ -76,8 +76,8 @@ public void listWithBomExtensionWithSpaces() throws IOException { final Map installed = listExtensions.findInstalled(); - Assertions.assertNotNull(installed.get(getPluginGroupId() + ":shamrock-resteasy-deployment")); - Assertions.assertNotNull(installed.get(getPluginGroupId() + ":shamrock-hibernate-validator-deployment")); + Assertions.assertNotNull(installed.get(getPluginGroupId() + ":quarkus-resteasy-deployment")); + Assertions.assertNotNull(installed.get(getPluginGroupId() + ":quarkus-hibernate-validator-deployment")); } @Test @@ -97,7 +97,7 @@ public void listWithoutBom() throws IOException { model.setDependencyManagement(null); model.getDependencies().stream() - .filter(new ShamrockDependencyPredicate()) + .filter(new QuarkusDependencyPredicate()) .forEach(d -> d.setVersion("0.0.1")); MojoUtils.write(model, pom); diff --git a/devtools/extension-plugin/pom.xml b/devtools/extension-plugin/pom.xml index dda3317b9985c..0da298e20f4ee 100644 --- a/devtools/extension-plugin/pom.xml +++ b/devtools/extension-plugin/pom.xml @@ -19,16 +19,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-extension-plugin + quarkus-extension-plugin maven-plugin - Shamrock - Extension Maven plugin + Quarkus - Extension Maven plugin @@ -47,8 +47,8 @@ - org.jboss.shamrock - shamrock-devtools-common-core + io.quarkus + quarkus-devtools-common-core com.fasterxml.jackson.core diff --git a/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/AbstractExtensionMojo.java b/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/AbstractExtensionMojo.java index 561c175b3b0f4..225ff7e5fb9a3 100644 --- a/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/AbstractExtensionMojo.java +++ b/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/AbstractExtensionMojo.java @@ -14,14 +14,14 @@ * permissions and limitations under the License. */ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.*; -import org.jboss.shamrock.dependencies.Extension; +import io.quarkus.dependencies.Extension; import javax.inject.Inject; import java.util.Collections; @@ -90,7 +90,7 @@ private void buildProjects() throws MojoExecutionException { } private MavenProject findRoot(MavenProject current) { - if (current.getArtifactId().equals("shamrock-parent")) { + if (current.getArtifactId().equals("quarkus-parent")) { return current; } return findRoot(current.getParent()); diff --git a/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/ExtensionRegistry.java b/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/ExtensionRegistry.java index eb2370e2a9e71..ba88f014ee0c8 100644 --- a/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/ExtensionRegistry.java +++ b/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/ExtensionRegistry.java @@ -14,10 +14,10 @@ * permissions and limitations under the License. */ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import org.apache.maven.project.MavenProject; -import org.jboss.shamrock.dependencies.Extension; +import io.quarkus.dependencies.Extension; import java.util.HashMap; import java.util.Map; @@ -26,10 +26,10 @@ * @author Ken Finnigan */ class ExtensionRegistry { - private static final String EXTENSION_NAME_PROPERTY_NAME = "shamrock.extension.name"; - private static final String EXTENSION_DESC_PROPERTY_NAME = "shamrock.extension.desc"; - private static final String EXTENSION_LABELS_PROPERTY_NAME = "shamrock.extension.labels"; - private static final String EXTENSION_INTERNAL_PROPERTY_NAME = "shamrock.extension.internal"; + private static final String EXTENSION_NAME_PROPERTY_NAME = "quarkus.extension.name"; + private static final String EXTENSION_DESC_PROPERTY_NAME = "quarkus.extension.desc"; + private static final String EXTENSION_LABELS_PROPERTY_NAME = "quarkus.extension.labels"; + private static final String EXTENSION_INTERNAL_PROPERTY_NAME = "quarkus.extension.internal"; private Map extensionRegistry = new HashMap<>(); diff --git a/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/extensionlist/ExtensionListMojo.java b/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/extensionlist/ExtensionListMojo.java index ab7247a0b483b..a857c7106aae6 100644 --- a/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/extensionlist/ExtensionListMojo.java +++ b/devtools/extension-plugin/src/main/java/org/jboss/shamrock/maven/extensionlist/ExtensionListMojo.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.jboss.shamrock.maven.extensionlist; +package io.quarkus.maven.extensionlist; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; @@ -27,8 +27,8 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; -import org.jboss.shamrock.dependencies.Extension; -import org.jboss.shamrock.maven.AbstractExtensionMojo; +import io.quarkus.dependencies.Extension; +import io.quarkus.maven.AbstractExtensionMojo; import java.io.BufferedWriter; import java.io.File; diff --git a/devtools/maven/pom.xml b/devtools/maven/pom.xml index a98e4c49abb69..c52551a10acb6 100644 --- a/devtools/maven/pom.xml +++ b/devtools/maven/pom.xml @@ -19,25 +19,25 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-maven-plugin + quarkus-maven-plugin maven-plugin - Shamrock - Maven Plugin + Quarkus - Maven Plugin - ${project.version} + ${project.version} - org.jboss.shamrock - shamrock-devtools-common + io.quarkus + quarkus-devtools-common org.apache.maven @@ -54,12 +54,12 @@ provided - org.jboss.shamrock - shamrock-creator + io.quarkus + quarkus-creator - org.jboss.shamrock - shamrock-development-mode + io.quarkus + quarkus-development-mode org.apache.maven.shared @@ -173,7 +173,7 @@ maven-plugin-plugin 3.5.2 - shamrock + quarkus true diff --git a/devtools/maven/src/it/setup-on-existing-pom-it/pom.xml b/devtools/maven/src/it/setup-on-existing-pom-it/pom.xml index ee1007f936728..7f0ac9d302958 100644 --- a/devtools/maven/src/it/setup-on-existing-pom-it/pom.xml +++ b/devtools/maven/src/it/setup-on-existing-pom-it/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.acme - shamrock-setup-demo + quarkus-setup-demo 0.1-SNAPSHOT jar diff --git a/devtools/maven/src/it/setup-on-existing-pom-it/verify.groovy b/devtools/maven/src/it/setup-on-existing-pom-it/verify.groovy index 10c5ff3a683ca..3f3d9962a537e 100644 --- a/devtools/maven/src/it/setup-on-existing-pom-it/verify.groovy +++ b/devtools/maven/src/it/setup-on-existing-pom-it/verify.groovy @@ -1,4 +1,4 @@ -import org.jboss.shamrock.maven.it.assertions.SetupVerifier +import io.quarkus.maven.it.assertions.SetupVerifier String base = basedir File pomFile = new File(base, "pom.xml") diff --git a/devtools/maven/src/it/setup-on-min-pom-it/pom.xml b/devtools/maven/src/it/setup-on-min-pom-it/pom.xml index c1812e524ac72..80316a5e21def 100644 --- a/devtools/maven/src/it/setup-on-min-pom-it/pom.xml +++ b/devtools/maven/src/it/setup-on-min-pom-it/pom.xml @@ -20,6 +20,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.acme - shamrock-setup-demo + quarkus-setup-demo 0.1-SNAPSHOT diff --git a/devtools/maven/src/it/setup-on-min-pom-it/verify.groovy b/devtools/maven/src/it/setup-on-min-pom-it/verify.groovy index 10c5ff3a683ca..3f3d9962a537e 100644 --- a/devtools/maven/src/it/setup-on-min-pom-it/verify.groovy +++ b/devtools/maven/src/it/setup-on-min-pom-it/verify.groovy @@ -1,4 +1,4 @@ -import org.jboss.shamrock.maven.it.assertions.SetupVerifier +import io.quarkus.maven.it.assertions.SetupVerifier String base = basedir File pomFile = new File(base, "pom.xml") diff --git a/devtools/maven/src/it/setup-with-custom-shamrock-version-it/invoker.properties b/devtools/maven/src/it/setup-with-custom-shamrock-version-it/invoker.properties index 3ef60fed3b388..a5c371114a7e7 100644 --- a/devtools/maven/src/it/setup-with-custom-shamrock-version-it/invoker.properties +++ b/devtools/maven/src/it/setup-with-custom-shamrock-version-it/invoker.properties @@ -1 +1 @@ -invoker.goals=${project.groupId}:${project.artifactId}:${project.version}:create -DshamrockVersion=0.0.0 +invoker.goals=${project.groupId}:${project.artifactId}:${project.version}:create -DquarkusVersion=0.0.0 diff --git a/devtools/maven/src/it/setup-with-custom-shamrock-version-it/pom.xml b/devtools/maven/src/it/setup-with-custom-shamrock-version-it/pom.xml index fe00970d71b2f..6e6f390ce3fcf 100644 --- a/devtools/maven/src/it/setup-with-custom-shamrock-version-it/pom.xml +++ b/devtools/maven/src/it/setup-with-custom-shamrock-version-it/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.acme - shamrock-setup-demo + quarkus-setup-demo 0.1-SNAPSHOT diff --git a/devtools/maven/src/it/setup-with-custom-shamrock-version-it/verify.groovy b/devtools/maven/src/it/setup-with-custom-shamrock-version-it/verify.groovy index fdb2df792b645..d91ecc6b3149a 100644 --- a/devtools/maven/src/it/setup-with-custom-shamrock-version-it/verify.groovy +++ b/devtools/maven/src/it/setup-with-custom-shamrock-version-it/verify.groovy @@ -1,4 +1,4 @@ -import org.jboss.shamrock.maven.it.assertions.SetupVerifier +import io.quarkus.maven.it.assertions.SetupVerifier String base = basedir File pomFile = new File(base, "pom.xml") diff --git a/devtools/maven/src/main/java/org/jboss/shamrock/maven/AddExtensionMojo.java b/devtools/maven/src/main/java/org/jboss/shamrock/maven/AddExtensionMojo.java index 789a6b1262081..15b8b8b85a954 100644 --- a/devtools/maven/src/main/java/org/jboss/shamrock/maven/AddExtensionMojo.java +++ b/devtools/maven/src/main/java/org/jboss/shamrock/maven/AddExtensionMojo.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import java.io.IOException; import java.util.Set; @@ -10,13 +10,13 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; -import org.jboss.shamrock.cli.commands.AddExtensions; +import io.quarkus.cli.commands.AddExtensions; @Mojo(name = "add-extension") public class AddExtensionMojo extends AbstractMojo { /** - * The Maven project which will define and configure the shamrock-maven-plugin + * The Maven project which will define and configure the quarkus-maven-plugin */ @Parameter(defaultValue = "${project}") protected MavenProject project; diff --git a/devtools/maven/src/main/java/org/jboss/shamrock/maven/AnalyseCallTreeMojo.java b/devtools/maven/src/main/java/org/jboss/shamrock/maven/AnalyseCallTreeMojo.java index bfd5238cf7749..59ccd5bc7e615 100644 --- a/devtools/maven/src/main/java/org/jboss/shamrock/maven/AnalyseCallTreeMojo.java +++ b/devtools/maven/src/main/java/org/jboss/shamrock/maven/AnalyseCallTreeMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import java.io.File; @@ -23,7 +23,7 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; -import org.jboss.shamrock.creator.phase.nativeimage.ReportAnalyzer; +import io.quarkus.creator.phase.nativeimage.ReportAnalyzer; @Mojo(name = "analyze-call-tree") public class AnalyseCallTreeMojo extends AbstractMojo { diff --git a/devtools/maven/src/main/java/org/jboss/shamrock/maven/BuildMojo.java b/devtools/maven/src/main/java/org/jboss/shamrock/maven/BuildMojo.java index d00cfcb5ca777..426d03dc0ec72 100644 --- a/devtools/maven/src/main/java/org/jboss/shamrock/maven/BuildMojo.java +++ b/devtools/maven/src/main/java/org/jboss/shamrock/maven/BuildMojo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import java.io.File; import java.util.List; @@ -31,15 +31,15 @@ import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.repository.RemoteRepository; -import org.jboss.shamrock.creator.AppArtifact; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.AppDependency; -import org.jboss.shamrock.creator.phase.augment.AugmentPhase; -import org.jboss.shamrock.creator.phase.curate.CurateOutcome; -import org.jboss.shamrock.creator.phase.runnerjar.RunnerJarOutcome; -import org.jboss.shamrock.creator.phase.runnerjar.RunnerJarPhase; -import org.jboss.shamrock.creator.resolver.maven.ResolvedMavenArtifactDeps; +import io.quarkus.creator.AppArtifact; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.AppDependency; +import io.quarkus.creator.phase.augment.AugmentPhase; +import io.quarkus.creator.phase.curate.CurateOutcome; +import io.quarkus.creator.phase.runnerjar.RunnerJarOutcome; +import io.quarkus.creator.phase.runnerjar.RunnerJarPhase; +import io.quarkus.creator.resolver.maven.ResolvedMavenArtifactDeps; /** * @@ -115,7 +115,7 @@ public class BuildMojo extends AbstractMojo { @Parameter(defaultValue = "${project.build.finalName}") private String finalName; - @Parameter(defaultValue = "org.jboss.shamrock.runner.GeneratedMain") + @Parameter(defaultValue = "io.quarkus.runner.GeneratedMain") private String mainClass; @Parameter(defaultValue = "true") diff --git a/devtools/maven/src/main/java/org/jboss/shamrock/maven/CopyUtils.java b/devtools/maven/src/main/java/org/jboss/shamrock/maven/CopyUtils.java index fc2d028c01344..87fc1d7322c7b 100644 --- a/devtools/maven/src/main/java/org/jboss/shamrock/maven/CopyUtils.java +++ b/devtools/maven/src/main/java/org/jboss/shamrock/maven/CopyUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/devtools/maven/src/main/java/org/jboss/shamrock/maven/CreateProjectMojo.java b/devtools/maven/src/main/java/org/jboss/shamrock/maven/CreateProjectMojo.java index 1d545d6524bb3..90511ee27fb2c 100644 --- a/devtools/maven/src/main/java/org/jboss/shamrock/maven/CreateProjectMojo.java +++ b/devtools/maven/src/main/java/org/jboss/shamrock/maven/CreateProjectMojo.java @@ -15,7 +15,7 @@ * permissions and limitations under the License. */ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import static org.fusesource.jansi.Ansi.ansi; @@ -35,20 +35,20 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.fusesource.jansi.Ansi; -import org.jboss.shamrock.cli.commands.AddExtensions; -import org.jboss.shamrock.cli.commands.CreateProject; -import org.jboss.shamrock.maven.components.Prompter; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.cli.commands.AddExtensions; +import io.quarkus.cli.commands.CreateProject; +import io.quarkus.maven.components.Prompter; +import io.quarkus.maven.utilities.MojoUtils; /** - * This goal helps in setting up Shamrock Maven project with shamrock-maven-plugin, with sensible defaults + * This goal helps in setting up Quarkus Maven project with quarkus-maven-plugin, with sensible defaults */ @Mojo(name = "create", requiresProject = false) public class CreateProjectMojo extends AbstractMojo { public static final String PLUGIN_KEY = MojoUtils.getPluginGroupId() + ":" + MojoUtils.getPluginArtifactId(); - private static final String DEFAULT_GROUP_ID = "org.acme.shamrock.sample"; + private static final String DEFAULT_GROUP_ID = "org.acme.quarkus.sample"; @Parameter(defaultValue = "${project}") protected MavenProject project; @@ -144,7 +144,7 @@ private void askTheUserForMissingValues() throws MojoExecutionException { projectGroupId = DEFAULT_GROUP_ID; } if (StringUtils.isBlank(projectArtifactId)) { - projectArtifactId = "my-shamrock-project"; + projectArtifactId = "my-quarkus-project"; } if (StringUtils.isBlank(projectVersion)) { projectVersion = "1.0-SNAPSHOT"; @@ -160,11 +160,11 @@ private void askTheUserForMissingValues() throws MojoExecutionException { if (StringUtils.isBlank(projectArtifactId)) { projectArtifactId = prompter.promptWithDefaultValue("Set the project artifactId", - "my-shamrock-project"); + "my-quarkus-project"); } if (StringUtils.isBlank(projectVersion)) { - projectVersion = prompter.promptWithDefaultValue("Set the Shamrock version", + projectVersion = prompter.promptWithDefaultValue("Set the Quarkus version", "1.0-SNAPSHOT"); } @@ -235,7 +235,7 @@ private void printUserInstructions(File root) { getLog().info(ansi().a("Navigate into this directory and launch your application with ") .bold() .fg(Ansi.Color.CYAN) - .a("mvn compile shamrock:dev") + .a("mvn compile quarkus:dev") .reset() .toString()); getLog().info( diff --git a/devtools/maven/src/main/java/org/jboss/shamrock/maven/DevMojo.java b/devtools/maven/src/main/java/org/jboss/shamrock/maven/DevMojo.java index a5b94b7ed2863..652a8531029a3 100644 --- a/devtools/maven/src/main/java/org/jboss/shamrock/maven/DevMojo.java +++ b/devtools/maven/src/main/java/org/jboss/shamrock/maven/DevMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import java.io.File; import java.io.FileOutputStream; @@ -46,18 +46,18 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; -import org.jboss.shamrock.dev.ClassLoaderCompiler; -import org.jboss.shamrock.dev.DevModeMain; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.dev.ClassLoaderCompiler; +import io.quarkus.dev.DevModeMain; +import io.quarkus.maven.utilities.MojoUtils; /** - * The dev mojo, that runs a shamrock app in a forked process + * The dev mojo, that runs a quarkus app in a forked process *

*/ @Mojo(name = "dev", defaultPhase = LifecyclePhase.PREPARE_PACKAGE, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME) public class DevMojo extends AbstractMojo { - private static final String RESOURCES_PROP = "shamrock.undertow.resources"; + private static final String RESOURCES_PROP = "quarkus.undertow.resources"; /** * The directory for compiled classes. @@ -125,9 +125,9 @@ public void execute() throws MojoFailureException { } } if(!found) { - getLog().warn("The shamrock-maven-plugin build goal was not configured for this project, " + - "skipping shamrock:dev as this is assumed to be a support library. If you want to run shamrock dev" + - " on this project make sure the shamrock-maven-plugin is configured with a build goal."); + getLog().warn("The quarkus-maven-plugin build goal was not configured for this project, " + + "skipping quarkus:dev as this is assumed to be a support library. If you want to run quarkus dev" + + " on this project make sure the quarkus-maven-plugin is configured with a build goal."); return; } @@ -136,7 +136,7 @@ public void execute() throws MojoFailureException { } if (! buildDir.isDirectory() || ! new File(buildDir, "classes").isDirectory()) { - throw new MojoFailureException("The project has no output yet, run `mvn compile shamrock:dev`."); + throw new MojoFailureException("The project has no output yet, run `mvn compile quarkus:dev`."); } try { @@ -175,7 +175,7 @@ public void execute() throws MojoFailureException { } //we don't want to just copy every system property, as a lot of them are set by the JVM for(Map.Entry i: System.getProperties().entrySet()) { - if(i.getKey().toString().startsWith("shamrock.")) { + if(i.getKey().toString().startsWith("quarkus.")) { args.add("-D" + i.getKey() + "=" + i.getValue()); } } @@ -255,10 +255,10 @@ public void execute() throws MojoFailureException { outputDirectory.mkdirs(); - args.add("-Dshamrock.runner.classes=" + outputDirectory.getAbsolutePath()); - args.add("-Dshamrock.runner.sources=" + sourceDir.getAbsolutePath()); + args.add("-Dquarkus.runner.classes=" + outputDirectory.getAbsolutePath()); + args.add("-Dquarkus.runner.sources=" + sourceDir.getAbsolutePath()); if(resources != null) { - args.add("-Dshamrock.runner.resources=" + new File(resources).getAbsolutePath()); + args.add("-Dquarkus.runner.resources=" + new File(resources).getAbsolutePath()); } args.add("-jar"); args.add(tempFile.getAbsolutePath()); @@ -272,7 +272,7 @@ public void execute() throws MojoFailureException { pb.directory(outputDirectory); Process p = pb.start(); - //https://github.com/jbossas/protean-shamrock/issues/232 + //https://github.com/jbossas/quarkus/issues/232 Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() { @Override public void run() { diff --git a/devtools/maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java b/devtools/maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java index 7283fa368a88c..36ed4fb397c58 100644 --- a/devtools/maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java +++ b/devtools/maven/src/main/java/org/jboss/shamrock/maven/ExampleConfigMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import java.io.File; import java.io.FileOutputStream; @@ -62,7 +62,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { continue; } try (ZipFile zip = openZipFile(a)) { - ZipEntry deps = zip.getEntry("META-INF/shamrock-descriptions.properties"); + ZipEntry deps = zip.getEntry("META-INF/quarkus-descriptions.properties"); if (deps != null) { try (InputStream in = zip.getInputStream(deps)) { properties.load(in); @@ -71,7 +71,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { } } - StringBuilder sb = new StringBuilder("Example shamrock config\n\n"); + StringBuilder sb = new StringBuilder("Example quarkus config\n\n"); for(Map.Entry e : new TreeMap( properties).entrySet()) { sb.append("# ") .append(e.getValue().toString().replace("\n", " ")) diff --git a/devtools/maven/src/main/java/org/jboss/shamrock/maven/ListExtensionsMojo.java b/devtools/maven/src/main/java/org/jboss/shamrock/maven/ListExtensionsMojo.java index e0b30201ed593..58fec9d6c8987 100644 --- a/devtools/maven/src/main/java/org/jboss/shamrock/maven/ListExtensionsMojo.java +++ b/devtools/maven/src/main/java/org/jboss/shamrock/maven/ListExtensionsMojo.java @@ -1,9 +1,9 @@ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugins.annotations.Mojo; -import org.jboss.shamrock.cli.commands.AddExtensions; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.cli.commands.AddExtensions; +import io.quarkus.maven.utilities.MojoUtils; @Mojo(name = "list-extensions", requiresProject = false) public class ListExtensionsMojo extends AbstractMojo { @@ -16,6 +16,6 @@ public void execute() { .forEach(ext -> getLog().info("\t * " + ext.getName() + " (" + ext.getGroupId() + ":" + ext.getArtifactId() + ")")); getLog().info("\nAdd an extension to your project by adding the dependency to your " + - "project or use `mvn shamrock:add-extension -Dextensions=\"name\"`"); + "project or use `mvn quarkus:add-extension -Dextensions=\"name\"`"); } } diff --git a/devtools/maven/src/main/java/org/jboss/shamrock/maven/MojoLogger.java b/devtools/maven/src/main/java/org/jboss/shamrock/maven/MojoLogger.java index f79f1151ec9e5..f5eb316ed701f 100644 --- a/devtools/maven/src/main/java/org/jboss/shamrock/maven/MojoLogger.java +++ b/devtools/maven/src/main/java/org/jboss/shamrock/maven/MojoLogger.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import java.text.MessageFormat; import java.util.Collections; diff --git a/devtools/maven/src/main/java/org/jboss/shamrock/maven/NativeImageMojo.java b/devtools/maven/src/main/java/org/jboss/shamrock/maven/NativeImageMojo.java index 31bdb611d80a4..d3aa37eb075bc 100644 --- a/devtools/maven/src/main/java/org/jboss/shamrock/maven/NativeImageMojo.java +++ b/devtools/maven/src/main/java/org/jboss/shamrock/maven/NativeImageMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.maven; +package io.quarkus.maven; import java.io.File; import java.nio.file.Path; @@ -27,13 +27,13 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; -import org.jboss.shamrock.creator.AppCreator; -import org.jboss.shamrock.creator.AppCreatorException; -import org.jboss.shamrock.creator.AppDependency; -import org.jboss.shamrock.creator.phase.augment.AugmentOutcome; -import org.jboss.shamrock.creator.phase.nativeimage.NativeImageOutcome; -import org.jboss.shamrock.creator.phase.nativeimage.NativeImagePhase; -import org.jboss.shamrock.creator.phase.runnerjar.RunnerJarOutcome; +import io.quarkus.creator.AppCreator; +import io.quarkus.creator.AppCreatorException; +import io.quarkus.creator.AppDependency; +import io.quarkus.creator.phase.augment.AugmentOutcome; +import io.quarkus.creator.phase.nativeimage.NativeImageOutcome; +import io.quarkus.creator.phase.nativeimage.NativeImagePhase; +import io.quarkus.creator.phase.runnerjar.RunnerJarOutcome; @Mojo(name = "native-image", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution = ResolutionScope.RUNTIME) public class NativeImageMojo extends AbstractMojo { diff --git a/devtools/maven/src/main/java/org/jboss/shamrock/maven/components/Prompter.java b/devtools/maven/src/main/java/org/jboss/shamrock/maven/components/Prompter.java index f3c4c8bbb7361..b9a592c608577 100644 --- a/devtools/maven/src/main/java/org/jboss/shamrock/maven/components/Prompter.java +++ b/devtools/maven/src/main/java/org/jboss/shamrock/maven/components/Prompter.java @@ -14,7 +14,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.jboss.shamrock.maven.components; +package io.quarkus.maven.components; import jline.console.ConsoleReader; import org.apache.commons.lang3.StringUtils; diff --git a/devtools/maven/src/main/resources/META-INF/services/org.jboss.logging.LoggerProvider b/devtools/maven/src/main/resources/META-INF/services/org.jboss.logging.LoggerProvider index 5e1294f17483f..6f953c389688d 100644 --- a/devtools/maven/src/main/resources/META-INF/services/org.jboss.logging.LoggerProvider +++ b/devtools/maven/src/main/resources/META-INF/services/org.jboss.logging.LoggerProvider @@ -1 +1 @@ -org.jboss.shamrock.maven.MojoLogger \ No newline at end of file +io.quarkus.maven.MojoLogger \ No newline at end of file diff --git a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/CreateProjectMojoIT.java b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/CreateProjectMojoIT.java index 7b3cf3484b502..2ab4c32e4fef0 100644 --- a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/CreateProjectMojoIT.java +++ b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/CreateProjectMojoIT.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.maven.it; +package io.quarkus.maven.it; import com.google.common.base.Charsets; import com.google.common.io.Files; @@ -9,9 +9,9 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.shared.invoker.*; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import org.jboss.shamrock.maven.CreateProjectMojo; -import org.jboss.shamrock.maven.it.verifier.RunningInvoker; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.maven.CreateProjectMojo; +import io.quarkus.maven.it.verifier.RunningInvoker; +import io.quarkus.maven.utilities.MojoUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -73,12 +73,12 @@ public void testProjectGenerationFromScratch() throws MavenInvocationException, final List dependencies = dependencyManagement.getDependencies(); assertThat(dependencies.stream().anyMatch(d -> d.getArtifactId().equalsIgnoreCase(MojoUtils.getBomArtifactId()) - && d.getVersion().equalsIgnoreCase("${shamrock.version}") + && d.getVersion().equalsIgnoreCase("${quarkus.version}") && d.getScope().equalsIgnoreCase("import") && d.getType().equalsIgnoreCase("pom"))).isTrue(); assertThat(model.getDependencies().stream().anyMatch(d -> - d.getArtifactId().equalsIgnoreCase("shamrock-resteasy-deployment") + d.getArtifactId().equalsIgnoreCase("quarkus-resteasy-deployment") && d.getVersion() == null)).isTrue(); assertThat(model.getProfiles()).hasSize(1); @@ -116,7 +116,7 @@ public void testProjectGenerationFromEmptyPom() throws Exception { Model model = load(testDir); assertThat(model.getDependencyManagement().getDependencies().stream().anyMatch(d -> d.getArtifactId().equalsIgnoreCase(MojoUtils.getBomArtifactId()) - && d.getVersion().equalsIgnoreCase("${shamrock.version}") + && d.getVersion().equalsIgnoreCase("${quarkus.version}") && d.getScope().equalsIgnoreCase("import") && d.getType().equalsIgnoreCase("pom"))).isTrue(); @@ -155,7 +155,7 @@ public void testProjectGenerationFromMinimalPomWithResource() throws Exception { properties.put("className", "org.acme.MyResource.java"); setup(properties); - check(new File(testDir, "pom.xml"), "shamrock.version"); + check(new File(testDir, "pom.xml"), "quarkus.version"); assertThat(new File(testDir, "src/main/java")).isDirectory(); @@ -183,21 +183,21 @@ public void testProjectGenerationFromScratchWithExtensions() throws Exception { check(new File(testDir, "src/main/java/org/acme/MyResource.java"), "package org.acme;"); assertThat(FileUtils.readFileToString(new File(testDir, "pom.xml"), "UTF-8")) - .contains("shamrock-resteasy-deployment", "shamrock-smallrye-metrics-deployment").doesNotContain("missing"); + .contains("quarkus-resteasy-deployment", "quarkus-smallrye-metrics-deployment").doesNotContain("missing"); Model model = load(testDir); assertThat(model.getDependencyManagement().getDependencies().stream().anyMatch(d -> d.getArtifactId().equalsIgnoreCase(MojoUtils.getBomArtifactId()) - && d.getVersion().equalsIgnoreCase("${shamrock.version}") + && d.getVersion().equalsIgnoreCase("${quarkus.version}") && d.getScope().equalsIgnoreCase("import") && d.getType().equalsIgnoreCase("pom"))).isTrue(); assertThat(model.getDependencies().stream().anyMatch(d -> - d.getArtifactId().equalsIgnoreCase("shamrock-resteasy-deployment") + d.getArtifactId().equalsIgnoreCase("quarkus-resteasy-deployment") && d.getVersion() == null)).isTrue(); assertThat(model.getDependencies().stream().anyMatch(d -> - d.getArtifactId().equalsIgnoreCase("shamrock-smallrye-metrics-deployment") + d.getArtifactId().equalsIgnoreCase("quarkus-smallrye-metrics-deployment") && d.getVersion() == null)).isTrue(); } @@ -224,12 +224,12 @@ public void testProjectGenerationFromScratchWithCustomDependencies() throws Exce Model model = load(testDir); assertThat(model.getDependencyManagement().getDependencies().stream().anyMatch(d -> d.getArtifactId().equalsIgnoreCase(MojoUtils.getBomArtifactId()) - && d.getVersion().equalsIgnoreCase("${shamrock.version}") + && d.getVersion().equalsIgnoreCase("${quarkus.version}") && d.getScope().equalsIgnoreCase("import") && d.getType().equalsIgnoreCase("pom"))).isTrue(); assertThat(model.getDependencies().stream().anyMatch(d -> - d.getArtifactId().equalsIgnoreCase("shamrock-resteasy-deployment") + d.getArtifactId().equalsIgnoreCase("quarkus-resteasy-deployment") && d.getVersion() == null)).isTrue(); assertThat(model.getDependencies().stream().anyMatch(d -> @@ -252,7 +252,7 @@ public void testProjectGenerationFromMinimalPomWithDependencies() throws Excepti } /** - * Reproducer for https://github.com/jbossas/protean-shamrock/issues/671 + * Reproducer for https://github.com/jbossas/quarkus/issues/671 */ @Test public void testThatDefaultPackageAreReplaced() throws Exception { @@ -263,13 +263,13 @@ public void testThatDefaultPackageAreReplaced() throws Exception { properties.put("className", "MyGreatResource"); setup(properties); // As the directory is not empty (log) navigate to the artifactID directory - testDir = new File(testDir, "my-shamrock-project"); - check(new File(testDir, "src/main/java/org/acme/shamrock/sample/MyGreatResource.java"), "package org.acme.shamrock.sample;"); + testDir = new File(testDir, "my-quarkus-project"); + check(new File(testDir, "src/main/java/org/acme/quarkus/sample/MyGreatResource.java"), "package org.acme.quarkus.sample;"); } /** - * Reproducer for https://github.com/jbossas/protean-shamrock/issues/673 + * Reproducer for https://github.com/jbossas/quarkus/issues/673 */ @Test public void testThatGenerationFailedWhenTheUserPassGAVonExistingPom() throws Exception { @@ -314,7 +314,7 @@ public void generateNewProjectAndRun() throws Exception { // As the directory is not empty (log) navigate to the artifactID directory testDir = new File(testDir, "acme"); running = new RunningInvoker(testDir, false); - running.execute(Arrays.asList("compile", "shamrock:dev"), Collections.emptyMap()); + running.execute(Arrays.asList("compile", "quarkus:dev"), Collections.emptyMap()); String resp = getHttpResponse(); diff --git a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/DevMojoIT.java b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/DevMojoIT.java index 29957d21839a6..906814a7993ec 100644 --- a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/DevMojoIT.java +++ b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/DevMojoIT.java @@ -1,10 +1,10 @@ -package org.jboss.shamrock.maven.it; +package io.quarkus.maven.it; import com.google.common.collect.ImmutableMap; import org.apache.commons.io.FileUtils; import org.apache.maven.shared.invoker.MavenInvocationException; -import org.jboss.shamrock.maven.it.verifier.MavenProcessInvocationResult; -import org.jboss.shamrock.maven.it.verifier.RunningInvoker; +import io.quarkus.maven.it.verifier.MavenProcessInvocationResult; +import io.quarkus.maven.it.verifier.RunningInvoker; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -99,7 +99,7 @@ public void testThatTheApplicationIsReloadedOnNewResource() throws MavenInvocati } @Test - @Disabled("Issue https://github.com/protean-project/shamrock/issues/245") + @Disabled("Issue https://github.com/quarkus-project/quarkus/issues/245") public void testThatTheApplicationIsReloadedOnNewServlet() throws MavenInvocationException, IOException { testDir = initProject("projects/classic", "projects/project-classic-run-new-servlet"); runAndCheck(); @@ -144,7 +144,7 @@ public void testThatTheApplicationIsReloadedOnNewServlet() throws MavenInvocatio private void runAndCheck() throws FileNotFoundException, MavenInvocationException { assertThat(testDir).isDirectory(); running = new RunningInvoker(testDir, false); - running.execute(Arrays.asList("compile", "shamrock:dev"), Collections.emptyMap()); + running.execute(Arrays.asList("compile", "quarkus:dev"), Collections.emptyMap()); String resp = getHttpResponse(); @@ -160,7 +160,7 @@ public void testThatTheApplicationIsReloadedOnConfigChange() throws MavenInvocat testDir = initProject("projects/classic", "projects/project-classic-run-config-change"); assertThat(testDir).isDirectory(); running = new RunningInvoker(testDir, false); - running.execute(Arrays.asList("compile", "shamrock:dev"), Collections.emptyMap()); + running.execute(Arrays.asList("compile", "quarkus:dev"), Collections.emptyMap()); String resp = getHttpResponse(); @@ -292,7 +292,7 @@ public void testErrorMessageWhenNoJavaSources() throws IOException, MavenInvocat testDir = initProject("projects/classic", "projects/project-no-sources"); FileUtils.deleteQuietly(new File(testDir, "src/main/java")); running = new RunningInvoker(testDir, false); - MavenProcessInvocationResult result = running.execute(Arrays.asList("compile", "shamrock:dev"), Collections.emptyMap()); + MavenProcessInvocationResult result = running.execute(Arrays.asList("compile", "quarkus:dev"), Collections.emptyMap()); await().until(() -> result.getProcess() != null && ! result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD FAILURE"); } @@ -302,7 +302,7 @@ public void testErrorMessageWhenNoTarget() throws IOException, MavenInvocationEx testDir = initProject("projects/classic", "projects/project-no-target"); FileUtils.deleteQuietly(new File(testDir, "target")); running = new RunningInvoker(testDir, false); - MavenProcessInvocationResult result = running.execute(Collections.singletonList("shamrock:dev"), Collections.emptyMap()); + MavenProcessInvocationResult result = running.execute(Collections.singletonList("quarkus:dev"), Collections.emptyMap()); await().until(() -> result.getProcess() != null && ! result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD FAILURE"); } @@ -315,7 +315,7 @@ public void testErrorMessageWhenNoTargetClasses() throws IOException, MavenInvoc FileUtils.deleteQuietly(new File(testDir, "target/classes")); running = new RunningInvoker(testDir, false); - MavenProcessInvocationResult result = running.execute(Collections.singletonList("shamrock:dev"), Collections.emptyMap()); + MavenProcessInvocationResult result = running.execute(Collections.singletonList("quarkus:dev"), Collections.emptyMap()); await().until(() -> result.getProcess() != null && ! result.getProcess().isAlive()); assertThat(running.log()).containsIgnoringCase("BUILD FAILURE"); } diff --git a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/ExtensionListIT.java b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/ExtensionListIT.java index 3f685f8c17ab5..38ed11e6eee02 100644 --- a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/ExtensionListIT.java +++ b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/ExtensionListIT.java @@ -14,14 +14,14 @@ * permissions and limitations under the License. */ -package org.jboss.shamrock.maven.it; +package io.quarkus.maven.it; import com.google.common.collect.ImmutableMap; import org.apache.commons.io.FileUtils; import org.apache.maven.shared.invoker.MavenInvocationException; import org.apache.maven.shared.utils.StringUtils; -import org.jboss.shamrock.maven.it.verifier.MavenProcessInvocationResult; -import org.jboss.shamrock.maven.it.verifier.RunningInvoker; +import io.quarkus.maven.it.verifier.MavenProcessInvocationResult; +import io.quarkus.maven.it.verifier.RunningInvoker; import org.junit.jupiter.api.Test; import java.io.File; @@ -117,17 +117,17 @@ static void filter(File input, Map variables) throws IOException } public static void installPluginToLocalRepository(File local) { - File repo = new File(local, "org/jboss/shamrock/shamrock-extension-plugin/" + System.getProperty("project.version")); + File repo = new File(local, "io.quarkus/quarkus-extension-plugin/" + System.getProperty("project.version")); if (!repo.isDirectory()) { boolean mkdirs = repo.mkdirs(); Logger.getLogger(ExtensionListIT.class.getName()) .log(Level.FINE, repo.getAbsolutePath() + " created? " + mkdirs); } - File plugin = new File("target", "shamrock-extension-plugin-" + System.getProperty("project.version") + ".jar"); + File plugin = new File("target", "quarkus-extension-plugin-" + System.getProperty("project.version") + ".jar"); if (!plugin.isFile()) { File[] files = new File("target").listFiles( - file -> file.getName().startsWith("shamrock-extension-plugin") && file.getName().endsWith(".jar")); + file -> file.getName().startsWith("quarkus-extension-plugin") && file.getName().endsWith(".jar")); if (files != null && files.length != 0) { plugin = files[0]; } @@ -135,7 +135,7 @@ public static void installPluginToLocalRepository(File local) { try { FileUtils.copyFileToDirectory(plugin, repo); - String installedPomName = "shamrock-extension-plugin-" + System.getProperty("project.version") + ".pom"; + String installedPomName = "quarkus-extension-plugin-" + System.getProperty("project.version") + ".pom"; FileUtils.copyFile(new File("pom.xml"), new File(repo, installedPomName)); } catch (IOException e) { throw new RuntimeException("Cannot copy the plugin jar, or the pom file, to the local repository", e); diff --git a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/MojoTestBase.java b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/MojoTestBase.java index 11e7b94258b88..4c511d4bd4ed2 100644 --- a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/MojoTestBase.java +++ b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/MojoTestBase.java @@ -1,11 +1,11 @@ -package org.jboss.shamrock.maven.it; +package io.quarkus.maven.it; import com.google.common.collect.ImmutableMap; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.maven.shared.utils.StringUtils; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.maven.utilities.MojoUtils; import org.junit.jupiter.api.BeforeAll; import java.io.File; diff --git a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/PackageIT.java b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/PackageIT.java index 40c8fd75d1346..faf015c79f361 100644 --- a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/PackageIT.java +++ b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/PackageIT.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.maven.it; +package io.quarkus.maven.it; import org.apache.maven.shared.invoker.MavenInvocationException; -import org.jboss.shamrock.maven.it.verifier.MavenProcessInvocationResult; -import org.jboss.shamrock.maven.it.verifier.RunningInvoker; +import io.quarkus.maven.it.verifier.MavenProcessInvocationResult; +import io.quarkus.maven.it.verifier.RunningInvoker; import org.junit.jupiter.api.Test; import java.io.File; diff --git a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/assertions/JarVerifier.java b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/assertions/JarVerifier.java index 72a1ec492d01b..9cc3e4df8f97a 100644 --- a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/assertions/JarVerifier.java +++ b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/assertions/JarVerifier.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.maven.it.assertions; +package io.quarkus.maven.it.assertions; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/assertions/SetupVerifier.java b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/assertions/SetupVerifier.java index bd809410dde47..b0c3b04e9d6d6 100644 --- a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/assertions/SetupVerifier.java +++ b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/assertions/SetupVerifier.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.maven.it.assertions; +package io.quarkus.maven.it.assertions; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -16,8 +16,8 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.xml.Xpp3Dom; -import org.jboss.shamrock.maven.CreateProjectMojo; -import org.jboss.shamrock.maven.utilities.MojoUtils; +import io.quarkus.maven.CreateProjectMojo; +import io.quarkus.maven.utilities.MojoUtils; public class SetupVerifier { @@ -54,7 +54,7 @@ public static void verifySetup(File pomFile) throws Exception { //Check if the properties have been set correctly Properties properties = model.getProperties(); - assertThat(properties.containsKey("shamrock.version")).isTrue(); + assertThat(properties.containsKey("quarkus.version")).isTrue(); // Check plugin is set Plugin plugin = maybe.orElseThrow(() -> new AssertionError("Plugin expected")); @@ -92,7 +92,7 @@ public static void verifySetupWithVersion(File pomFile) throws Exception { Properties projectProps = project.getProperties(); assertNotNull(projectProps); assertFalse(projectProps.isEmpty()); - assertEquals(MojoUtils.getPluginVersion(), projectProps.getProperty("shamrock.version")); + assertEquals(MojoUtils.getPluginVersion(), projectProps.getProperty("quarkus.version")); } } diff --git a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/MavenProcessInvocationResult.java b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/MavenProcessInvocationResult.java index 29ec8b106fac2..c1efc316d64df 100644 --- a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/MavenProcessInvocationResult.java +++ b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/MavenProcessInvocationResult.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.maven.it.verifier; +package io.quarkus.maven.it.verifier; import org.apache.maven.shared.invoker.InvocationRequest; import org.apache.maven.shared.invoker.InvocationResult; diff --git a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/MavenProcessInvoker.java b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/MavenProcessInvoker.java index 331217b726d1d..a1b0348aa15b0 100644 --- a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/MavenProcessInvoker.java +++ b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/MavenProcessInvoker.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.maven.it.verifier; +package io.quarkus.maven.it.verifier; import org.apache.maven.shared.invoker.*; import org.apache.maven.shared.utils.cli.CommandLineException; diff --git a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/RunningInvoker.java b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/RunningInvoker.java index 98693b7d35073..8c17ac4e28ab1 100644 --- a/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/RunningInvoker.java +++ b/devtools/maven/src/test/java/org/jboss/shamrock/maven/it/verifier/RunningInvoker.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.maven.it.verifier; +package io.quarkus.maven.it.verifier; import org.apache.commons.io.FileUtils; @@ -11,7 +11,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.jboss.shamrock.maven.it.MojoTestBase.installPluginToLocalRepository; +import static io.quarkus.maven.it.MojoTestBase.installPluginToLocalRepository; /** * Implementation of verifier using a forked process that is still running while verifying. The process is stop when @@ -53,7 +53,7 @@ public void stop() { List list = JProcesses.getProcessList().stream().filter(pi -> // Kill all process using the live reload and the live reload process. // This might be too much - pi.getCommand().contains("shamrock:dev") || pi.getCommand().contains(getWorkingDirectory().getAbsolutePath())) + pi.getCommand().contains("quarkus:dev") || pi.getCommand().contains(getWorkingDirectory().getAbsolutePath())) .collect(Collectors.toList()); list.stream() diff --git a/devtools/maven/src/test/resources/projects/classic/pom.xml b/devtools/maven/src/test/resources/projects/classic/pom.xml index 6f8f2a8650ae1..4685fcd84d0e8 100644 --- a/devtools/maven/src/test/resources/projects/classic/pom.xml +++ b/devtools/maven/src/test/resources/projects/classic/pom.xml @@ -6,7 +6,7 @@ acme 1.0-SNAPSHOT - @project.version@ + @project.version@ 1.8 UTF-8 1.8 @@ -14,20 +14,20 @@ @project.groupId@ - shamrock-resteasy-deployment - ${shamrock.version} + quarkus-resteasy-deployment + ${quarkus.version} provided @project.groupId@ - shamrock-arc-deployment - ${shamrock.version} + quarkus-arc-deployment + ${quarkus.version} provided @project.groupId@ - shamrock-junit5 - ${shamrock.version} + quarkus-junit5 + ${quarkus.version} test @@ -42,7 +42,7 @@ @project.groupId@ @project.artifactId@ - ${shamrock.version} + ${quarkus.version} @@ -61,7 +61,7 @@ @project.groupId@ @project.artifactId@ - ${shamrock.version} + ${quarkus.version} diff --git a/devtools/maven/src/test/resources/projects/classic/src/main/resources/META-INF/resources/index.html b/devtools/maven/src/test/resources/projects/classic/src/main/resources/META-INF/resources/index.html index 065a9b94fbaef..6461774f63538 100644 --- a/devtools/maven/src/test/resources/projects/classic/src/main/resources/META-INF/resources/index.html +++ b/devtools/maven/src/test/resources/projects/classic/src/main/resources/META-INF/resources/index.html @@ -105,16 +105,16 @@

-

Congratulations, you have created a new Shamrock application.

+

Congratulations, you have created a new Quarkus application.

Why do you see this?

-

This page is served by Shamrock. The source is in +

This page is served by Quarkus. The source is in src/main/resources/META-INF/resources/index.html.

What can I do from here?

-

If not already done, run the application in dev mode using: mvn compile shamrock:dev. +

If not already done, run the application in dev mode using: mvn compile quarkus:dev.

  • Add REST resources, Servlets, functions and other services in src/main/java.
    • @@ -133,7 +133,7 @@

    Application

  • GroupId: org.acme
  • ArtifactId: acme
  • Version: 1.0-SNAPSHOT
    • -
  • Shamrock Version: 1.0.0.Alpha1-SNAPSHOT
    • +
  • Quarkus Version: 1.0.0.Alpha1-SNAPSHOT
diff --git a/devtools/maven/src/test/resources/projects/classic/src/test/java/org/acme/HelloResourceTest.java b/devtools/maven/src/test/resources/projects/classic/src/test/java/org/acme/HelloResourceTest.java index 4774e04428be5..c2f29e2c9f711 100644 --- a/devtools/maven/src/test/resources/projects/classic/src/test/java/org/acme/HelloResourceTest.java +++ b/devtools/maven/src/test/resources/projects/classic/src/test/java/org/acme/HelloResourceTest.java @@ -1,12 +1,12 @@ package org.acme; -import org.jboss.shamrock.test.junit.ShamrockTest; +import io.quarkus.test.junit.QuarkusTest; import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; -@ShamrockTest +@QuarkusTest public class HelloResourceTest { @Test diff --git a/devtools/maven/src/test/resources/projects/extension-check/dummy-extension-deployment/pom.xml b/devtools/maven/src/test/resources/projects/extension-check/dummy-extension-deployment/pom.xml index 34e1df57f827f..ad5eab60a8ea6 100644 --- a/devtools/maven/src/test/resources/projects/extension-check/dummy-extension-deployment/pom.xml +++ b/devtools/maven/src/test/resources/projects/extension-check/dummy-extension-deployment/pom.xml @@ -21,17 +21,17 @@ org.acme - shamrock-parent + quarkus-parent 1.0-SNAPSHOT ../pom.xml dummy-extension-deployment - Agroal - Description of the Agroal extension - agroal,database-connection-pool,jsf - false + Agroal + Description of the Agroal extension + agroal,database-connection-pool,jsf + false 1.8 UTF-8 diff --git a/devtools/maven/src/test/resources/projects/extension-check/extension-list/pom.xml b/devtools/maven/src/test/resources/projects/extension-check/extension-list/pom.xml index 86f9145a5ab4b..aab3927cd4c28 100644 --- a/devtools/maven/src/test/resources/projects/extension-check/extension-list/pom.xml +++ b/devtools/maven/src/test/resources/projects/extension-check/extension-list/pom.xml @@ -21,7 +21,7 @@ org.acme - shamrock-parent + quarkus-parent 1.0-SNAPSHOT ../pom.xml @@ -36,8 +36,8 @@ - org.jboss.shamrock - shamrock-extension-plugin + io.quarkus + quarkus-extension-plugin @project.version@ diff --git a/devtools/maven/src/test/resources/projects/extension-check/pom.xml b/devtools/maven/src/test/resources/projects/extension-check/pom.xml index a2df8ff41eb65..cc51e24c28c3a 100644 --- a/devtools/maven/src/test/resources/projects/extension-check/pom.xml +++ b/devtools/maven/src/test/resources/projects/extension-check/pom.xml @@ -19,7 +19,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.acme - shamrock-parent + quarkus-parent 1.0-SNAPSHOT pom diff --git a/devtools/maven/src/test/resources/projects/uberjar-check/pom.xml b/devtools/maven/src/test/resources/projects/uberjar-check/pom.xml index 6d0d461251710..25486c33aa308 100644 --- a/devtools/maven/src/test/resources/projects/uberjar-check/pom.xml +++ b/devtools/maven/src/test/resources/projects/uberjar-check/pom.xml @@ -6,7 +6,7 @@ acme 1.0-SNAPSHOT - @project.version@ + @project.version@ 1.8 UTF-8 1.8 @@ -14,20 +14,20 @@ @project.groupId@ - shamrock-resteasy-deployment - ${shamrock.version} + quarkus-resteasy-deployment + ${quarkus.version} provided @project.groupId@ - shamrock-arc-deployment - ${shamrock.version} + quarkus-arc-deployment + ${quarkus.version} provided @project.groupId@ - shamrock-junit5 - ${shamrock.version} + quarkus-junit5 + ${quarkus.version} test @@ -42,7 +42,7 @@ @project.groupId@ @project.artifactId@ - ${shamrock.version} + ${quarkus.version} @@ -64,7 +64,7 @@ @project.groupId@ @project.artifactId@ - ${shamrock.version} + ${quarkus.version} diff --git a/devtools/maven/src/test/resources/projects/uberjar-check/src/main/resources/META-INF/resources/index.html b/devtools/maven/src/test/resources/projects/uberjar-check/src/main/resources/META-INF/resources/index.html index 065a9b94fbaef..6461774f63538 100644 --- a/devtools/maven/src/test/resources/projects/uberjar-check/src/main/resources/META-INF/resources/index.html +++ b/devtools/maven/src/test/resources/projects/uberjar-check/src/main/resources/META-INF/resources/index.html @@ -105,16 +105,16 @@
-

Congratulations, you have created a new Shamrock application.

+

Congratulations, you have created a new Quarkus application.

Why do you see this?

-

This page is served by Shamrock. The source is in +

This page is served by Quarkus. The source is in src/main/resources/META-INF/resources/index.html.

What can I do from here?

-

If not already done, run the application in dev mode using: mvn compile shamrock:dev. +

If not already done, run the application in dev mode using: mvn compile quarkus:dev.

  • Add REST resources, Servlets, functions and other services in src/main/java.
    • @@ -133,7 +133,7 @@

    Application

  • GroupId: org.acme
  • ArtifactId: acme
  • Version: 1.0-SNAPSHOT
    • -
  • Shamrock Version: 1.0.0.Alpha1-SNAPSHOT
    • +
  • Quarkus Version: 1.0.0.Alpha1-SNAPSHOT
diff --git a/devtools/pom.xml b/devtools/pom.xml index a74d1f893f531..65d86ced076c4 100644 --- a/devtools/pom.xml +++ b/devtools/pom.xml @@ -21,15 +21,15 @@ 4.0.0 - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../build-parent/pom.xml - shamrock-devtools-all + quarkus-devtools-all pom - Shamrock - Devtools + Quarkus - Devtools INFO diff --git a/docker/centos-graal-native-image/README.md b/docker/centos-graal-native-image/README.md index 0a862c01740a7..707eb5a7d34ca 100644 --- a/docker/centos-graal-native-image/README.md +++ b/docker/centos-graal-native-image/README.md @@ -1,11 +1,11 @@ # Build ```bash -docker build -t protean/graalvm-native-image:latest . +docker build -t quarkus/graalvm-native-image:latest . ``` # Run ```bash -docker run -it -v /path/to/protean/arc:/project --rm protean/graalvm-native-image -jar example/target/arc-example-shaded.jar +docker run -it -v /path/to/quarkus/arc:/project --rm quarkus/graalvm-native-image -jar example/target/arc-example-shaded.jar ``` diff --git a/docker/distroless/README.md b/docker/distroless/README.md index 780ec9efbba5f..2e77d8585cd83 100644 --- a/docker/distroless/README.md +++ b/docker/distroless/README.md @@ -1,6 +1,6 @@ # Distroless base image -This project creates a [distroless image](https://github.com/GoogleContainerTools/distroless) suitable to run Shamrock applications. +This project creates a [distroless image](https://github.com/GoogleContainerTools/distroless) suitable to run Quarkus applications. This image contains a minimal Linux, glibc-based system. It contains: @@ -30,19 +30,19 @@ Then, create the following `Dockerfile`: FROM cescoffier/native-base:latest COPY target/*-runner /application EXPOSE 8080 -CMD ["./application", "-Dshamrock.http.host=0.0.0.0"] +CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] ``` Build the docker image using (change the namespace/name): ```bash -docker build -t protean-demo/demo . +docker build -t quarkus-demo/demo . ``` You can then run your application using: ```bash -docker run -i --rm -p 8080:8080 protean-demo/demo +docker run -i --rm -p 8080:8080 quarkus-demo/demo ``` ## Build diff --git a/docker/distroless/WORKSPACE b/docker/distroless/WORKSPACE index 69da12bc1c2de..4e5ff2ba3fc90 100755 --- a/docker/distroless/WORKSPACE +++ b/docker/distroless/WORKSPACE @@ -1,4 +1,4 @@ -workspace(name = "org_jboss_shamrock_distroless") +workspace(name = "io_quarkus_distroless") load("//:dependencies.bzl", "distroless_bazel_repositories") diff --git a/docker/integration-test-main/Dockerfile b/docker/integration-test-main/Dockerfile index 26cba204f9f87..028332f5a4e60 100644 --- a/docker/integration-test-main/Dockerfile +++ b/docker/integration-test-main/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora-minimal WORKDIR /work -COPY target/shamrock-integration-test-main-1.0.0.Alpha1-SNAPSHOT-runner /work/shamrock-integration-test-main-runner +COPY target/quarkus-integration-test-main-1.0.0.Alpha1-SNAPSHOT-runner /work/quarkus-integration-test-main-runner RUN chmod 777 /work EXPOSE 8080 ENV DATASOURCE_URL ${DATASOURCE_URL} -ENTRYPOINT ["/work/shamrock-integration-test-main-runner", "-Xmx30m", "-Xmn25m", "-Dshamrock.http.host=0.0.0.0" ] +ENTRYPOINT ["/work/quarkus-integration-test-main-runner", "-Xmx30m", "-Xmn25m", "-Dquarkus.http.host=0.0.0.0" ] diff --git a/docs/assembly.xml b/docs/assembly.xml index d8c58bed10a1d..22d3ad5466f7c 100644 --- a/docs/assembly.xml +++ b/docs/assembly.xml @@ -17,7 +17,7 @@ - shamrock-docs + quarkus-docs zip tar.gz diff --git a/docs/pom.xml b/docs/pom.xml index 62b0eeb4b4a7a..45c96893fd384 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,21 +21,21 @@ 4.0.0 - org.jboss.shamrock - shamrock-build-parent + io.quarkus + quarkus-build-parent 1.0.0.Alpha1-SNAPSHOT ../build-parent/pom.xml - shamrock-documentation + quarkus-documentation pom 1.5.7 - Shamrock - Documentation - The shamrock documentation + Quarkus - Documentation + The quarkus documentation @@ -48,11 +48,11 @@ ${version.asciidoctor} - ${project.version} + ${project.version} ${version.surefire.plugin} ${graal-sdk.version-for-documentation} ${rest-assured.version} - Protean + Quarkus @@ -96,7 +96,7 @@ assembly.xml true - shamrock-docs-${project.version} + quarkus-docs-${project.version} false target/ target/assembly/work diff --git a/docs/src/main/asciidoc/application-configuration-guide.adoc b/docs/src/main/asciidoc/application-configuration-guide.adoc index ec36d38c76bd3..8706c8392ff52 100644 --- a/docs/src/main/asciidoc/application-configuration-guide.adoc +++ b/docs/src/main/asciidoc/application-configuration-guide.adoc @@ -19,7 +19,7 @@ Remember, you need to configure Maven as indicated in the link:maven-config.html We recommend you to follow the instructions in the next sections and create the application step by step. However, you can go right to the completed example. -Clone the Git repository: `git clone https://github.com/jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone https://github.com/jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. The solution is located in the `application-configuration` directory. @@ -29,7 +29,7 @@ First, we need a new project. Create a new project with the following command: [source, subs=attributes+] ---- -mvn org.jboss.shamrock:shamrock-maven-plugin:${shamrock-version}:create \ +mvn io.quarkus:quarkus-maven-plugin:${quarkus-version}:create \ -DprojectGroupId=org.acme \ -DprojectArtifactId=application-configuration \ -DclassName="org.acme.config.GreetingResource" \ @@ -47,7 +47,7 @@ It generates: == Injecting configuration value -Shamrock uses https://microprofile.io/project/eclipse/microprofile-config[MicroProfile Config] to inject the configuration in the application. +Quarkus uses https://microprofile.io/project/eclipse/microprofile-config[MicroProfile Config] to inject the configuration in the application. The injection uses 2 annotations: `@Inject` and `@ConfigProperty`: [source,java] @@ -92,14 +92,14 @@ public String hello() { == Create the configuration -By default, Shamrock reads `META-INF/microprofile-config.properties`. +By default, Quarkus reads `META-INF/microprofile-config.properties`. Edit the `src/main/resources/META-INF/microprofile-config.properties` with the following content: [source] ---- # Your configuration properties greeting.message = hello -greeting.name = shamrock +greeting.name = quarkus ---- Once set, check the application with: @@ -107,7 +107,7 @@ Once set, check the application with: [source] ---- $ curl http://localhost:8080/greeting -hello shamrock! +hello quarkus! ---- TIP: If the application requires configuration values and these values are not set, an error is thrown. @@ -123,13 +123,13 @@ Edit the `src/test/java/org/acme/config/GreetingResourceTest.java` file and chan ---- package org.acme.config; -import org.jboss.shamrock.test.junit.ShamrockTest; +import io.quarkus.test.junit.QuarkusTest; import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; -@ShamrockTest +@QuarkusTest public class GreetingResourceTest { @Test @@ -138,7 +138,7 @@ public class GreetingResourceTest { .when().get("/greeting") .then() .statusCode(200) - .body(is("hello shamrock!")); // Modified line + .body(is("hello quarkus!")); // Modified line } } @@ -146,7 +146,7 @@ public class GreetingResourceTest { == Package and run the application -Run the application with: `mvn compile shamrock:dev`. +Run the application with: `mvn compile quarkus:dev`. Open your browser to http://localhost:8080/greeting. Changing the configuration file is immediately reflected. diff --git a/docs/src/main/asciidoc/application-lifecycle-events-guide.adoc b/docs/src/main/asciidoc/application-lifecycle-events-guide.adoc index 68d1c6ef1e279..2053f9f071294 100644 --- a/docs/src/main/asciidoc/application-lifecycle-events-guide.adoc +++ b/docs/src/main/asciidoc/application-lifecycle-events-guide.adoc @@ -22,7 +22,7 @@ Remember, you need to configure Maven as indicated in the link:maven-config.html We recommend you to follow the instructions in the next sections and create the application step by step. However, you can go right to the completed example. -Clone the Git repository: `git clone https://github.com/jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone https://github.com/jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. The solution is located in the `application-lifecycle-events` directory. @@ -32,7 +32,7 @@ First, we need a new project. Create a new project with the following command: [source, subs=attributes+] ---- -mvn org.jboss.shamrock:shamrock-maven-plugin:{shamrock-version}:create \ +mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \ -DprojectGroupId=org.acme \ -DprojectArtifactId=application-lifecycle-events \ -DclassName="org.acme.events.GreetingResource" \ @@ -60,8 +60,8 @@ package org.acme.events; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import org.jboss.shamrock.runtime.ShutdownEvent; -import org.jboss.shamrock.runtime.StartupEvent; +import io.quarkus.runtime.ShutdownEvent; +import io.quarkus.runtime.StartupEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,11 +85,11 @@ public class AppLifecycleBean { TIP: The events are also called in _dev mode_ between each redeployment. -NOTE: The methods can access injected beans. Check the https://github.com/jbossas/protean-quickstarts/blob/master/application-lifecycle-events/src/main/java/org/acme/events/AppLifecycleBean.java[AppLifecycleBean.java] class for details. +NOTE: The methods can access injected beans. Check the https://github.com/jbossas/quarkus-quickstarts/blob/master/application-lifecycle-events/src/main/java/org/acme/events/AppLifecycleBean.java[AppLifecycleBean.java] class for details. == Package and run the application -Run the application with: `mvn compile shamrock:dev`, the logged message is printed. +Run the application with: `mvn compile quarkus:dev`, the logged message is printed. When the application is stopped, the second log message is printed. As usual, the application can be packaged using `mvn clean package` and executed using the `-runner.jar` file. diff --git a/docs/src/main/asciidoc/building-native-image-guide.adoc b/docs/src/main/asciidoc/building-native-image-guide.adoc index aeca9f3f170c3..8c64724dd252c 100644 --- a/docs/src/main/asciidoc/building-native-image-guide.adoc +++ b/docs/src/main/asciidoc/building-native-image-guide.adoc @@ -40,7 +40,7 @@ Remember, you need to configure Maven as indicated in the link:maven-config.html We recommend you to follow the instructions in the next sections and package the application step by step. However, you can go right to the completed example. -Clone the Git repository: `git clone https://github.com/jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone https://github.com/jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. The solution is located in the `getting-started-native` directory. @@ -64,9 +64,9 @@ If you have generated the application from the previous tutorial, you can find i - org.jboss.shamrock - shamrock-maven-plugin - ${shamrock.version} + io.quarkus + quarkus-maven-plugin + ${quarkus.version} @@ -88,8 +88,8 @@ We use a profile because, you will see very soon, packaging the native image tak Create a native executable using: `mvn package -Pnative`. -In addition to the regular files, the build also produces `target/shamrock-quickstart-1.0-SNAPSHOT-runner`. -You can run it using: `target/shamrock-quickstart-native-1.0-SNAPSHOT-runner`. +In addition to the regular files, the build also produces `target/quarkus-quickstart-1.0-SNAPSHOT-runner`. +You can run it using: `target/quarkus-quickstart-native-1.0-SNAPSHOT-runner`. == Testing the native executable @@ -126,7 +126,7 @@ Then, create the `src/test/java/org/acme/quickstart/GreetingResourceIT.java` wit package org.acme.quickstart; -import org.jboss.shamrock.test.junit.SubstrateTest; +import io.quarkus.test.junit.SubstrateTest; @SubstrateTest // <1> public class GreetingResourceIT extends GreetingResourceTest { // <2> @@ -144,28 +144,28 @@ To see the `GreetingResourceIT` run against the native image, add a verify goal: ---- mvn package verify -Pnative ... -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] (typeflow): 35,160.93 ms -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] (objects): 24,027.13 ms -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] (features): 1,313.94 ms -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] analysis: 61,512.95 ms -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] universe: 1,924.69 ms -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] (parse): 11,479.41 ms -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] (inline): 13,568.71 ms -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] (compile): 82,885.41 ms -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] compile: 114,095.02 ms -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] image: 5,680.17 ms -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] write: 1,876.14 ms -[shamrock-quickstart-1.0-SNAPSHOT-runner:5185] [total]: 197,587.37 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] (typeflow): 35,160.93 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] (objects): 24,027.13 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] (features): 1,313.94 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] analysis: 61,512.95 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] universe: 1,924.69 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] (parse): 11,479.41 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] (inline): 13,568.71 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] (compile): 82,885.41 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] compile: 114,095.02 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] image: 5,680.17 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] write: 1,876.14 ms +[quarkus-quickstart-1.0-SNAPSHOT-runner:5185] [total]: 197,587.37 ms [INFO] -[INFO] --- maven-failsafe-plugin:2.21.0:integration-test (default) @ shamrock-quickstart --- +[INFO] --- maven-failsafe-plugin:2.21.0:integration-test (default) @ quarkus-quickstart --- [INFO] [INFO] ------------------------------------------------------- [INFO] T E S T S [INFO] ------------------------------------------------------- [INFO] Running org.acme.quickstart.GreetingResourceIT -Executing /Users/starksm/Dev/JBoss/Protean/get-started/target/shamrock-quickstart-1.0-SNAPSHOT-runner -2018-11-26 08:20:43,169 ironmaiden shamrock-quickstart-1.0-SNAPSHOT-runner[5220] INFO [o.j.s.u.r.UndertowDeploymentTemplate] (main) Starting Undertow on port 8080 -2018-11-26 08:20:43,190 ironmaiden shamrock-quickstart-1.0-SNAPSHOT-runner[5220] INFO [o.j.shamrock] (main) Shamrock started in 21.930ms +Executing /Users/starksm/Dev/JBoss/Quarkus/get-started/target/quarkus-quickstart-1.0-SNAPSHOT-runner +2018-11-26 08:20:43,169 ironmaiden quarkus-quickstart-1.0-SNAPSHOT-runner[5220] INFO [o.j.s.u.r.UndertowDeploymentTemplate] (main) Starting Undertow on port 8080 +2018-11-26 08:20:43,190 ironmaiden quarkus-quickstart-1.0-SNAPSHOT-runner[5220] INFO [o.j.quarkus] (main) Quarkus started in 21.930ms [INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.097 s - in org.acme.quickstart.GreetingResourceIT [INFO] [INFO] Results: @@ -178,7 +178,7 @@ Executing /Users/starksm/Dev/JBoss/Protean/get-started/target/shamrock-quickstar IMPORTANT: Before going further, be sure to have a working Docker environment. -You can run the application in a Docker container using the JAR produced by the Shamrock Maven Plugin. +You can run the application in a Docker container using the JAR produced by the Quarkus Maven Plugin. However, in this guide we focus on creating a Docker image using the produced native executable. Because the Docker container may not use the same _executable_ format as the one produced by default, we must instruct the Maven build to produce an executable from inside a Docker container: @@ -199,24 +199,24 @@ WORKDIR /work/ COPY target/*-runner /work/application RUN chmod 775 /work EXPOSE 8080 -CMD ["./application", "-Dshamrock.http.host=0.0.0.0"] +CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] ---- Then, if you didn't delete the generated native executable, you can build the docker image with: [source] ---- -docker build -f src/main/docker/Dockerfile -t shamrock-quickstart/quickstart . +docker build -f src/main/docker/Dockerfile -t quarkus-quickstart/quickstart . ---- And finally, run it with: [source] ---- -docker run -i --rm -p 8080:8080 shamrock-quickstart/quickstart +docker run -i --rm -p 8080:8080 quarkus-quickstart/quickstart ---- -NOTE: Interested by tiny Docker images, check the https://github.com/jbossas/protean-shamrock/tree/master/docker/distroless[distroless] version. +NOTE: Interested by tiny Docker images, check the https://github.com/jbossas/quarkus/tree/master/docker/distroless[distroless] version. == What's next? diff --git a/docs/src/main/asciidoc/building-substrate-howto.adoc b/docs/src/main/asciidoc/building-substrate-howto.adoc index 77afd5cc74dc7..4cf6c64428bff 100644 --- a/docs/src/main/asciidoc/building-substrate-howto.adoc +++ b/docs/src/main/asciidoc/building-substrate-howto.adoc @@ -58,7 +58,7 @@ mx native-image HelloWorld === Building a custom GraalVM distribution In order to create a custom GraalVM distribution (necessary for usage -in shamrock) you must switch to the vm subdirectory, and use special +in quarkus) you must switch to the vm subdirectory, and use special build options to pick the modules in your distribution. For a simple subset VM with just substrate and its native tools execute diff --git a/docs/src/main/asciidoc/cdi-reference.adoc b/docs/src/main/asciidoc/cdi-reference.adoc index 4b15ce5b50788..877db58262588 100644 --- a/docs/src/main/asciidoc/cdi-reference.adoc +++ b/docs/src/main/asciidoc/cdi-reference.adoc @@ -143,13 +143,13 @@ NOTE: Bean registrations that are result of a `BeanDefiningAnnotationBuildItem` `ResourceAnnotationBuildItem` is used to specify resource annotations that make it possible to resolve non-CDI injection points, such as Java EE resources. -NOTE: An integrator must also provide a corresponding `org.jboss.protean.arc.ResourceReferenceProvider` implementation. +NOTE: An integrator must also provide a corresponding `org.jboss.quarkus.arc.ResourceReferenceProvider` implementation. [source,java] ---- @BuildStep void setupResourceInjection(BuildProducer resourceAnnotations, BuildProducer resources) { - resources.produce(new GeneratedResourceBuildItem("META-INF/services/org.jboss.protean.arc.ResourceReferenceProvider", + resources.produce(new GeneratedResourceBuildItem("META-INF/services/org.jboss.quarkus.arc.ResourceReferenceProvider", JPAResourceReferenceProvider.class.getName().getBytes())); resourceAnnotations.produce(new ResourceAnnotationBuildItem(DotName.createSimple(PersistenceContext.class.getName()))); } @@ -176,7 +176,7 @@ NOTE: A bean registration that is a result of an `AdditionalBeanBuildItem` is re Sometimes it's useful to register a synthetic bean, i.e. a bean that doesn't need to have a corresponding java class. In CDI this could be achieved using `AfterBeanDiscovery.addBean()` methods. -In {project-name} we produce a `BeanRegistrarBuildItem` and leverage the `org.jboss.protean.arc.processor.BeanConfigurator` API to build a synthetic bean definition. +In {project-name} we produce a `BeanRegistrarBuildItem` and leverage the `org.jboss.quarkus.arc.processor.BeanConfigurator` API to build a synthetic bean definition. // TODO add example @@ -226,13 +226,13 @@ BeanDeploymentValidatorBuildItem beanDeploymentValidator() { } ---- -NOTE: See also `org.jboss.protean.arc.processor.BuildExtension.Key` to discover the available metadata. +NOTE: See also `org.jboss.quarkus.arc.processor.BuildExtension.Key` to discover the available metadata. [[remove_unused_beans]] == Removing Unused Beans The container attempts to remove all unused beans during build by default. -This optimization can be disabled: `shamrock.arc.remove-unused-beans=false`. +This optimization can be disabled: `quarkus.arc.remove-unused-beans=false`. An unused bean: diff --git a/docs/src/main/asciidoc/extension-authors-guide.adoc b/docs/src/main/asciidoc/extension-authors-guide.adoc index cbc76c2b956a1..e01a30301fdac 100644 --- a/docs/src/main/asciidoc/extension-authors-guide.adoc +++ b/docs/src/main/asciidoc/extension-authors-guide.adoc @@ -4,19 +4,19 @@ :sectnums: :sectnumlevels: 4 -Shamrock extensions add a new developer focused behavior to the core offering, and consist of two distinct parts, buildtime augmentation and runtime container. The augmentation part is responsible for all metadata processing, such as reading annotations, XML descriptors etc. The output of this augmentation phase is recorded bytecode which is responsible for directly instantiating the relevant runtime services. +Quarkus extensions add a new developer focused behavior to the core offering, and consist of two distinct parts, buildtime augmentation and runtime container. The augmentation part is responsible for all metadata processing, such as reading annotations, XML descriptors etc. The output of this augmentation phase is recorded bytecode which is responsible for directly instantiating the relevant runtime services. This means that metadata is only processed once at build time, which both saves on startup time, and also on memory usage as the classes etc that are used for processing are not loaded (or even present) in the runtime JVM. -== Three Phases of Bootstrap and Shamrock Philosophy +== Three Phases of Bootstrap and Quarkus Philosophy -There are three distinct bootstrap phases of a Shamrock app: +There are three distinct bootstrap phases of a Quarkus app: Augmentation:: This is the first phase, and is done by the <>. These processors have access to Jandex annotation information and can parse any descriptors and read annotations, but should not attempt to load any application classes. The output of these - build steps is some recorded bytecode, using an extension of the ObjectWeb ASM project called Gizmo(ext/gizmo), that is used to actually bootstrap the application at runtime. Depending on the `org.jboss.shamrock.deployment.annotations.ExecutionTime` value of the `@org.jboss.shamrock.deployment.annotations.Record` annotation associated with the build step, + build steps is some recorded bytecode, using an extension of the ObjectWeb ASM project called Gizmo(ext/gizmo), that is used to actually bootstrap the application at runtime. Depending on the `io.quarkus.deployment.annotations.ExecutionTime` value of the `@io.quarkus.deployment.annotations.Record` annotation associated with the build step, the step may be run in a different JVM based on the following two modes. Static Init:: @@ -31,9 +31,9 @@ There are some restrictions on what can be done in this stage as the Substrate V In non-native pure JVM mode, there is no real difference between Static and Runtime Init, except that Static Init is always executed first. This mode benefits from the same build phase augmentation as native mode as the descriptor parsing and annotation scanning are done at build time and any associated class/framework dependencies can be removed from the build output jar. In servers like WildFly, deployment related classes such as XML parsers hang around for the life of the application, using up valuable -memory. Shamrock aims to eliminate this, so that the only classes loaded at runtime are actually used at runtime. +memory. Quarkus aims to eliminate this, so that the only classes loaded at runtime are actually used at runtime. + -As an example, the only reason that a Shamrock application should load an XML parser is if the user is using XML in their +As an example, the only reason that a Quarkus application should load an XML parser is if the user is using XML in their application. Any XML parsing of configuration should be done in the Augmentation phase. Runtime Init:: @@ -57,9 +57,9 @@ Your extension project should be setup as a multi-module project with two submod 2. A runtime submodule that contains the runtime behavior that will provide the extension behavior in the native image or runtime JVM. -Your runtime artifact should depend on shamrock-core-runtime, and possibly the runtime artifacts of other Shamrock +Your runtime artifact should depend on quarkus-core-runtime, and possibly the runtime artifacts of other Quarkus modules if you want to use functionality provided by them. You will also need to include the `maven-dependency-plugin` -to write out the needed runtime dependencies, if you are using the Shamrock parent pom it will automatically +to write out the needed runtime dependencies, if you are using the Quarkus parent pom it will automatically inherit the correct configuration. [source%nowrap,xml] @@ -67,8 +67,8 @@ inherit the correct configuration. - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime @@ -87,15 +87,15 @@ Under no circumstances can the runtime module depend on a deployment artifact. T in pulling all the deployment time code into runtime scope, which defeats the purpose of having the split. ==== -Your deployment time module should depend on `shamrock-core-deployment`, your runtime artifact, -and possibly the deployment artifacts of other Shamrock modules if you want to use functionality provided by them. +Your deployment time module should depend on `quarkus-core-deployment`, your runtime artifact, +and possibly the deployment artifacts of other Quarkus modules if you want to use functionality provided by them. [source%nowrap,xml] ---- - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment ---- @@ -104,9 +104,9 @@ NOTE: For historical reasons the `augment` step is still called `deployment`, th == Build Step Processors Work is done at deployment time by producing and consuming instances of `org.jboss.builder.item.BuildItem`. This is done -by creating a class that has method(s) annotated with `org.jboss.shamrock.deployment.annotations.BuildStep`. These classes can +by creating a class that has method(s) annotated with `io.quarkus.deployment.annotations.BuildStep`. These classes can consume items by injection, and produce items by either returning them from the method or by injecting an -instance of `org.jboss.shamrock.deployment.annotations.BuildProducer` for the produced type. These processors can also record +instance of `io.quarkus.deployment.annotations.BuildProducer` for the produced type. These processors can also record bytecode invocations, which is mapped to a `BuildItem` transparently. There are two distinct types of `BuildItem`, `SimpleBuildItem` and `MultiBuildItem`. `SimpleBuildItem` will only ever @@ -143,9 +143,9 @@ ordered. This is not enforced but failure to adhere to this can result in race c The `@BuildStep` annotation has a `providesCapabilities` property that can be used to provide capability information to other extensions about what is present in the current application. Capabilities are simply strings that are used to describe an extension. Capabilities should generally be named after an extensions root package, for example the transactions -extension will provide `org.jboss.shamrock.transactions`. +extension will provide `io.quarkus.transactions`. -To check if a capability is present you can inject the `org.jboss.shamrock.deployment.Capabilities` object and call +To check if a capability is present you can inject the `io.quarkus.deployment.Capabilities` object and call `isCapabilityPresent`. Capabilities should be used when checking for the presence of an extension rather than class path based checks. @@ -159,17 +159,17 @@ file will be indexed. == Configuration -Configuration in Shamrock is based on SmallRye Config, an implementation of the MicroProfile Config specification. +Configuration in Quarkus is based on SmallRye Config, an implementation of the MicroProfile Config specification. All of the standard features of MP-Config are supported; in addition, there are several extensions which are made available -by the SmallRye Config project as well as by Shamrock itself. +by the SmallRye Config project as well as by Quarkus itself. The value of these properties is configured in a `META-INF/microprofile-config.properties` file that conforms to the MicroProfile config format. -Configuration of Shamrock extensions is injection-based, using annotations. +Configuration of Quarkus extensions is injection-based, using annotations. === Configuration Keys -Leaf configuration keys are mapped to non-`private` fields via the `@org.jboss.shamrock.runtime.annotations.ConfigItem` annotation. +Leaf configuration keys are mapped to non-`private` fields via the `@io.quarkus.runtime.annotations.ConfigItem` annotation. NOTE: Though the SmallRye Config project is used for implementation, the standard `@ConfigProperty` annotation does not have the same semantics that are needed to support configuration within extensions. @@ -188,7 +188,7 @@ normally this should only be done in cases where (for example) the configuration === Configuration Value types -The type of the field with the `@ConfigItem` annotation determines the conversion that is applied to it. Shamrock +The type of the field with the `@ConfigItem` annotation determines the conversion that is applied to it. Quarkus extensions may use the full range of configuration types made available by SmallRye Config, which includes: * All primitive types and primitive wrapper types @@ -199,14 +199,14 @@ extensions may use the full range of configuration types made available by Small * A `List` or `Optional` of any of the above types * `OptionalInt`, `OptionalLong`, `OptionalDouble` -In addition, custom converters may be registered by build extensions using the `org.jboss.shamrock.deployment.builditem.ConfigurationCustomConverterBuildItem` +In addition, custom converters may be registered by build extensions using the `io.quarkus.deployment.builditem.ConfigurationCustomConverterBuildItem` class. -Though these implicit converters use reflection, Shamrock will automatically ensure that they are loaded at the appropriate time. +Though these implicit converters use reflection, Quarkus will automatically ensure that they are loaded at the appropriate time. === Configuration Groups -Configuration values are always collected into grouping classes which are marked with the `@org.jboss.shamrock.runtime.annotations.ConfigGroup` +Configuration values are always collected into grouping classes which are marked with the `@io.quarkus.runtime.annotations.ConfigGroup` annotation. These classes contain a field for each key within its group. In addition, configuration groups can be nested. === Configuration Maps @@ -218,9 +218,9 @@ key segment following the map's key segment will be used as the key for map valu === Configuration Roots Configuration roots are configuration groups that appear in the root of the configuration tree. A configuration property's full -name is determined by joining the string `shamrock.` with the hyphenated name of the fields that form the path from the root to the +name is determined by joining the string `quarkus.` with the hyphenated name of the fields that form the path from the root to the leaf field. For example, if I define a configuration root group called `ThreadPool`, with a nested group in a field named `sizing` -that in turn contains a field called `minSize`, the final configuration property will be called `shamrock.thread-pool.sizing.min-size`. +that in turn contains a field called `minSize`, the final configuration property will be called `quarkus.thread-pool.sizing.min-size`. A configuration root's name can be given with the `name` property, or it can be inferred from the class name. If the latter, then the configuration key will be the class name, minus any `Config` or `Configuration` suffix, broken up by camel-case, @@ -232,7 +232,7 @@ this change is complete. ==== Configuration Root Phases -A configuration root dictates when its contained keys are read from configuration, and when they are available to applications. The phases defined by `org.jboss.shamrock.runtime.annotations.ConfigPhase` are as follows: +A configuration root dictates when its contained keys are read from configuration, and when they are available to applications. The phases defined by `io.quarkus.runtime.annotations.ConfigPhase` are as follows: [cols="<3m,^1,^1,^1,^1,<8",options="header"] |=== @@ -279,8 +279,8 @@ For all cases other than the `BUILD_TIME` case, the configuration root class and [source%nowrap,java] ---- -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigGroup; import java.io.File; import java.util.logging.Level; @@ -309,7 +309,7 @@ public class FileConfig { /** * The file logging log level. */ - @ConfigItem(defaultValue = "shamrock.log") + @ConfigItem(defaultValue = "quarkus.log") File path; } @@ -341,15 +341,15 @@ public class LoggingProcessor { <1> The `FileConfig` class is annotated with `@ConfigGroup` to indicate that this is an aggregate configuration object containing a collection of configurable properties, rather than being a simple configuration key type. -<2> The `@ConfigRoot` annotation indicates that this object is a configuration root group, whose property names will have a parent only of `shamrock.`. In this case the properties within the group will begin with `shamrock.log.*`. +<2> The `@ConfigRoot` annotation indicates that this object is a configuration root group, whose property names will have a parent only of `quarkus.`. In this case the properties within the group will begin with `quarkus.log.*`. <3> Here the `LoggingProcessor` injects a `LogConfiguration` instance automatically by detecting the `@ConfigRoot` annotation. A corresponding `META-INF/microprofile-config.properties` file for the `File` values could be: [source%nowrap,properties] ---- -shamrock.log.file.enable=true -shamrock.log.file.level=DEBUG -shamrock.log.file.path=/tmp/debug.log +quarkus.log.file.enable=true +quarkus.log.file.level=DEBUG +quarkus.log.file.path=/tmp/debug.log ---- == Bytecode Recording @@ -369,7 +369,7 @@ provides a template of methods to configure a runtime service. The value of temp injected into the deployment class is a proxy of the template, and any method invocations that are made will be recorded, and output as bytecode that will be run at application startup. Methods on a template can return a value, which must be proxiable (if you want to return a non-proxiable item wrap it -in `org.jboss.shamrock.runtime.RuntimeValue`). These proxies may not be invoked directly, however they can be passed +in `io.quarkus.runtime.RuntimeValue`). These proxies may not be invoked directly, however they can be passed into other template methods. This can be any template method, including from other `@Record` methods, so a common pattern is to produce `BuildItem` instances that wrap the results of these template invocations. @@ -384,7 +384,7 @@ control the order that generated bytecode is run. In the example above we know t === RecorderContext -`org.jboss.shamrock.deployment.recording.RecorderContext` provides some convenience methods to enhance bytecode recording, +`io.quarkus.deployment.recording.RecorderContext` provides some convenience methods to enhance bytecode recording, this includes the ability to register creation functions for classes without no-arg constructors, to register an object substitution (basically a transformer from a non-serializable object to a serializable one and vice versa), and to create a class proxy. This interface can be directly injected as a method parameter into any `@Record` method. @@ -399,22 +399,22 @@ TODO: config integration == Testing Extensions -Testing of extensions should be done with the `org.jboss.shamrock.test.ShamrockUnitTest` runner. This runner allows +Testing of extensions should be done with the `io.quarkus.test.QuarkusUnitTest` runner. This runner allows for Arquillian-style tests that test specific functionalities. It is not intended for testing user applications, as this -should be done via `org.jboss.shamrock.test.junit.ShamrockTest`. The main difference between these test runners is that -`ShamrockTest` simply boots the application once at the start of the run, while `ShamrockUnitTest` deploys a custom -Shamrock application for each test class. +should be done via `io.quarkus.test.junit.QuarkusTest`. The main difference between these test runners is that +`QuarkusTest` simply boots the application once at the start of the run, while `QuarkusUnitTest` deploys a custom +Quarkus application for each test class. -These tests should be placed in the deployment module, if additional Shamrock modules are required for testing +These tests should be placed in the deployment module, if additional Quarkus modules are required for testing their deployment modules should also be added as test scoped dependencies. -Note that `ShamrockUnitTest` is in the `shamrock-junit5-internal` module. +Note that `QuarkusUnitTest` is in the `quarkus-junit5-internal` module. An example test class may look like: [source,java] ---- -package org.jboss.shamrock.health.test; +package io.quarkus.health.test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -427,7 +427,7 @@ import javax.inject.Inject; import org.eclipse.microprofile.health.Health; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -440,7 +440,7 @@ public class FailingUnitTest { @RegisterExtension // <1> - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) // <2> .addClasses(FailingHealthCheck.class) @@ -468,7 +468,7 @@ public class FailingUnitTest { ---- -<1> This tells JUnit to use the Shamrock unit test runner +<1> This tells JUnit to use the Quarkus unit test runner <2> This producer is used to build the application to be tested. It uses Shrinkwrap to create a JavaArchive to test <3> It is possible to inject beans from our test deployment directly into the test case <4> This method directly invokes the health check Servlet and verifies the response @@ -479,20 +479,20 @@ If you want to test that an extension properly fails at build time, use the `set [source,java] ---- -package org.jboss.shamrock.hibernate.orm; +package io.quarkus.hibernate.orm; -import org.jboss.shamrock.deployment.configuration.ConfigurationError; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.deployment.configuration.ConfigurationError; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -public class PersistenceAndShamrockConfigTest { +public class PersistenceAndQuarkusConfigTest { @RegisterExtension - static ShamrockUnitTest runner = new ShamrockUnitTest() + static QuarkusUnitTest runner = new QuarkusUnitTest() .setExpectedException(ConfigurationError.class) <1> .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addAsManifestResource("META-INF/some-persistence.xml", "persistence.xml") @@ -514,27 +514,27 @@ public class PersistenceAndShamrockConfigTest { == Native Image Support -There Shamrock provides a lot of build items that control aspects of the native image build. This allows for extensions +There Quarkus provides a lot of build items that control aspects of the native image build. This allows for extensions to programmatically perform tests such as registering classes for reflection or adding static resources to the native image. Some of these build items are listed below: -`org.jboss.shamrock.deployment.builditem.substrate.SubstrateResourceBuildItem`:: +`io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem`:: Includes static resources into the native image. -`org.jboss.shamrock.deployment.builditem.substrate.RuntimeReinitializedClassBuildItem`:: +`io.quarkus.deployment.builditem.substrate.RuntimeReinitializedClassBuildItem`:: A class that will be reinitialized at runtime by Substrate. This will result in the static initializer running twice. -`org.jboss.shamrock.deployment.builditem.substrate.SubstrateSystemPropertyBuildItem`:: +`io.quarkus.deployment.builditem.substrate.SubstrateSystemPropertyBuildItem`:: A system property that will be set at native image build time. -`org.jboss.shamrock.deployment.builditem.substrate.SubstrateResourceBundleBuildItem`:: +`io.quarkus.deployment.builditem.substrate.SubstrateResourceBundleBuildItem`:: Includes a resource bundle in the native image. -`org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem`:: +`io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem`:: Registers a class for reflection in Substrate. Constructors are always registered, while methods and fields are optional. -`org.jboss.shamrock.deployment.builditem.substrate.RuntimeInitializedClassBuildItem`:: +`io.quarkus.deployment.builditem.substrate.RuntimeInitializedClassBuildItem`:: A class that will be initialized at runtime rather than build time. This will cause the build to fail if the class is initialized as part of the native image build process, so care must be taken. -`org.jboss.shamrock.deployment.builditem.substrate.SubstrateConfigBuildItem`:: +`io.quarkus.deployment.builditem.substrate.SubstrateConfigBuildItem`:: A convenience feature that allows you to control most of the above features from a single build item. \ No newline at end of file diff --git a/docs/src/main/asciidoc/faq.adoc b/docs/src/main/asciidoc/faq.adoc index 7183666257a64..69d4d4a1c2ee5 100644 --- a/docs/src/main/asciidoc/faq.adoc +++ b/docs/src/main/asciidoc/faq.adoc @@ -9,7 +9,7 @@ :numbered: :sectnums: :sectnumlevels: 4 -:project-name: Protean +:project-name: Quarkus == Native compilation diff --git a/docs/src/main/asciidoc/getting-started-guide.adoc b/docs/src/main/asciidoc/getting-started-guide.adoc index 5f01b40aba468..8ea84df95c90e 100644 --- a/docs/src/main/asciidoc/getting-started-guide.adoc +++ b/docs/src/main/asciidoc/getting-started-guide.adoc @@ -11,7 +11,7 @@ :sectnumlevels: 4 -Learn how to create a Hello World Shamrock app. +Learn how to create a Hello World Quarkus app. This guide covers: * Bootstrapping an application @@ -45,7 +45,7 @@ This guide also covers the testing of the endpoint. We recommend you to follow the instructions in the next sections and create the application step by step. However, you can go right to the completed example. -Clone the Git repository: `git clone git@github.com:jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone git@github.com:jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. The solution is located in the `getting-started` directory. @@ -55,7 +55,7 @@ The easiest way to create a new {project-name} project is to open a terminal and [source, subs=attributes+] ---- -mvn org.jboss.shamrock:shamrock-maven-plugin:{shamrock-version}:create \ +mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \ -DprojectGroupId=org.acme \ -DprojectArtifactId=getting-started \ -DclassName="org.acme.quickstart.GreetingResource" \ @@ -72,17 +72,17 @@ It generates: * the application configuration file Once generated, look at the `pom.xml`. -You will find the import of the Shamrock BOM, allowing to omit the version on the different {project-name} dependencies. -In addition, you can see the `shamrock-maven-plugin` responsible of the packaging of the application and also providing the development mode. +You will find the import of the Quarkus BOM, allowing to omit the version on the different {project-name} dependencies. +In addition, you can see the `quarkus-maven-plugin` responsible of the packaging of the application and also providing the development mode. [source,xml,subs=attributes+] ---- - org.jboss.shamrock - shamrock-bom - ${shamrock.version} + io.quarkus + quarkus-bom + ${quarkus.version} pom import @@ -92,9 +92,9 @@ In addition, you can see the `shamrock-maven-plugin` responsible of the packagin - org.jboss.shamrock - shamrock-maven-plugin - ${shamrock.version} + io.quarkus + quarkus-maven-plugin + ${quarkus.version} @@ -108,9 +108,9 @@ In addition, you can see the `shamrock-maven-plugin` responsible of the packagin ---- [NOTE] -.What's Shamrock? +.What's Quarkus? ==== -Shamrock can be seen as {project-name} core. +Quarkus can be seen as {project-name} core. ==== If we focus on the dependencies section, you can see 2 extensions allowing the development of REST applications: @@ -118,12 +118,12 @@ If we focus on the dependencies section, you can see 2 extensions allowing the d [source,xml] ---- - org.jboss.shamrock - shamrock-resteasy-deployment + io.quarkus + quarkus-resteasy-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment ---- @@ -162,37 +162,37 @@ It's a very simple REST endpoint, returning "hello" to requests on "/hello". [TIP] .Differences with vanilla Jax-RS ==== -With Shamrock no need to create an `Application` class. It's supported but not required. In addition, only one instance +With Quarkus no need to create an `Application` class. It's supported but not required. In addition, only one instance of the resource is created and not one per request. You can configure this using the different `XScoped` annotations. ==== == Running the application Now we are ready to run our application. -Use: `mvn compile shamrock:dev`: +Use: `mvn compile quarkus:dev`: [source, text] ---- -[INFO] --------------------< org.acme:shamrock-quickstart >-------------------- -[INFO] Building shamrock-quickstart 1.0-SNAPSHOT +[INFO] --------------------< org.acme:quarkus-quickstart >-------------------- +[INFO] Building quarkus-quickstart 1.0-SNAPSHOT [INFO] --------------------------------[ jar ]--------------------------------- [INFO] -[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ shamrock-quickstart --- +[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ quarkus-quickstart --- [INFO] Using 'UTF-8' encoding to copy filtered resources. -[INFO] skip non existing resourceDirectory /opt/source/protean/quickstarts/getting-started/src/main/resources +[INFO] skip non existing resourceDirectory /opt/source/quarkus/quickstarts/getting-started/src/main/resources [INFO] -[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ shamrock-quickstart --- +[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ quarkus-quickstart --- [INFO] Nothing to compile - all classes are up to date [INFO] -[INFO] --- shamrock-maven-plugin:0.4.0:dev (default-cli) @ shamrock-quickstart --- +[INFO] --- quarkus-maven-plugin:0.4.0:dev (default-cli) @ quarkus-quickstart --- INFO [o.j.s.u.r.UndertowDeploymentTemplate] (main) Starting Undertow on port 8080 INFO [o.xnio] (main) XNIO version 3.6.5.Final INFO [o.x.nio] (main) XNIO NIO Implementation Version 3.6.5.Final INFO [o.j.threads] (main) JBoss Threads version 3.0.0.Alpha4 -INFO [o.j.s.d.ShamrockAugmentor] (main) Beginning shamrock augmentation -INFO [o.j.s.d.ShamrockAugmentor] (main) Shamrock augmentation completed in 322ms +INFO [o.j.s.d.QuarkusAugmentor] (main) Beginning quarkus augmentation +INFO [o.j.s.d.QuarkusAugmentor] (main) Quarkus augmentation completed in 322ms INFO [o.j.r.r.i18n] (main) RESTEASY002225: Deploying javax.ws.rs.core.Application: class org.acme.quickstart.MyApplication -INFO [o.j.shamrock] (main) Shamrock started in 697.982ms +INFO [o.j.quarkus] (main) Quarkus started in 697.982ms ---- Once started, you can request the provided endpoint: @@ -259,12 +259,12 @@ public class GreetingResource { } ---- -If you stopped the application, restart the application with `mvn compile shamrock:dev`. -Then check that http://localhost:8080/hello/greeting/shamrock returns `hello shamrock`. +If you stopped the application, restart the application with `mvn compile quarkus:dev`. +Then check that http://localhost:8080/hello/greeting/quarkus returns `hello quarkus`. == Development Mode -`shamrock:dev` runs Shamrock in development mode. This enables hot deployment with background compilation, which means +`quarkus:dev` runs Quarkus in development mode. This enables hot deployment with background compilation, which means that when you modify your Java files and refresh your browser these changes will automatically take effect. The act of refreshing the browser triggers a scan of the workspace, and if any changes are detected the Java files are compiled, and the application is redeployed, then your request is serviced by the redeployed application. If there are any issues @@ -282,9 +282,9 @@ In the generated `pom.xml` file, you can see 2 test dependencies: [source,xml,subs=attributes+] ---- - org.jboss.shamrock - shamrock-junit5 - ${shamrock.version} + io.quarkus + quarkus-junit5 + ${quarkus.version} test @@ -295,7 +295,7 @@ In the generated `pom.xml` file, you can see 2 test dependencies: ---- -Shamrock supports https://junit.org/junit4/[Junit 4] and https://junit.org/junit5/[Junit 5] tests. +Quarkus supports https://junit.org/junit4/[Junit 4] and https://junit.org/junit5/[Junit 5] tests. In the generated project, we use Junit 5. Because of this, the version of the https://maven.apache.org/surefire/maven-surefire-plugin/[Surefire Maven Plugin] must be set, as the default version does not support Junit 5: @@ -314,7 +314,7 @@ Edit the `src/test/java/org/acme/quickstart/GreetingResourceTest.java` to match ---- package org.acme.quickstart; -import org.jboss.shamrock.test.junit.ShamrockTest; +import io.quarkus.test.junit.QuarkusTest; import org.junit.jupiter.api.Test; import java.util.UUID; @@ -322,7 +322,7 @@ import java.util.UUID; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; -@ShamrockTest +@QuarkusTest public class GreetingResourceTest { @Test // <1> @@ -347,7 +347,7 @@ public class GreetingResourceTest { } ---- -<1> By using the `ShamrockTest` runner, you instruct JUnit to start the application before the tests. +<1> By using the `QuarkusTest` runner, you instruct JUnit to start the application before the tests. <2> Check the HTTP response status code and content These tests use http://rest-assured.io/[RestAssured], but feel free to use your favorite library. @@ -367,7 +367,7 @@ a Servlet mapped to `/myservlet` I would just add the following to my test: URL testUrl; ---- -The test port can be controlled via the `shamrock.http.test-port` config property. Shamrock also creates a system +The test port can be controlled via the `quarkus.http.test-port` config property. Quarkus also creates a system property called `test.url` that is set to the base test URL for situations where you cannot use injection. @@ -376,12 +376,12 @@ property called `test.url` that is set to the base test URL for situations where The application is packaged using `mvn package`. It produces 2 jar files: -* `shamrock-quickstart-1.0-SNAPSHOT.jar` - containing just the classes and resources of the projects, it's the regular +* `quarkus-quickstart-1.0-SNAPSHOT.jar` - containing just the classes and resources of the projects, it's the regular artifact produced by the Maven build; -* `shamrock-quickstart-1.0-SNAPSHOT-runner.jar` - being an executable _jar_. Be aware that it's not an _über-jar_ as +* `quarkus-quickstart-1.0-SNAPSHOT-runner.jar` - being an executable _jar_. Be aware that it's not an _über-jar_ as the dependencies are copied into the `target/lib` directory. -You can run the application using: `java -jar target/shamrock-quickstart-1.0-SNAPSHOT-runner.jar` +You can run the application using: `java -jar target/quarkus-quickstart-1.0-SNAPSHOT-runner.jar` NOTE: The `Class-Path` entry of the `MANIFEST.MF` from the _runner jar_ explicitly lists the jars from the `lib` directory. So if you want to deploy your application somewhere, you need to copy the _runner_ jar as well as the _lib_ directory. @@ -401,11 +401,11 @@ public CompletionStage hello() { } ---- -The async version of the code is available in the https://github.com/jbossas/protean-quickstarts[Github] repository, in the `getting-started-async` directory. +The async version of the code is available in the https://github.com/jbossas/quarkus-quickstarts[Github] repository, in the `getting-started-async` directory. == What's next? -This guide covered the creation of an application using Shamrock. +This guide covered the creation of an application using Quarkus. However, there is much more. We recommend continuing the journey with the link:building-native-image-guide.html[building a native image guide], where you learn about the native executable creation and the packaging in a container. diff --git a/docs/src/main/asciidoc/getting-started-knative-guide.adoc b/docs/src/main/asciidoc/getting-started-knative-guide.adoc index 2cb3a64da01d9..81226bc39a573 100644 --- a/docs/src/main/asciidoc/getting-started-knative-guide.adoc +++ b/docs/src/main/asciidoc/getting-started-knative-guide.adoc @@ -28,7 +28,7 @@ Remember, you need to configure Maven as indicated in the link:maven-config.html We recommend to follow the instructions in the next sections and build the application step by step. However, you can go right to the completed example. -Clone the Git repository: `git clone https://github.com/jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone https://github.com/jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. The solution is located in the `getting-started-knative` directory. @@ -48,7 +48,7 @@ The Kubernetes Service Account that will have access to Container Registry secre If you are not using private GitHub repo then you dont need the `Deploy Key` created and added to the Build Service Account ==== -Run the following commands to kick start https://github.com/knative/build[Knative Build] which will build the shamrock application container image +Run the following commands to kick start https://github.com/knative/build[Knative Build] which will build the quarkus application container image using Dockerfile and https://github.com/GoogleContainerTools/kaniko[Kaniko]. After a successful build you will have the Knative serving application deployed with the built container image. You can watch the application build pods using the command `kubectl get pods -w`. You can terminate the watch using the command kbd:[CTRL + c] @@ -62,7 +62,7 @@ you need to run the following maven command to make them passed to the Knative r | github.deploy.key | the base64 encoded private key that is configured to be used as the GitHub private repo Deploy key -| `cat ~/.ssh/protean-quickstarts \| base64 -w 0` +| `cat ~/.ssh/quarkus-quickstarts \| base64 -w 0` | github.keyscan | the base64 encoded value of `ssh-keyscan github.com` @@ -86,11 +86,11 @@ you need to run the following maven command to make them passed to the Knative r | git.source.repo.url | The GitHub repo url -| https://github.com/jbossas/protean-quickstarts.git +| https://github.com/jbossas/quarkus-quickstarts.git | app.container.image | The fully qualified name of the container image that will be pushed to the container registry after build -| docker.io/demo/shamrock-knative-quickstart +| docker.io/demo/quarkus-knative-quickstart |=== @@ -98,13 +98,13 @@ The following is the example command to generate the need knative resource files [source, bash] ---- -mvn -Dgithub.deploy.key=$(cat ~/.ssh/protean-quickstarts | base64 -w 0) \ +mvn -Dgithub.deploy.key=$(cat ~/.ssh/quarkus-quickstarts | base64 -w 0) \ -Dgithub.keyscan=$(ssh-keyscan github.com | base64 -w 0) \ -Dcontainer.registry.url='https://quay.io/v2' \ -Dcontainer.registry.user='demo' \ -Dcontainer.registry.password='password' \ -Dgit.source.revision='master' \ - -Dgit.source.repo.url='git@github.com:jbossas/protean-quickstarts.git' \ #<1> + -Dgit.source.repo.url='git@github.com:jbossas/quarkus-quickstarts.git' \ #<1> -Dapp.container.image='docker.io/demo/getting-started-knative' \ clean process-resources ---- @@ -137,7 +137,7 @@ curl -v -H 'Host: getting-started-knative.example.com' $IP_ADDRESS/hello/greetin == Going further -This guide covered the deployment of a Shamrock application as Knative application on Kubernetes -However, there is much more, and the integration with these environments has been tailored to make Shamrock applications execution very smooth. +This guide covered the deployment of a Quarkus application as Knative application on Kubernetes +However, there is much more, and the integration with these environments has been tailored to make Quarkus applications execution very smooth. For instance, the health extension can be used for health check; the configuration support allows mounting the application configuration using config map, the metric extension produces data _scrappable_ by Prometheus and so on. diff --git a/docs/src/main/asciidoc/hibernate-orm-guide.adoc b/docs/src/main/asciidoc/hibernate-orm-guide.adoc index dec624e8db8b5..819a31d63a027 100644 --- a/docs/src/main/asciidoc/hibernate-orm-guide.adoc +++ b/docs/src/main/asciidoc/hibernate-orm-guide.adoc @@ -17,22 +17,22 @@ and we make some opinionated choices and educated guesses. In your `pom.xml`, add the following dependencies: * the Hibernate ORM extension -* your JDBC driver extension (`shamrock-jdbc-postgresql-deployment`, `shamrock-jdbc-h2-deployment`, `shamrock-jdbc-mariadb-deployment`, ...) +* your JDBC driver extension (`quarkus-jdbc-postgresql-deployment`, `quarkus-jdbc-h2-deployment`, `quarkus-jdbc-mariadb-deployment`, ...) [source,xml] -- - org.jboss.shamrock - shamrock-hibernate-orm-deployment + io.quarkus + quarkus-hibernate-orm-deployment provided - org.jboss.shamrock - shamrock-jdbc-postgresql-deployment + io.quarkus + quarkus-jdbc-postgresql-deployment provided @@ -43,10 +43,10 @@ then add the relevant configuration properties in `{config-file}`. [source,properties] -- -shamrock.datasource.url: jdbc:postgresql://localhost:5432/mydatabase -shamrock.datasource.driver: org.postgresql.Driver -shamrock.datasource.username: sarah -shamrock.datasource.password: connor +quarkus.datasource.url: jdbc:postgresql://localhost:5432/mydatabase +quarkus.datasource.driver: org.postgresql.Driver +quarkus.datasource.username: sarah +quarkus.datasource.password: connor -- Note that these configuration properties are not the same ones as made available in `{config-file}`: they might differ in names, casing and don't necessarily map 1:1 to each other. @@ -106,23 +106,23 @@ This is useful to have a data set ready for your tests or demos. There are optional properties useful to refine your `EntityManagerFactory` or guide guesses of {project-name}. -`shamrock.hibernate.dialect`:: (e.g. `org.hibernate.dialect.PostgreSQL95Dialect`). +`quarkus.hibernate.dialect`:: (e.g. `org.hibernate.dialect.PostgreSQL95Dialect`). Class name of the Hibernate ORM dialect. -`shamrock.hibernate.schema-generation.database.action`:: +`quarkus.hibernate.schema-generation.database.action`:: (e.g. `drop-and-create` which is awesome in development mode). Select whether the database schema is generated or not. Options are `none`, `create`, `drop-and-create`, `drop` -`shamrock.hibernate.show-sql`:: (defaults to `false`). +`quarkus.hibernate.show-sql`:: (defaults to `false`). Show SQL logs and format them nicely. -`shamrock.hibernate.sql-load-script-source`:: +`quarkus.hibernate.sql-load-script-source`:: (defaults to `/import.sql`) Name of the file containing the SQL statements to execute when Hibernate ORM starts. By default, simply add `import.sql` in the root of your resources directory and it will be picked up without having to set this property. [NOTE] -- -Do not mix `persistence.xml` and `shamrock.hibernate.*` properties in `{config-file}`. +Do not mix `persistence.xml` and `quarkus.hibernate.*` properties in `{config-file}`. {project-name} will raise an exception. Make up your mind on which approach you want to use. -- @@ -133,7 +133,7 @@ Want to start a PostgreSQL server on the side with Docker? [source] -- -docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name postgres-protean-hibernate -e POSTGRES_USER=hibernate -e POSTGRES_PASSWORD=hibernate -e POSTGRES_DB=hibernate_db -p 5432:5432 postgres:10.5 +docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name postgres-quarkus-hibernate -e POSTGRES_USER=hibernate -e POSTGRES_PASSWORD=hibernate -e POSTGRES_DB=hibernate_db -p 5432:5432 postgres:10.5 -- ==== @@ -149,29 +149,29 @@ This is useful for: [NOTE] -- -If you have a `persistence.xml`, then you cannot use the `shamrock.hibernate.*` properties +If you have a `persistence.xml`, then you cannot use the `quarkus.hibernate.*` properties and only persistence units defined in `persistence.xml` will be taken into account. -- In your `pom.xml`, add the following dependencies: * the Hibernate ORM extension -* your JDBC driver extension (`shamrock-jdbc-postgresql-deployment`, `shamrock-jdbc-h2-deployment`, `shamrock-jdbc-mariadb-deployment`, ...) +* your JDBC driver extension (`quarkus-jdbc-postgresql-deployment`, `quarkus-jdbc-h2-deployment`, `quarkus-jdbc-mariadb-deployment`, ...) [source,xml] -- - org.jboss.shamrock - shamrock-hibernate-orm-deployment + io.quarkus + quarkus-hibernate-orm-deployment provided - org.jboss.shamrock - shamrock-jdbc-postgresql-deployment + io.quarkus + quarkus-jdbc-postgresql-deployment provided diff --git a/docs/src/main/asciidoc/ide-configuration.adoc b/docs/src/main/asciidoc/ide-configuration.adoc index 03c12d578f062..07f82943cc645 100644 --- a/docs/src/main/asciidoc/ide-configuration.adoc +++ b/docs/src/main/asciidoc/ide-configuration.adoc @@ -8,14 +8,14 @@ Then, you can scaffold a new project with: [source,subs=attributes+] ---- -mvn org.jboss.shamrock:shamrock-maven-plugin:{shamrock-version}:create \ +mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \ -DprojectGroupId=my-groupId \ -DprojectArtifactId=my-artifactId \ -DprojectVersion=my-version \ -DclassName="org.my.group.MyResource" ---- -NOTE: If you just launch `mvn org.jboss.shamrock:shamrock-maven-plugin:{shamrock-version}:create` the Maven plugin asks +NOTE: If you just launch `mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create` the Maven plugin asks for user inputs. You can disable (and use default values) this interactive mode by passing `-B` to the Maven command. The following table lists the attributes you can pass to the `create` command: @@ -63,31 +63,31 @@ Instructions to build the image and run the container are written in the `Docker == Dealing with extensions -You can list extensions with: `mvn shamrock:list-extensions`. +You can list extensions with: `mvn quarkus:list-extensions`. You can enable an extension using: [source] -mvn shamrock:add-extension -Dextensions="validation" +mvn quarkus:add-extension -Dextensions="validation" Extensions are passed using a comma-separated list. == Development mode -Shamrock comes with a built-in development mode. +Quarkus comes with a built-in development mode. Run you application with: [source] -mvn compile shamrock:dev +mvn compile quarkus:dev You can then update the application sources, resources and configurations. The changes are automatically reflected in your running application. == Debugging -You can run a Shamrock application in debug mode using: +You can run a Quarkus application in debug mode using: [source] -mvn compile shamrock:dev -Ddebug=true +mvn compile quarkus:dev -Ddebug=true Then, attach your debugger to `localhost:5005`. @@ -103,7 +103,7 @@ In the wizard, select: `Maven -> Existing Maven Project`. On the next screen, select the root location of the project. The next screen list the found modules; select the generated project and click on `Finish`. Done! -In a separated terminal, run `mvn compile shamrock:dev`, and enjoy a highly productive environment. +In a separated terminal, run `mvn compile quarkus:dev`, and enjoy a highly productive environment. **IntelliJ** @@ -115,7 +115,7 @@ In IntelliJ: 4. Next a few times (review the different options if needed) 5. On the last screen click on Finish -In a separated terminal or in the embedded terminal, run `mvn compile shamrock:dev`. Enjoy! +In a separated terminal or in the embedded terminal, run `mvn compile quarkus:dev`. Enjoy! **Apache Netbeans** @@ -125,7 +125,7 @@ In Netbeans: 2. Select the project root 3. Click on `Open Project` -In a separated terminal or the embedded terminal, go to the project root and run `mvn compile shamrock:dev`. Enjoy! +In a separated terminal or the embedded terminal, go to the project root and run `mvn compile quarkus:dev`. Enjoy! **Visual Studio Code** diff --git a/docs/src/main/asciidoc/index.adoc b/docs/src/main/asciidoc/index.adoc index b12136bce1044..9ed44de7c5d45 100644 --- a/docs/src/main/asciidoc/index.adoc +++ b/docs/src/main/asciidoc/index.adoc @@ -1,6 +1,6 @@ = {project-name} -include::protean-intro.adoc[tag=intro] +include::quarkus-intro.adoc[tag=intro] == Getting Started @@ -46,14 +46,14 @@ _Recommended:_ You can contact the project team using: -* email using the http://post-office.corp.redhat.com/mailman/listinfo/protean-dev[protean-dev@redhat.com] mailing list -* chat using https://protean.zulipchat.com[Zulip] +* email using the http://post-office.corp.redhat.com/mailman/listinfo/quarkus-dev[quarkus-dev@redhat.com] mailing list +* chat using https://quarkus.zulipchat.com[Zulip] Your help is more than welcome! Don't hesitate to join the crowd. == Contributing -Check the https://github.com/protean-project/shamrock/blob/master/CONTRIBUTING.md[Contribution Guide] for details on reporting issues and the process for submitting pull requests. +Check the https://github.com/quarkus-project/quarkus/blob/master/CONTRIBUTING.md[Contribution Guide] for details on reporting issues and the process for submitting pull requests. Every contribution is valuable. It can be a bug report, an example application, a feature request, a fix in the documentation or just feedback. @@ -64,6 +64,6 @@ We are in an incubation phase, so we don't have a 1.0.0 release yet. == License -This project is licensed under the Apache Software License 2.0 - see the https://github.com/protean-project/shamrock/blob/master/LICENSE.txt[License file] for details. +This project is licensed under the Apache Software License 2.0 - see the https://github.com/quarkus-project/quarkus/blob/master/LICENSE.txt[License file] for details. diff --git a/docs/src/main/asciidoc/infinispan-client-guide.adoc b/docs/src/main/asciidoc/infinispan-client-guide.adoc index 6087adca75d7d..aed955e89fb65 100644 --- a/docs/src/main/asciidoc/infinispan-client-guide.adoc +++ b/docs/src/main/asciidoc/infinispan-client-guide.adoc @@ -12,15 +12,15 @@ Once you have your {project-name} project configured you can add the `infinispan to your project by running the following from the command line in your project base directory. [source] -mvn shamrock:add-extension -Dextensions="infinispan-client" +mvn quarkus:add-extension -Dextensions="infinispan-client" This will add the following to your pom.xml [source,xml] ---- - org.jboss.shamrock - shamrock-infinispan-client-deployment + io.quarkus + quarkus-infinispan-client-deployment ---- @@ -34,12 +34,12 @@ can be configured in this file: | Default Value | Description -| `shamrock.infinispan-client.server-list` +| `quarkus.infinispan-client.server-list` | | Defines the list of servers to connect to upon startup. This allows for multiple servers separated by a semicolon for each. (eg. host1:11222;host:11222) -| `shamrock.infinispan-client.near-cache-max-entries` +| `quarkus.infinispan-client.near-cache-max-entries` | 0 | Controls whether the near cache is enabled (allowing repeated retrievals to be stored). If this value is zero or less near cache is disabled. A value greater than zero enables near @@ -324,9 +324,9 @@ CounterManager counterManager; == Near Caching Near caching is disabled by default, but you can enable it by setting the profile config property -`shamrock.infinispan-client.near-cache-max-entries` to a value greater than 0. You can also configure +`quarkus.infinispan-client.near-cache-max-entries` to a value greater than 0. You can also configure a regular expression so that only a subset of caches have near caching applied through the -`shamrock.infinispan-client.near-cache-name-pattern` attribute. +`quarkus.infinispan-client.near-cache-name-pattern` attribute. == Encryption @@ -340,7 +340,7 @@ The reason that {project-name} is different is that SubstrateVM does not come wi services enabled. This is mentioned at https://github.com/oracle/graal/blob/master/substratevm/JCA-SECURITY-SERVICES.md. To do this you will need to set the `true` value -in the `shamrock-maven-plugin` configuration values. +in the `quarkus-maven-plugin` configuration values. An example is as shown here, with a comment highlighting them: @@ -348,7 +348,7 @@ An example is as shown here, with a comment highlighting them: ---- ${project.groupId} - shamrock-maven-plugin + quarkus-maven-plugin native-image diff --git a/docs/src/main/asciidoc/json-and-validation-guide.adoc b/docs/src/main/asciidoc/json-and-validation-guide.adoc index 7d27322555b76..94bf98194b573 100644 --- a/docs/src/main/asciidoc/json-and-validation-guide.adoc +++ b/docs/src/main/asciidoc/json-and-validation-guide.adoc @@ -26,9 +26,9 @@ image:validation-guide-architecture.png[alt=Architecture,width=640,height=480] We recommend you to follow the instructions in the next sections and create the application step by step. However, you can go right to the completed example. -Clone the Git repository: `git clone https://github.com/jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone https://github.com/jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. -The solution is located in the `input-validation` https://github.com/jbossas/protean-quickstarts/tree/master/input-validation[directory]. +The solution is located in the `input-validation` https://github.com/jbossas/quarkus-quickstarts/tree/master/input-validation[directory]. == Creating the Maven project @@ -36,7 +36,7 @@ First, we need a new project. Create a new project with the following command: [source, subs=attributes+] ---- -mvn org.jboss.shamrock:shamrock-maven-plugin:{shamrock-version}:create \ +mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \ -DprojectGroupId=org.acme \ -DprojectArtifactId=input-validation \ -DclassName="org.acme.validation.BookResource" \ @@ -251,15 +251,15 @@ Keep in mind that you usually don't want to expose to the public the internals o == A frontend Now let's add the simple web page to interact with our `BookResource`. -Shamrock automatically serves static resources contained in the `META-INF/resources` directory. -In the `src/main/resources/META-INF/resources` directory, replace the `index.html` file with the content from this https://raw.githubusercontent.com/jbossas/protean-quickstarts/master/input-validation/src/main/resources/META-INF/resources/index.html[index.html] file in it. +Quarkus automatically serves static resources contained in the `META-INF/resources` directory. +In the `src/main/resources/META-INF/resources` directory, replace the `index.html` file with the content from this https://raw.githubusercontent.com/jbossas/quarkus-quickstarts/master/input-validation/src/main/resources/META-INF/resources/index.html[index.html] file in it. == Run the application Now, let's see our application in action. Run it with: ``` -mvn compile shamrock:dev +mvn compile quarkus:dev ``` Then, open your browser to http://localhost:8080/: diff --git a/docs/src/main/asciidoc/kubernetes-guide.adoc b/docs/src/main/asciidoc/kubernetes-guide.adoc index 2160f77deea57..fa925f7b90fec 100644 --- a/docs/src/main/asciidoc/kubernetes-guide.adoc +++ b/docs/src/main/asciidoc/kubernetes-guide.adoc @@ -26,7 +26,7 @@ Remember, you need to configure Maven as indicated in the link:maven-config.html We recommend to follow the instructions in the next sections and build the application step by step. However, you can go right to the completed example. -Clone the Git repository: `git clone https://github.com/jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone https://github.com/jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. The solution is located in the `getting-started-kubernetes` directory. @@ -41,22 +41,22 @@ For `minikube`, execute: # For minishift use "eval $(minishift docker-env)" instead eval $(minikube docker-env) -docker build -t shamrock-quickstart/quickstart . +docker build -t quarkus-quickstart/quickstart . ---- Once the image has been pushed to the Kubernetes image registry, instantiate the application as follows: [source, bash] ---- -kubectl run shamrock-quickstart --image=shamrock-quickstart/quickstart:latest --port=8080 --image-pull-policy=IfNotPresent -kubectl expose deployment shamrock-quickstart --type=NodePort +kubectl run quarkus-quickstart --image=quarkus-quickstart/quickstart:latest --port=8080 --image-pull-policy=IfNotPresent +kubectl expose deployment quarkus-quickstart --type=NodePort ---- The application is now exposed as an internal service. If you are using `minikube`, you can access it using: [source, bash] ---- -curl $(minikube service shamrock-quickstart --url)/hello/greeting/shamrock +curl $(minikube service quarkus-quickstart --url)/hello/greeting/quarkus ---- == Deploying the application in OpenShift @@ -67,25 +67,25 @@ As we have a `Dockerfile` available, we are going to create an OpenShift `build` [source] ---- # To build the image on OpenShift -oc new-build --binary --name=shamrock-quickstart -l app=shamrock-quickstart -oc start-build shamrock-quickstart --from-dir=. --follow +oc new-build --binary --name=quarkus-quickstart -l app=quarkus-quickstart +oc start-build quarkus-quickstart --from-dir=. --follow # To instantiate the image -oc new-app --image-stream=shamrock-quickstart:latest +oc new-app --image-stream=quarkus-quickstart:latest # To create the route -oc expose service shamrock-quickstart +oc expose service quarkus-quickstart # Get the route URL -export URL="http://$(oc get route | grep shamrock-quickstart | awk '{print $2}')" -curl $URL/hello/greeting/shamrock +export URL="http://$(oc get route | grep quarkus-quickstart | awk '{print $2}')" +curl $URL/hello/greeting/quarkus ---- Your application is accessible at the printed URL. == Going further -This guide covered the deployment of a Shamrock application on Kubernetes and OpenShift. -However, there is much more, and the integration with these environments has been tailored to make Shamrock applications execution very smooth. +This guide covered the deployment of a Quarkus application on Kubernetes and OpenShift. +However, there is much more, and the integration with these environments has been tailored to make Quarkus applications execution very smooth. For instance, the health extension can be used for health check; the configuration support allows mounting the application configuration using config map, the metric extension produces data _scrappable_ by Prometheus and so on. diff --git a/docs/src/main/asciidoc/opentracing-guide.adoc b/docs/src/main/asciidoc/opentracing-guide.adoc index ce6099b965bce..32c602d9bb2fe 100644 --- a/docs/src/main/asciidoc/opentracing-guide.adoc +++ b/docs/src/main/asciidoc/opentracing-guide.adoc @@ -1,6 +1,6 @@ = {project-name} - Using OpenTracing -This guide explains how your Shamrock application can utilize opentracing to provide distributed tracing for +This guide explains how your Quarkus application can utilize opentracing to provide distributed tracing for interactive web applications. == Prerequisites @@ -24,9 +24,9 @@ In this guide, we create a straightforward REST application to demonstrate distr We recommend you to follow the instructions in the next sections and create the application step by step. However, you can skip right to the completed example. -Clone the Git repository: `git clone https://github.com/jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone https://github.com/jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. -The solution is located in the `using-opentracing` https://github.com/jbossas/protean-quickstarts/tree/master/using-opentracing[directory]. +The solution is located in the `using-opentracing` https://github.com/jbossas/quarkus-quickstarts/tree/master/using-opentracing[directory]. == Creating the Maven project @@ -34,7 +34,7 @@ First, we need a new project. Create a new project with the following command: [source, subs=attributes+] ---- -mvn org.jboss.shamrock:shamrock-maven-plugin:{shamrock-version}:create \ +mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \ -DprojectGroupId=org.acme \ -DprojectArtifactId=using-opentracing \ -DclassName="org.acme.opentracing.TracedResource" \ @@ -85,7 +85,7 @@ Now we are ready to run our application. Use: [source, text] ---- -mvn compile shamrock:dev -Djvm.args="-DJAEGER_SERVICE_NAME=myservice -DJAEGER_SAMPLER_TYPE=const -DJAEGER_SAMPLER_PARAM=1 -DJAEGER_ENDPOINT=http://localhost:14268/api/traces" +mvn compile quarkus:dev -Djvm.args="-DJAEGER_SERVICE_NAME=myservice -DJAEGER_SAMPLER_TYPE=const -DJAEGER_SAMPLER_PARAM=1 -DJAEGER_ENDPOINT=http://localhost:14268/api/traces" ---- The supplied `jvm.args` are used to configure the default OpenTracing tracer (Jaeger). If the `JAEGER_SERVICE_NAME` property is not provided then a "no-op" tracer will be configured, resulting in no tracing data being reported to the backend. The other properties are explained in the https://www.jaegertracing.io/docs/latest/client-features/[Tracer configuration via environment variables] section of the Jaeger documentation. diff --git a/docs/src/main/asciidoc/performance-measure.adoc b/docs/src/main/asciidoc/performance-measure.adoc index 208405f352b51..09e28bd07b9bf 100644 --- a/docs/src/main/asciidoc/performance-measure.adoc +++ b/docs/src/main/asciidoc/performance-measure.adoc @@ -53,11 +53,11 @@ Linux:: pmap -x - 13150: /data/shamrock-application -Xmx100m -Xmn70m + 13150: /data/quarkus-application -Xmx100m -Xmn70m Address Kbytes RSS Dirty Mode Mapping - 0000000000400000 55652 30592 0 r-x-- shamrock-application - 0000000003c58000 4 4 4 r-x-- shamrock-application - 0000000003c59000 5192 4628 748 rwx-- shamrock-application + 0000000000400000 55652 30592 0 r-x-- quarkus-application + 0000000003c58000 4 4 4 r-x-- quarkus-application + 0000000003c59000 5192 4628 748 rwx-- quarkus-application 00000000054c0000 912 156 156 rwx-- [ anon ] ... 00007fcd13400000 1024 1024 1024 rwx-- [ anon ] diff --git a/docs/src/main/asciidoc/protean-intro.adoc b/docs/src/main/asciidoc/protean-intro.adoc index c57f0c9b6684a..4b93f0bbec9e3 100644 --- a/docs/src/main/asciidoc/protean-intro.adoc +++ b/docs/src/main/asciidoc/protean-intro.adoc @@ -46,7 +46,7 @@ It unifies imperative and reactive. It is a Microservice first toolkit. Standards based -Protean brings all the standards and frameworks you love and use: RESTEasy, Hibernate, Netty, vert.x, Camel...) +Quarkus brings all the standards and frameworks you love and use: RESTEasy, Hibernate, Netty, vert.x, Camel...) Imperative and Reactive diff --git a/docs/src/main/asciidoc/rest-client-guide.adoc b/docs/src/main/asciidoc/rest-client-guide.adoc index a223f6ba74f46..548ecb321f76c 100644 --- a/docs/src/main/asciidoc/rest-client-guide.adoc +++ b/docs/src/main/asciidoc/rest-client-guide.adoc @@ -19,7 +19,7 @@ Remember, you need to configure Maven as indicated in the link:maven-config.html We recommend you to follow the instructions in the next sections and create the application step by step. However, you can go right to the completed example. -Clone the Git repository: `git clone https://github.com/jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone https://github.com/jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. The solution is located in the `rest-client` directory. @@ -29,7 +29,7 @@ First, we need a new project. Create a new project with the following command: [source, subs=attributes+] ---- -mvn org.jboss.shamrock:shamrock-maven-plugin:{shamrock-version}:create \ +mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \ -DprojectGroupId=org.acme \ -DprojectArtifactId=rest-client \ -DclassName="org.acme.restclient.CountriesResource" \ @@ -232,13 +232,13 @@ Edit the `src/test/java/org/acme/restclient/CountriesResourceTest.java` file and ---- package org.acme.restclient; -import org.jboss.shamrock.test.junit.ShamrockTest; +import io.quarkus.test.junit.QuarkusTest; import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; -@ShamrockTest +@QuarkusTest public class CountriesResourceTest { @Test @@ -262,7 +262,7 @@ The code above uses link:http://rest-assured.io/[REST Assured]'s link:https://gi == Package and run the application -Run the application with: `mvn compile shamrock:dev`. +Run the application with: `mvn compile quarkus:dev`. Open your browser to http://localhost:8080/country/name/greece. You should see a JSON object containing some basic information about Greece. diff --git a/docs/src/main/asciidoc/scheduled-guide.adoc b/docs/src/main/asciidoc/scheduled-guide.adoc index 28171de6d0304..491bcb4b0b190 100644 --- a/docs/src/main/asciidoc/scheduled-guide.adoc +++ b/docs/src/main/asciidoc/scheduled-guide.adoc @@ -26,7 +26,7 @@ image:scheduling-task-architecture.png[alt=Architecture,width=640,height=480] We recommend you to follow the instructions in the next sections and create the application step by step. However, you can go right to the completed example. -Clone the Git repository: `git clone https://github.com/jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone https://github.com/jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. The solution is located in the `scheduling-periodic-task` directory. @@ -36,7 +36,7 @@ First, we need a new project. Create a new project with the following command: [source, subs=attributes+] ---- -mvn org.jboss.shamrock:shamrock-maven-plugin:{shamrock-version}:create \ +mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \ -DprojectGroupId=org.acme \ -DprojectArtifactId=scheduling-periodic-tasks \ -DclassName="org.acme.scheduling.CountResource" \ @@ -53,7 +53,7 @@ It generates: * an `org.acme.scheduling.CountResource` resource * an associated test -The Maven project also imports the Shamrock scheduler extension. +The Maven project also imports the Quarkus scheduler extension. == Creating a scheduled job @@ -65,7 +65,7 @@ package org.acme.scheduling; import java.util.concurrent.atomic.AtomicInteger; import javax.enterprise.context.ApplicationScoped; -import org.jboss.shamrock.scheduler.api.Scheduled; +import io.quarkus.scheduler.api.Scheduled; @ApplicationScoped // <1> public class CounterBean { @@ -84,7 +84,7 @@ public class CounterBean { } ---- 1. Declare the bean in the _application_ scope -2. Use the `@Scheduled` annotation to instruct Shamrock to runs this method every 10 seconds +2. Use the `@Scheduled` annotation to instruct Quarkus to runs this method every 10 seconds The code is pretty straightforward. Every 10 seconds, the counter is incremented. The `get()` method allows retrieving the current value. @@ -129,13 +129,13 @@ We also need to update the tests. Edit the `CountResourceTest` class to match: ---- package org.acme.scheduling; -import org.jboss.shamrock.test.junit.ShamrockTest; +import io.quarkus.test.junit.QuarkusTest; import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.containsString; -@ShamrockTest +@QuarkusTest public class CountResourceTest { @Test @@ -153,7 +153,7 @@ public class CountResourceTest { == Package and run the application -Run the application with: `mvn compile shamrock:dev`. +Run the application with: `mvn compile quarkus:dev`. In another terminal, run `curl localhost:8080/count` to check the counter value. After a few seconds, re-run `curl localhost:8080/count` to verify the counter has been incremented. diff --git a/docs/src/main/asciidoc/spring-di-guide.adoc b/docs/src/main/asciidoc/spring-di-guide.adoc index cc1539ffaacde..2ba1aba0d2fa8 100644 --- a/docs/src/main/asciidoc/spring-di-guide.adoc +++ b/docs/src/main/asciidoc/spring-di-guide.adoc @@ -21,7 +21,7 @@ Remember, you need to configure Maven as indicated in the link:maven-config.html We recommend you to follow the instructions in the next sections and create the application step by step. However, you can go right to the completed example. -Clone the Git repository: `git clone https://github.com/jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone https://github.com/jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. The solution is located in the `using-spring-di` directory. @@ -31,7 +31,7 @@ First, we need a new project. Create a new project with the following command: [source, subs=attributes+] ---- -mvn org.jboss.shamrock:shamrock-maven-plugin:{shamrock-version}:create \ +mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \ -DprojectGroupId=org.acme \ -DprojectArtifactId=using-spring-di \ -DclassName="org.acme.spring.di.GreeterResource" \ @@ -43,7 +43,7 @@ This command generates a Maven project with a REST endpoint and imports the `spr === Examine the pom.xml file -In the `pom.xml` file, we see that the `shamrock-spring-di-deployment` dependency has been added. +In the `pom.xml` file, we see that the `quarkus-spring-di-deployment` dependency has been added. We also need to add a dependency on the `spring-context` artifact, which we can do by adding: @@ -229,13 +229,13 @@ Edit the `src/test/java/org/acme/spring/di/GreetingResourceTest.java` file and c [source, java] ---- -import org.jboss.shamrock.test.junit.ShamrockTest; +import io.quarkus.test.junit.QuarkusTest; import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; -@ShamrockTest +@QuarkusTest public class GreetingResourceTest { @Test @@ -252,7 +252,7 @@ public class GreetingResourceTest { == Package and run the application -Run the application with: `mvn compile shamrock:dev`. +Run the application with: `mvn compile quarkus:dev`. Open your browser to http://localhost:8080/greeting. The result should be: `HELLO WORLD!`. \ No newline at end of file diff --git a/docs/src/main/asciidoc/transaction-guide.adoc b/docs/src/main/asciidoc/transaction-guide.adoc index 8d99b6c098425..156bde470efa3 100644 --- a/docs/src/main/asciidoc/transaction-guide.adoc +++ b/docs/src/main/asciidoc/transaction-guide.adoc @@ -18,8 +18,8 @@ Add the following to your `pom.xml`: - org.jboss.shamrock - shamrock-narayana-jta-deployment + io.quarkus + quarkus-narayana-jta-deployment -- diff --git a/docs/src/main/asciidoc/websocket-guide.adoc b/docs/src/main/asciidoc/websocket-guide.adoc index e9970134a3305..34e30278b6105 100644 --- a/docs/src/main/asciidoc/websocket-guide.adoc +++ b/docs/src/main/asciidoc/websocket-guide.adoc @@ -1,6 +1,6 @@ = {project-name} - Using Web Sockets -This guide explains how your Shamrock application can utilize web sockets to create interactive web applications. +This guide explains how your Quarkus application can utilize web sockets to create interactive web applications. Because it's the _canonical_ web socket application, we are going to create a simple chat application. == Prerequisites @@ -25,9 +25,9 @@ image:websocket-guide-architecture.png[alt=Architecture,width=640,height=480] We recommend you to follow the instructions in the next sections and create the application step by step. However, you can skip right to the completed example. -Clone the Git repository: `git clone https://github.com/jbossas/protean-quickstarts.git`, or download an https://github.com/jbossas/protean-quickstarts/archive/master.zip[archive]. +Clone the Git repository: `git clone https://github.com/jbossas/quarkus-quickstarts.git`, or download an https://github.com/jbossas/quarkus-quickstarts/archive/master.zip[archive]. -The solution is located in the `using-websockets` https://github.com/jbossas/protean-quickstarts/tree/master/using-websockets[directory]. +The solution is located in the `using-websockets` https://github.com/jbossas/quarkus-quickstarts/tree/master/using-websockets[directory]. == Creating the Maven project @@ -35,7 +35,7 @@ First, we need a new project. Create a new project with the following command: [source, subs=attributes+] ---- -mvn org.jboss.shamrock:shamrock-maven-plugin:{shamrock-version}:create \ +mvn io.quarkus:quarkus-maven-plugin:{quarkus-version}:create \ -DprojectGroupId=org.acme \ -DprojectArtifactId=using-websockets \ -Dextensions="undertow-websockets" @@ -112,15 +112,15 @@ public class ChatSocket { == A slick web frontend All chat applications need a _nice_ UI, well, this one may not be that nice, but does the work. -Shamrock automatically serves static resources contained in the `META-INF/resources` directory. -Create the `src/main/resources/META-INF/resources` directory and copy this https://github.com/jbossas/protean-quickstarts/blob/master/using-websockets/src/main/resources/assets/index.html[index.html] file in it. +Quarkus automatically serves static resources contained in the `META-INF/resources` directory. +Create the `src/main/resources/META-INF/resources` directory and copy this https://github.com/jbossas/quarkus-quickstarts/blob/master/using-websockets/src/main/resources/assets/index.html[index.html] file in it. == Run the application Now, let's see our application in action. Run it with: ``` -mvn compile shamrock:dev +mvn compile quarkus:dev ``` Then open your 2 browser windows to http://localhost:8080/: @@ -134,4 +134,4 @@ image:websocket-guide-screenshot.png[alt=Application,width=800] As usual, the application can be packaged using `mvn clean package` and executed using the `-runner.jar` file. You can also build the native executable using `mvn package -Pnative`. -You can also test your web socket applications using the approach detailed https://github.com/jbossas/protean-quickstarts/blob/master/using-websockets/src/test/java/org/acme/websocket/ChatTestCase.java[here]. \ No newline at end of file +You can also test your web socket applications using the approach detailed https://github.com/jbossas/quarkus-quickstarts/blob/master/using-websockets/src/test/java/org/acme/websocket/ChatTestCase.java[here]. \ No newline at end of file diff --git a/extensions/agroal/deployment/pom.xml b/extensions/agroal/deployment/pom.xml index 90e3f39fdd318..c2e59f434812f 100644 --- a/extensions/agroal/deployment/pom.xml +++ b/extensions/agroal/deployment/pom.xml @@ -19,32 +19,32 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-agroal - org.jboss.shamrock + quarkus-agroal + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-agroal-deployment - Shamrock - Agroal - Deployment + quarkus-agroal-deployment + Quarkus - Agroal - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-agroal-runtime + io.quarkus + quarkus-agroal-runtime - org.jboss.shamrock - shamrock-narayana-jta-deployment + io.quarkus + quarkus-narayana-jta-deployment @@ -55,8 +55,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/agroal/deployment/src/main/java/org/jboss/shamrock/agroal/AgroalProcessor.java b/extensions/agroal/deployment/src/main/java/org/jboss/shamrock/agroal/AgroalProcessor.java index 433a76ea57bfd..93f3075a85a92 100644 --- a/extensions/agroal/deployment/src/main/java/org/jboss/shamrock/agroal/AgroalProcessor.java +++ b/extensions/agroal/deployment/src/main/java/org/jboss/shamrock/agroal/AgroalProcessor.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package org.jboss.shamrock.agroal; +package io.quarkus.agroal; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.STATIC_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; import org.jboss.logging.Logger; -import org.jboss.shamrock.agroal.runtime.DataSourceProducer; -import org.jboss.shamrock.agroal.runtime.DataSourceTemplate; -import org.jboss.shamrock.agroal.runtime.DatasourceConfig; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.arc.deployment.BeanContainerListenerBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.ExtensionSslNativeSupportBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.SslNativeConfigBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateResourceBuildItem; +import io.quarkus.agroal.runtime.DataSourceProducer; +import io.quarkus.agroal.runtime.DataSourceTemplate; +import io.quarkus.agroal.runtime.DatasourceConfig; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.BeanContainerListenerBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.SslNativeConfigBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem; class AgroalProcessor { diff --git a/extensions/agroal/deployment/src/main/java/org/jboss/shamrock/agroal/DataSourceDriverBuildItem.java b/extensions/agroal/deployment/src/main/java/org/jboss/shamrock/agroal/DataSourceDriverBuildItem.java index 62ba113404d77..2e7cbab7703f1 100644 --- a/extensions/agroal/deployment/src/main/java/org/jboss/shamrock/agroal/DataSourceDriverBuildItem.java +++ b/extensions/agroal/deployment/src/main/java/org/jboss/shamrock/agroal/DataSourceDriverBuildItem.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.agroal; +package io.quarkus.agroal; import org.jboss.builder.item.SimpleBuildItem; diff --git a/extensions/agroal/pom.xml b/extensions/agroal/pom.xml index 45fd768bb38e6..bac55e4ef2a36 100644 --- a/extensions/agroal/pom.xml +++ b/extensions/agroal/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-agroal - Shamrock - Agroal + quarkus-agroal + Quarkus - Agroal pom deployment diff --git a/extensions/agroal/runtime/pom.xml b/extensions/agroal/runtime/pom.xml index cc19ee4482bd6..4c5dbff0c6bb4 100644 --- a/extensions/agroal/runtime/pom.xml +++ b/extensions/agroal/runtime/pom.xml @@ -19,24 +19,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-agroal - org.jboss.shamrock + quarkus-agroal + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-agroal-runtime - Shamrock - Agroal - Runtime + quarkus-agroal-runtime + Quarkus - Agroal - Runtime - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime com.oracle.substratevm @@ -82,8 +82,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DataSourceProducer.java b/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DataSourceProducer.java index 5e5015d3f5839..c4ad6959150fb 100644 --- a/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DataSourceProducer.java +++ b/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DataSourceProducer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.agroal.runtime; +package io.quarkus.agroal.runtime; import java.sql.Driver; import java.sql.SQLException; diff --git a/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DataSourceTemplate.java b/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DataSourceTemplate.java index a31f1476a0bdd..3afd21b63859b 100644 --- a/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DataSourceTemplate.java +++ b/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DataSourceTemplate.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jboss.shamrock.agroal.runtime; +package io.quarkus.agroal.runtime; -import org.jboss.shamrock.arc.runtime.BeanContainer; -import org.jboss.shamrock.arc.runtime.BeanContainerListener; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.arc.runtime.BeanContainerListener; +import io.quarkus.runtime.annotations.Template; @Template public class DataSourceTemplate { diff --git a/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DatasourceConfig.java b/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DatasourceConfig.java index 8e4cb0b9475a7..5b52fdf6c56e9 100644 --- a/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DatasourceConfig.java +++ b/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/DatasourceConfig.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jboss.shamrock.agroal.runtime; +package io.quarkus.agroal.runtime; import java.util.Optional; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; @ConfigRoot(phase = ConfigPhase.RUN_TIME_STATIC) public class DatasourceConfig { diff --git a/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/graal/AgroalDataSourceReplacement.java b/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/graal/AgroalDataSourceReplacement.java index 55dbb1ae45e58..c670dea0b58dd 100644 --- a/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/graal/AgroalDataSourceReplacement.java +++ b/extensions/agroal/runtime/src/main/java/org/jboss/shamrock/agroal/runtime/graal/AgroalDataSourceReplacement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.agroal.runtime.graal; +package io.quarkus.agroal.runtime.graal; import java.sql.SQLException; diff --git a/extensions/arc/deployment/pom.xml b/extensions/arc/deployment/pom.xml index 41507cc55a914..566184d1262d0 100644 --- a/extensions/arc/deployment/pom.xml +++ b/extensions/arc/deployment/pom.xml @@ -19,33 +19,33 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-arc - org.jboss.shamrock + quarkus-arc + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-arc-deployment - Shamrock - ArC - Deployment + quarkus-arc-deployment + Quarkus - ArC - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime - org.jboss.protean.arc + org.jboss.quarkus.arc arc-processor - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal @@ -57,8 +57,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/AdditionalBeanBuildItem.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/AdditionalBeanBuildItem.java index 5fb75b4a04684..b011b3bea7ba7 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/AdditionalBeanBuildItem.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/AdditionalBeanBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import java.util.Arrays; import java.util.Collections; diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/AnnotationsTransformerBuildItem.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/AnnotationsTransformerBuildItem.java index 95e07c93e416a..cca65bb7333a5 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/AnnotationsTransformerBuildItem.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/AnnotationsTransformerBuildItem.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.protean.arc.processor.AnnotationsTransformer; +import org.jboss.quarkus.arc.processor.AnnotationsTransformer; public final class AnnotationsTransformerBuildItem extends MultiBuildItem { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java index bbece4e1eaf81..682b88d5540d3 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.STATIC_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; import java.io.IOException; import java.util.ArrayList; @@ -37,36 +37,36 @@ import org.jboss.jandex.Indexer; import org.jboss.jandex.MethodInfo; import org.jboss.logging.Logger; -import org.jboss.protean.arc.ArcContainer; -import org.jboss.protean.arc.processor.AnnotationsTransformer; -import org.jboss.protean.arc.processor.BeanDefiningAnnotation; -import org.jboss.protean.arc.processor.BeanDeployment; -import org.jboss.protean.arc.processor.BeanProcessor; -import org.jboss.protean.arc.processor.BeanProcessor.Builder; -import org.jboss.protean.arc.processor.ReflectionRegistration; -import org.jboss.protean.arc.processor.ResourceOutput; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.arc.deployment.UnremovableBeanBuildItem.BeanClassNameExclusion; -import org.jboss.shamrock.arc.deployment.UnremovableBeanBuildItem.BeanClassAnnotationExclusion; -import org.jboss.shamrock.arc.runtime.ArcDeploymentTemplate; -import org.jboss.shamrock.arc.runtime.BeanContainer; -import org.jboss.shamrock.arc.runtime.LifecycleEventRunner; -import org.jboss.shamrock.deployment.Capabilities; -import org.jboss.shamrock.deployment.builditem.ApplicationArchivesBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.GeneratedClassBuildItem; -import org.jboss.shamrock.deployment.builditem.GeneratedResourceBuildItem; -import org.jboss.shamrock.deployment.builditem.ShutdownContextBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveFieldBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveMethodBuildItem; -import org.jboss.shamrock.deployment.index.IndexingUtil; +import org.jboss.quarkus.arc.ArcContainer; +import org.jboss.quarkus.arc.processor.AnnotationsTransformer; +import org.jboss.quarkus.arc.processor.BeanDefiningAnnotation; +import org.jboss.quarkus.arc.processor.BeanDeployment; +import org.jboss.quarkus.arc.processor.BeanProcessor; +import org.jboss.quarkus.arc.processor.BeanProcessor.Builder; +import org.jboss.quarkus.arc.processor.ReflectionRegistration; +import org.jboss.quarkus.arc.processor.ResourceOutput; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanClassNameExclusion; +import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanClassAnnotationExclusion; +import io.quarkus.arc.runtime.ArcDeploymentTemplate; +import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.arc.runtime.LifecycleEventRunner; +import io.quarkus.deployment.Capabilities; +import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.GeneratedClassBuildItem; +import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; +import io.quarkus.deployment.builditem.ShutdownContextBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveFieldBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveMethodBuildItem; +import io.quarkus.deployment.index.IndexingUtil; public class ArcAnnotationProcessor { - private static final Logger log = Logger.getLogger("org.jboss.shamrock.arc.deployment.processor"); + private static final Logger log = Logger.getLogger("io.quarkus.arc.deployment.processor"); @Inject BeanArchiveIndexBuildItem beanArchiveIndex; @@ -127,7 +127,7 @@ public BeanContainerBuildItem build(ArcDeploymentTemplate arcTemplate, List additionalIndex = new HashSet<>(); for (String beanClass : additionalBeans) { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcConfig.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcConfig.java index cd6a570fe13c4..d86c6531d2dd1 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcConfig.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcConfig.java @@ -1,9 +1,9 @@ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; -import static org.jboss.shamrock.runtime.annotations.ConfigPhase.BUILD_TIME; +import static io.quarkus.runtime.annotations.ConfigPhase.BUILD_TIME; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigRoot; @ConfigRoot(phase = BUILD_TIME) public class ArcConfig { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanArchiveIndexBuildItem.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanArchiveIndexBuildItem.java index 8babcdc4417e0..03e4ad38f0013 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanArchiveIndexBuildItem.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanArchiveIndexBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import org.jboss.builder.item.SimpleBuildItem; import org.jboss.jandex.IndexView; diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanArchiveProcessor.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanArchiveProcessor.java index 3274944189cd9..3687e0cadcf04 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanArchiveProcessor.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanArchiveProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import java.util.ArrayList; import java.util.Collection; @@ -30,13 +30,13 @@ import org.jboss.jandex.CompositeIndex; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; -import org.jboss.protean.arc.processor.BeanDefiningAnnotation; -import org.jboss.protean.arc.processor.BeanDeployment; -import org.jboss.protean.arc.processor.DotNames; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.ApplicationArchive; -import org.jboss.shamrock.deployment.builditem.ApplicationArchivesBuildItem; +import org.jboss.quarkus.arc.processor.BeanDefiningAnnotation; +import org.jboss.quarkus.arc.processor.BeanDeployment; +import org.jboss.quarkus.arc.processor.DotNames; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.ApplicationArchive; +import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem; public class BeanArchiveProcessor { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanContainerBuildItem.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanContainerBuildItem.java index a71717a23afd7..43784f42d9a33 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanContainerBuildItem.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanContainerBuildItem.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import org.jboss.builder.item.SimpleBuildItem; -import org.jboss.shamrock.arc.runtime.BeanContainer; +import io.quarkus.arc.runtime.BeanContainer; public final class BeanContainerBuildItem extends SimpleBuildItem { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanContainerListenerBuildItem.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanContainerListenerBuildItem.java index 2c8036d671b32..3b653f6a297b4 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanContainerListenerBuildItem.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanContainerListenerBuildItem.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.arc.runtime.BeanContainerListener; +import io.quarkus.arc.runtime.BeanContainerListener; public final class BeanContainerListenerBuildItem extends MultiBuildItem { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanDefiningAnnotationBuildItem.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanDefiningAnnotationBuildItem.java index 0958e7cba6667..9fbe9ec1177fe 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanDefiningAnnotationBuildItem.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanDefiningAnnotationBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import org.jboss.builder.item.MultiBuildItem; import org.jboss.jandex.DotName; diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanDeploymentValidatorBuildItem.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanDeploymentValidatorBuildItem.java index 4dd7ecf3f2ba7..797df0dd9e20b 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanDeploymentValidatorBuildItem.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanDeploymentValidatorBuildItem.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.protean.arc.processor.BeanDeploymentValidator; +import org.jboss.quarkus.arc.processor.BeanDeploymentValidator; public final class BeanDeploymentValidatorBuildItem extends MultiBuildItem { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanRegistrarBuildItem.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanRegistrarBuildItem.java index f753a0cd79221..a955f40ab0dcf 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanRegistrarBuildItem.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanRegistrarBuildItem.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.protean.arc.processor.BeanRegistrar; +import org.jboss.quarkus.arc.processor.BeanRegistrar; public final class BeanRegistrarBuildItem extends MultiBuildItem { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ConfigBuildStep.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ConfigBuildStep.java index f781767c5a43b..1d590f47e3549 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ConfigBuildStep.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ConfigBuildStep.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; @@ -7,10 +7,10 @@ import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.DotName; import org.jboss.jandex.Type; -import org.jboss.protean.arc.processor.BeanDeploymentValidator; -import org.jboss.protean.arc.processor.DotNames; -import org.jboss.protean.arc.processor.InjectionPointInfo; -import org.jboss.shamrock.deployment.annotations.BuildStep; +import org.jboss.quarkus.arc.processor.BeanDeploymentValidator; +import org.jboss.quarkus.arc.processor.DotNames; +import org.jboss.quarkus.arc.processor.InjectionPointInfo; +import io.quarkus.deployment.annotations.BuildStep; import io.smallrye.config.inject.ConfigProducer; diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/GeneratedBeanBuildItem.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/GeneratedBeanBuildItem.java index f0a165cc666ef..fef0eba4af7b0 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/GeneratedBeanBuildItem.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/GeneratedBeanBuildItem.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import org.jboss.builder.item.MultiBuildItem; /** - * A generated CDI bean. If this is produced then a {@link org.jboss.shamrock.deployment.builditem.GeneratedClassBuildItem} + * A generated CDI bean. If this is produced then a {@link io.quarkus.deployment.builditem.GeneratedClassBuildItem} * should not be produced for the same class, as Arc will take care of this. */ public final class GeneratedBeanBuildItem extends MultiBuildItem { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/HotDeploymentConfigBuildStep.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/HotDeploymentConfigBuildStep.java index df5b10bfd23f1..3a41953b75594 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/HotDeploymentConfigBuildStep.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/HotDeploymentConfigBuildStep.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.HotDeploymentConfigFileBuildItem; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.HotDeploymentConfigFileBuildItem; public class HotDeploymentConfigBuildStep { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/LifecycleEventsBuildStep.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/LifecycleEventsBuildStep.java index 4935e5085dd89..d59a33bae1b33 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/LifecycleEventsBuildStep.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/LifecycleEventsBuildStep.java @@ -1,14 +1,14 @@ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.RUNTIME_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT; import java.util.List; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.arc.runtime.ArcDeploymentTemplate; -import org.jboss.shamrock.deployment.builditem.ServiceStartBuildItem; -import org.jboss.shamrock.deployment.builditem.ShutdownContextBuildItem; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.arc.runtime.ArcDeploymentTemplate; +import io.quarkus.deployment.builditem.ServiceStartBuildItem; +import io.quarkus.deployment.builditem.ShutdownContextBuildItem; public class LifecycleEventsBuildStep { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ProxyUnwrapProcessor.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ProxyUnwrapProcessor.java index c8b071459aa03..9f73396bde8d2 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ProxyUnwrapProcessor.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ProxyUnwrapProcessor.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.arc.runtime.ClientProxyUnwrapper; -import org.jboss.shamrock.deployment.builditem.ProxyUnwrapperBuildItem; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.arc.runtime.ClientProxyUnwrapper; +import io.quarkus.deployment.builditem.ProxyUnwrapperBuildItem; public class ProxyUnwrapProcessor { diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ResourceAnnotationBuildItem.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ResourceAnnotationBuildItem.java index 6338ea727e00b..39c45801e3cf0 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ResourceAnnotationBuildItem.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ResourceAnnotationBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import org.jboss.builder.item.MultiBuildItem; import org.jboss.jandex.DotName; diff --git a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/UnremovableBeanBuildItem.java b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/UnremovableBeanBuildItem.java index ceae0e5679c2f..32b21fdc710f5 100644 --- a/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/UnremovableBeanBuildItem.java +++ b/extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/UnremovableBeanBuildItem.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.arc.deployment; +package io.quarkus.arc.deployment; import java.util.List; import java.util.Map; @@ -8,7 +8,7 @@ import org.jboss.builder.item.MultiBuildItem; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.DotName; -import org.jboss.protean.arc.processor.BeanInfo; +import org.jboss.quarkus.arc.processor.BeanInfo; /** * This build item is used to exclude beans that would be normally removed if the config property {@link ArcConfig#removeUnusedBeans} is set to true. diff --git a/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/SimpleBean.java b/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/SimpleBean.java index 6ff27d8adc940..6bbd79ab58ed2 100644 --- a/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/SimpleBean.java +++ b/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/SimpleBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.arc.test; +package io.quarkus.arc.test; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; @@ -23,7 +23,7 @@ import javax.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shamrock.runtime.StartupEvent; +import io.quarkus.runtime.StartupEvent; @ApplicationScoped public class SimpleBean { diff --git a/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/SimpleBeanTest.java b/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/SimpleBeanTest.java index 637ae63098083..04f3fef2675e8 100644 --- a/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/SimpleBeanTest.java +++ b/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/SimpleBeanTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.test; +package io.quarkus.arc.test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -22,7 +22,7 @@ import javax.inject.Inject; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -32,7 +32,7 @@ public class SimpleBeanTest { @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(SimpleBean.class) .addAsManifestResource(new StringAsset("simpleBean.baz=1"), "microprofile-config.properties")); diff --git a/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/config/ConfigPropertyInjectionValidationTest.java b/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/config/ConfigPropertyInjectionValidationTest.java index dc7d436557801..a30f0ba5de10e 100644 --- a/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/config/ConfigPropertyInjectionValidationTest.java +++ b/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/config/ConfigPropertyInjectionValidationTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.test.config; +package io.quarkus.arc.test.config; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.spi.DeploymentException; import javax.inject.Inject; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; @@ -31,7 +31,7 @@ public class ConfigPropertyInjectionValidationTest { @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(Configured.class)) .setExpectedException(DeploymentException.class); diff --git a/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/interceptor/InterceptorNoBindingsTest.java b/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/interceptor/InterceptorNoBindingsTest.java index 93a43229ece90..98c99a4bf3f53 100644 --- a/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/interceptor/InterceptorNoBindingsTest.java +++ b/extensions/arc/deployment/src/test/java/org/jboss/shamrock/arc/test/interceptor/InterceptorNoBindingsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.test.interceptor; +package io.quarkus.arc.test.interceptor; import javax.annotation.Priority; import javax.enterprise.inject.spi.DefinitionException; @@ -22,7 +22,7 @@ import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; @@ -31,7 +31,7 @@ public class InterceptorNoBindingsTest { @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(InterceptorWithoutBindings.class)) .setExpectedException(DefinitionException.class); diff --git a/extensions/arc/pom.xml b/extensions/arc/pom.xml index 23750726bf209..a470f16aad930 100644 --- a/extensions/arc/pom.xml +++ b/extensions/arc/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-arc - Shamrock - ArC + quarkus-arc + Quarkus - ArC pom deployment diff --git a/extensions/arc/runtime/pom.xml b/extensions/arc/runtime/pom.xml index fc5d90e25f001..8da3f2f254e86 100644 --- a/extensions/arc/runtime/pom.xml +++ b/extensions/arc/runtime/pom.xml @@ -19,24 +19,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-arc - org.jboss.shamrock + quarkus-arc + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-arc-runtime - Shamrock - ArC - Runtime + quarkus-arc-runtime + Quarkus - ArC - Runtime - org.jboss.protean.arc + org.jboss.quarkus.arc arc-runtime - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime @@ -50,8 +50,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/ArcDeploymentTemplate.java b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/ArcDeploymentTemplate.java index 3b1d739801873..ab15f8b34f3c3 100644 --- a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/ArcDeploymentTemplate.java +++ b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/ArcDeploymentTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.runtime; +package io.quarkus.arc.runtime; import java.lang.annotation.Annotation; import java.util.Arrays; @@ -23,12 +23,12 @@ import java.util.function.Supplier; import org.jboss.logging.Logger; -import org.jboss.protean.arc.Arc; -import org.jboss.protean.arc.ArcContainer; -import org.jboss.protean.arc.InstanceHandle; -import org.jboss.protean.arc.ManagedContext; -import org.jboss.shamrock.runtime.ShutdownContext; -import org.jboss.shamrock.runtime.annotations.Template; +import org.jboss.quarkus.arc.Arc; +import org.jboss.quarkus.arc.ArcContainer; +import org.jboss.quarkus.arc.InstanceHandle; +import org.jboss.quarkus.arc.ManagedContext; +import io.quarkus.runtime.ShutdownContext; +import io.quarkus.runtime.annotations.Template; /** * @author Martin Kouba diff --git a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/BeanContainer.java b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/BeanContainer.java index 0e3cf31cf9e35..63ab6ed36aabb 100644 --- a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/BeanContainer.java +++ b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/BeanContainer.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.runtime; +package io.quarkus.arc.runtime; import java.io.Closeable; import java.lang.annotation.Annotation; -import org.jboss.protean.arc.ManagedContext; +import org.jboss.quarkus.arc.ManagedContext; /** * Represents a CDI bean container. diff --git a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/BeanContainerListener.java b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/BeanContainerListener.java index 16b630fe8d0a9..7ac3f697dc567 100644 --- a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/BeanContainerListener.java +++ b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/BeanContainerListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.runtime; +package io.quarkus.arc.runtime; /** * An interface that can be used to configure beans immediately after the {@link BeanContainer} has been diff --git a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/ClientProxyUnwrapper.java b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/ClientProxyUnwrapper.java index 55c05eba8bae5..821f80b0230fb 100644 --- a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/ClientProxyUnwrapper.java +++ b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/ClientProxyUnwrapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.runtime; +package io.quarkus.arc.runtime; import java.util.function.Function; -import org.jboss.protean.arc.ClientProxy; +import org.jboss.quarkus.arc.ClientProxy; public class ClientProxyUnwrapper implements Function { @Override diff --git a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/InterceptorBindings.java b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/InterceptorBindings.java index 24eb2d33d43fb..88b651324b814 100644 --- a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/InterceptorBindings.java +++ b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/InterceptorBindings.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.runtime; +package io.quarkus.arc.runtime; import java.lang.annotation.Annotation; import java.util.Set; import javax.interceptor.InvocationContext; -import org.jboss.protean.arc.InvocationContextImpl; +import org.jboss.quarkus.arc.InvocationContextImpl; public class InterceptorBindings { diff --git a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/LifecycleEventRunner.java b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/LifecycleEventRunner.java index eea6588d8e454..8b10860c5b387 100644 --- a/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/LifecycleEventRunner.java +++ b/extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/LifecycleEventRunner.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jboss.shamrock.arc.runtime; +package io.quarkus.arc.runtime; import javax.enterprise.context.Dependent; import javax.enterprise.event.Event; import javax.inject.Inject; -import org.jboss.shamrock.runtime.ShutdownEvent; -import org.jboss.shamrock.runtime.StartupEvent; +import io.quarkus.runtime.ShutdownEvent; +import io.quarkus.runtime.StartupEvent; /** * diff --git a/extensions/arc/runtime/src/main/resources/META-INF/services/org.jboss.shamrock.runtime.InterceptorBindingService$Provider b/extensions/arc/runtime/src/main/resources/META-INF/services/org.jboss.shamrock.runtime.InterceptorBindingService$Provider index 479906bac6867..ac107a38a0be5 100644 --- a/extensions/arc/runtime/src/main/resources/META-INF/services/org.jboss.shamrock.runtime.InterceptorBindingService$Provider +++ b/extensions/arc/runtime/src/main/resources/META-INF/services/org.jboss.shamrock.runtime.InterceptorBindingService$Provider @@ -30,4 +30,4 @@ # limitations under the License. # -org.jboss.shamrock.arc.runtime.InterceptorBindingProvider \ No newline at end of file +io.quarkus.arc.runtime.InterceptorBindingProvider \ No newline at end of file diff --git a/extensions/caffeine/deployment/pom.xml b/extensions/caffeine/deployment/pom.xml index caeec629e978c..5b2978ec0619d 100644 --- a/extensions/caffeine/deployment/pom.xml +++ b/extensions/caffeine/deployment/pom.xml @@ -19,23 +19,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-caffeine - org.jboss.shamrock + quarkus-caffeine + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-caffeine-deployment - Shamrock - Caffeine - Deployment + quarkus-caffeine-deployment + Quarkus - Caffeine - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-caffeine-runtime + io.quarkus + quarkus-caffeine-runtime @@ -46,8 +46,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/caffeine/pom.xml b/extensions/caffeine/pom.xml index 97633cc17e4f1..b11b4ea3ed132 100644 --- a/extensions/caffeine/pom.xml +++ b/extensions/caffeine/pom.xml @@ -20,15 +20,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-caffeine - Shamrock - Caffeine + quarkus-caffeine + Quarkus - Caffeine pom deployment diff --git a/extensions/caffeine/runtime/pom.xml b/extensions/caffeine/runtime/pom.xml index 8873da5fe9061..6389dd767811a 100644 --- a/extensions/caffeine/runtime/pom.xml +++ b/extensions/caffeine/runtime/pom.xml @@ -19,14 +19,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-caffeine - org.jboss.shamrock + quarkus-caffeine + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-caffeine-runtime - Shamrock - Caffeine - Runtime + quarkus-caffeine-runtime + Quarkus - Caffeine - Runtime @@ -51,8 +51,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/caffeine/runtime/src/main/java/org/jboss/shamrock/caffeine/runtime/graal/UnsafeRefArrayAccess.java b/extensions/caffeine/runtime/src/main/java/org/jboss/shamrock/caffeine/runtime/graal/UnsafeRefArrayAccess.java index 2271bd3243265..d3a4d8d3ce34b 100644 --- a/extensions/caffeine/runtime/src/main/java/org/jboss/shamrock/caffeine/runtime/graal/UnsafeRefArrayAccess.java +++ b/extensions/caffeine/runtime/src/main/java/org/jboss/shamrock/caffeine/runtime/graal/UnsafeRefArrayAccess.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.caffeine.runtime.graal; +package io.quarkus.caffeine.runtime.graal; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.RecomputeFieldValue; diff --git a/extensions/hibernate-orm/deployment/pom.xml b/extensions/hibernate-orm/deployment/pom.xml index 0dd83404b07a4..6c27713aa8ce3 100644 --- a/extensions/hibernate-orm/deployment/pom.xml +++ b/extensions/hibernate-orm/deployment/pom.xml @@ -19,40 +19,40 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-hibernate-orm - org.jboss.shamrock + quarkus-hibernate-orm + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-hibernate-orm-deployment - Shamrock - Hibernate ORM - Deployment + quarkus-hibernate-orm-deployment + Quarkus - Hibernate ORM - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-hibernate-orm-runtime + io.quarkus + quarkus-hibernate-orm-runtime - org.jboss.shamrock - shamrock-narayana-jta-deployment + io.quarkus + quarkus-narayana-jta-deployment - org.jboss.shamrock - shamrock-agroal-deployment + io.quarkus + quarkus-agroal-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment diff --git a/extensions/hibernate-orm/pom.xml b/extensions/hibernate-orm/pom.xml index 14a27ddee00db..aecb1af6699f7 100644 --- a/extensions/hibernate-orm/pom.xml +++ b/extensions/hibernate-orm/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-hibernate-orm - Shamrock - Hibernate ORM + quarkus-hibernate-orm + Quarkus - Hibernate ORM pom deployment diff --git a/extensions/hibernate-orm/runtime/pom.xml b/extensions/hibernate-orm/runtime/pom.xml index 4c940fd715046..e3baa819ff83b 100644 --- a/extensions/hibernate-orm/runtime/pom.xml +++ b/extensions/hibernate-orm/runtime/pom.xml @@ -19,23 +19,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-hibernate-orm - org.jboss.shamrock + quarkus-hibernate-orm + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-hibernate-orm-runtime - Shamrock - Hibernate ORM - Runtime + quarkus-hibernate-orm-runtime + Quarkus - Hibernate ORM - Runtime - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime compile true @@ -50,7 +50,7 @@ byte-buddy - + org.javassist javassist @@ -79,16 +79,16 @@ svm - org.infinispan.protean - infinispan-hibernate-cache-protean + org.infinispan.quarkus + infinispan-hibernate-cache-quarkus ${project.version} - + - org.jboss.shamrock - shamrock-caffeine-runtime + io.quarkus + quarkus-caffeine-runtime @@ -102,8 +102,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/DefaultEntityManagerFactoryProducer.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/DefaultEntityManagerFactoryProducer.java index 0e7722c741a73..faa46e3a141a4 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/DefaultEntityManagerFactoryProducer.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/DefaultEntityManagerFactoryProducer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; import javax.enterprise.inject.Produces; import javax.inject.Singleton; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/DefaultEntityManagerProducer.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/DefaultEntityManagerProducer.java index eb6e5afe2c9b7..9593d61a2055e 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/DefaultEntityManagerProducer.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/DefaultEntityManagerProducer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; import javax.enterprise.inject.Produces; import javax.inject.Singleton; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java index 809f41fec089c..dd2e92154a0bc 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/FastBootHibernatePersistenceProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; import java.util.Collections; import java.util.List; @@ -35,9 +35,9 @@ import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; import org.hibernate.jpa.internal.util.PersistenceUtilHelper; import org.jboss.logging.Logger; -import org.jboss.shamrock.hibernate.orm.runtime.boot.FastBootEntityManagerFactoryBuilder; -import org.jboss.shamrock.hibernate.orm.runtime.boot.registry.PreconfiguredServiceRegistryBuilder; -import org.jboss.shamrock.hibernate.orm.runtime.recording.RecordedState; +import io.quarkus.hibernate.orm.runtime.boot.FastBootEntityManagerFactoryBuilder; +import io.quarkus.hibernate.orm.runtime.boot.registry.PreconfiguredServiceRegistryBuilder; +import io.quarkus.hibernate.orm.runtime.recording.RecordedState; /** * This can not inherit from HibernatePersistenceProvider as that would force diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/FastBootHibernatePersistenceProviderResolver.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/FastBootHibernatePersistenceProviderResolver.java index ae50417e0960a..478db8a879691 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/FastBootHibernatePersistenceProviderResolver.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/FastBootHibernatePersistenceProviderResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; import java.util.Collections; import java.util.List; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/Hibernate.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/Hibernate.java index 39c47879cff2f..d406d1afe69c0 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/Hibernate.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/Hibernate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; import org.hibernate.cfg.AvailableSettings; import org.jboss.logging.Logger; @@ -35,7 +35,7 @@ public class Hibernate { } public static void featureInit() { - Logger.getLogger("org.hibernate.protean.feature").debug("Hibernate Features Enabled"); + Logger.getLogger("org.hibernate.quarkus.feature").debug("Hibernate Features Enabled"); } } diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/HibernateOrmTemplate.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/HibernateOrmTemplate.java index 41d2c612cca47..93dbcc394a139 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/HibernateOrmTemplate.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/HibernateOrmTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; import java.util.ArrayList; import java.util.List; @@ -24,9 +24,9 @@ import org.hibernate.boot.archive.scan.spi.Scanner; import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; import org.jboss.logging.Logger; -import org.jboss.shamrock.arc.runtime.BeanContainer; -import org.jboss.shamrock.arc.runtime.BeanContainerListener; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.arc.runtime.BeanContainerListener; +import io.quarkus.runtime.annotations.Template; /** * @author Emmanuel Bernard emmanuel@hibernate.org @@ -43,7 +43,7 @@ public void addEntity(String entityClass) { } public void enlistPersistenceUnit() { - Logger.getLogger("org.jboss.shamrock.hibernate.orm").debugf("List of entities found by Shamrock deployment:%n%s", entities); + Logger.getLogger("io.quarkus.hibernate.orm").debugf("List of entities found by Quarkus deployment:%n%s", entities); } public void callHibernateFeatureInit() { diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/JPAConfig.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/JPAConfig.java index d7dafb7999607..f9a801159e0fe 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/JPAConfig.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/JPAConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; import java.util.HashMap; import java.util.Map; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/JPAResourceReferenceProvider.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/JPAResourceReferenceProvider.java index 363874eb20506..142f3a48a59a2 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/JPAResourceReferenceProvider.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/JPAResourceReferenceProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -25,10 +25,10 @@ import javax.persistence.PersistenceContext; import javax.persistence.PersistenceUnit; -import org.jboss.protean.arc.Arc; -import org.jboss.protean.arc.InstanceHandle; -import org.jboss.protean.arc.ResourceReferenceProvider; -import org.jboss.shamrock.hibernate.orm.runtime.entitymanager.ForwardingEntityManager; +import org.jboss.quarkus.arc.Arc; +import org.jboss.quarkus.arc.InstanceHandle; +import org.jboss.quarkus.arc.ResourceReferenceProvider; +import io.quarkus.hibernate.orm.runtime.entitymanager.ForwardingEntityManager; public class JPAResourceReferenceProvider implements ResourceReferenceProvider { diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/PersistenceProviderSetup.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/PersistenceProviderSetup.java index a5ad8b5109284..9a1332eb73d6d 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/PersistenceProviderSetup.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/PersistenceProviderSetup.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; public final class PersistenceProviderSetup { diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/PersistenceUnitsHolder.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/PersistenceUnitsHolder.java index d45a9b95fb389..0d57654bc4cd9 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/PersistenceUnitsHolder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/PersistenceUnitsHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; import java.util.HashMap; import java.util.List; @@ -26,28 +26,28 @@ import org.hibernate.boot.archive.scan.spi.Scanner; import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; -import org.jboss.shamrock.hibernate.orm.runtime.boot.FastBootMetadataBuilder; -import org.jboss.shamrock.hibernate.orm.runtime.boot.LightPersistenceXmlDescriptor; -import org.jboss.shamrock.hibernate.orm.runtime.recording.RecordedState; +import io.quarkus.hibernate.orm.runtime.boot.FastBootMetadataBuilder; +import io.quarkus.hibernate.orm.runtime.boot.LightPersistenceXmlDescriptor; +import io.quarkus.hibernate.orm.runtime.recording.RecordedState; public final class PersistenceUnitsHolder { private static final String NO_NAME_TOKEN = "__no_name"; - // Populated by Shamrock's runtime phase from Shamrock deployment info + // Populated by Quarkus's runtime phase from Quarkus deployment info private static volatile PersistenceUnits persistenceUnits; /** - * Initialize JPA for use in Shamrock. In a native image. This must be called + * Initialize JPA for use in Quarkus. In a native image. This must be called * from within a static init method. * * In general the parsedPersistenceXmlDescriptors will be provided - * by calling {@link #loadOriginalXMLParsedDescriptors()} In Shamrock this is - * done in Shamrock's JPA ResourceProcessor. + * by calling {@link #loadOriginalXMLParsedDescriptors()} In Quarkus this is + * done in Quarkus's JPA ResourceProcessor. * * The scanner may be null to use the default scanner, or a custom scanner can be * used to stop Hibernate scanning. It is expected that the scanner will be - * provided by Shamrock via its hold of Jandex info. + * provided by Quarkus via its hold of Jandex info. * * @param parsedPersistenceXmlDescriptors * @param scanner @@ -101,7 +101,7 @@ private static Map constructMetadataAdvance( private static void checkJPAInitialization() { if (persistenceUnits == null) { - throw new RuntimeException("JPA not initialized yet by Shamrock: this is likely a bug."); + throw new RuntimeException("JPA not initialized yet by Quarkus: this is likely a bug."); } } diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/RequestScopedEntityManagerHolder.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/RequestScopedEntityManagerHolder.java index 02c6dab0eba00..8da3f998e1d6a 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/RequestScopedEntityManagerHolder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/RequestScopedEntityManagerHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; import java.util.HashMap; import java.util.Map; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/TransactionEntityManagers.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/TransactionEntityManagers.java index 76e2630eabc4e..2c3397ecdeddb 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/TransactionEntityManagers.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/TransactionEntityManagers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime; +package io.quarkus.hibernate.orm.runtime; import java.util.HashMap; import java.util.Map; @@ -25,7 +25,7 @@ import javax.transaction.TransactionManager; import javax.transaction.TransactionSynchronizationRegistry; -import org.jboss.shamrock.hibernate.orm.runtime.entitymanager.TransactionScopedEntityManager; +import io.quarkus.hibernate.orm.runtime.entitymanager.TransactionScopedEntityManager; public class TransactionEntityManagers { diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java index 4bb21bde8eb49..701a9d802d2bc 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/FastBootEntityManagerFactoryBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.boot; +package io.quarkus.hibernate.orm.runtime.boot; import java.io.Serializable; import java.security.NoSuchAlgorithmException; @@ -111,7 +111,7 @@ private PersistenceException persistenceException(String message, Exception caus Throwable t = cause; while (t != null) { if (t instanceof NoSuchAlgorithmException) { - message += "Unable to enable SSL support. You might be in the case where you used the `shamrock.ssl.native=false` configuration" + message += "Unable to enable SSL support. You might be in the case where you used the `quarkus.ssl.native=false` configuration" + " and SSL was not disabled automatically for your driver."; break; } diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java index 62898b8815c04..97dd359a7a218 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.boot; +package io.quarkus.hibernate.orm.runtime.boot; import static org.hibernate.cfg.AvailableSettings.DATASOURCE; import static org.hibernate.cfg.AvailableSettings.DRIVER; @@ -90,11 +90,11 @@ import org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl; import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl; import org.hibernate.service.internal.AbstractServiceRegistryImpl; -import org.infinispan.protean.hibernate.cache.ProteanInfinispanRegionFactory; -import org.jboss.shamrock.hibernate.orm.runtime.recording.RecordableBootstrap; -import org.jboss.shamrock.hibernate.orm.runtime.recording.RecordedState; -import org.jboss.shamrock.hibernate.orm.runtime.recording.RecordingDialectFactory; -import org.jboss.shamrock.hibernate.orm.runtime.service.FlatClassLoaderService; +import org.infinispan.quarkus.hibernate.cache.QuarkusInfinispanRegionFactory; +import io.quarkus.hibernate.orm.runtime.recording.RecordableBootstrap; +import io.quarkus.hibernate.orm.runtime.recording.RecordedState; +import io.quarkus.hibernate.orm.runtime.recording.RecordingDialectFactory; +import io.quarkus.hibernate.orm.runtime.service.FlatClassLoaderService; /** * Alternative to EntityManagerFactoryBuilderImpl so to have full control of how MetadataBuilderImplementor @@ -217,7 +217,7 @@ private MergedSettings mergeSettings(PersistenceUnitDescriptor persistenceUnit) mergedSettings.configurationValues.put(PERSISTENCE_UNIT_NAME, persistenceUnit.getName()); - // Protean specific + // Quarkus specific mergedSettings.configurationValues.put("hibernate.temp.use_jdbc_metadata_defaults", "false"); @@ -272,7 +272,7 @@ private MergedSettings mergeSettings(PersistenceUnitDescriptor persistenceUnit) } } - mergedSettings.configurationValues.put( org.hibernate.cfg.AvailableSettings.CACHE_REGION_FACTORY, ProteanInfinispanRegionFactory.class.getName()); + mergedSettings.configurationValues.put( org.hibernate.cfg.AvailableSettings.CACHE_REGION_FACTORY, QuarkusInfinispanRegionFactory.class.getName()); return mergedSettings; } diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/LightPersistenceXmlDescriptor.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/LightPersistenceXmlDescriptor.java index 7f3afdedf3909..b1cf5d5ffca31 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/LightPersistenceXmlDescriptor.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/LightPersistenceXmlDescriptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.boot; +package io.quarkus.hibernate.orm.runtime.boot; import java.net.URL; import java.util.Collections; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/SubstitutingMetadataImplementor.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/SubstitutingMetadataImplementor.java index 8965a867815c7..e37f0ce7e5b98 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/SubstitutingMetadataImplementor.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/SubstitutingMetadataImplementor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.boot; +package io.quarkus.hibernate.orm.runtime.boot; import java.util.Collection; import java.util.Map; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/MirroringIntegratorService.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/MirroringIntegratorService.java index 6825a3844aa48..16c790208f122 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/MirroringIntegratorService.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/MirroringIntegratorService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.boot.registry; +package io.quarkus.hibernate.orm.runtime.boot.registry; import java.util.LinkedHashSet; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/MirroringStrategySelector.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/MirroringStrategySelector.java index ccdf8c6a5fd62..132aefe6e382d 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/MirroringStrategySelector.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/MirroringStrategySelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.boot.registry; +package io.quarkus.hibernate.orm.runtime.boot.registry; import java.util.Collection; import java.util.Collections; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java index 2660a29512433..b12cec469c254 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/registry/PreconfiguredServiceRegistryBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.boot.registry; +package io.quarkus.hibernate.orm.runtime.boot.registry; import static org.hibernate.internal.HEMLogging.messageLogger; @@ -56,8 +56,8 @@ import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractorInitiator; import org.hibernate.tool.schema.internal.SchemaManagementToolInitiator; -import org.jboss.shamrock.hibernate.orm.runtime.recording.RecordedState; -import org.jboss.shamrock.hibernate.orm.runtime.service.*; +import io.quarkus.hibernate.orm.runtime.recording.RecordedState; +import io.quarkus.hibernate.orm.runtime.service.*; /** * Helps to instantiate a ServiceRegistryBuilder from a previous state. This @@ -79,7 +79,7 @@ public class PreconfiguredServiceRegistryBuilder { private final StandardServiceRegistryImpl destroyedRegistry; public PreconfiguredServiceRegistryBuilder(RecordedState rs) { - this.initiators = buildProteanServiceInitiatorList(rs); + this.initiators = buildQuarkusServiceInitiatorList(rs); this.destroyedRegistry = (StandardServiceRegistryImpl) rs.getMetadata().getMetadataBuildingOptions() .getServiceRegistry(); } @@ -155,13 +155,13 @@ private BootstrapServiceRegistry buildEmptyBootstrapServiceRegistry() { * * @return */ - private static List buildProteanServiceInitiatorList(RecordedState rs) { + private static List buildQuarkusServiceInitiatorList(RecordedState rs) { final ArrayList serviceInitiators = new ArrayList(); // Replaces org.hibernate.boot.cfgxml.internal.CfgXmlAccessServiceInitiator : // not used // (Original disabled) - serviceInitiators.add(CfgXmlAccessServiceInitiatorProtean.INSTANCE); + serviceInitiators.add(CfgXmlAccessServiceInitiatorQuarkus.INSTANCE); // Useful as-is serviceInitiators.add(ConfigurationServiceInitiator.INSTANCE); @@ -176,7 +176,7 @@ private static List buildProteanServiceInitiatorList(R serviceInitiators.add(SchemaManagementToolInitiator.INSTANCE); // Replaces JdbcEnvironmentInitiator.INSTANCE : - serviceInitiators.add(new ProteanJdbcEnvironmentInitiator(rs.getDialect())); + serviceInitiators.add(new QuarkusJdbcEnvironmentInitiator(rs.getDialect())); serviceInitiators.add(JndiServiceInitiator.INSTANCE); @@ -203,7 +203,7 @@ private static List buildProteanServiceInitiatorList(R serviceInitiators.add(MutableIdentifierGeneratorFactoryInitiator.INSTANCE); // Replaces JtaPlatformResolverInitiator.INSTANCE ); - serviceInitiators.add(new ProteanJtaPlatformResolver(rs.getJtaPlatform())); + serviceInitiators.add(new QuarkusJtaPlatformResolver(rs.getJtaPlatform())); serviceInitiators.add(new JtaPlatformInitiator() { @Override protected JtaPlatform getFallbackProvider(Map configurationValues, ServiceRegistryImplementor registry) { @@ -216,7 +216,7 @@ protected JtaPlatform getFallbackProvider(Map configurationValues, ServiceRegist serviceInitiators.add(SessionFactoryServiceRegistryFactoryInitiator.INSTANCE); // Replaces RegionFactoryInitiator.INSTANCE - serviceInitiators.add(ProteanRegionFactoryInitiator.INSTANCE); + serviceInitiators.add(QuarkusRegionFactoryInitiator.INSTANCE); serviceInitiators.add(TransactionCoordinatorBuilderInitiator.INSTANCE); diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/scan/ShamrockScanner.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/scan/ShamrockScanner.java index e388af06fae76..6ab5fbae456fa 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/scan/ShamrockScanner.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/boot/scan/ShamrockScanner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.boot.scan; +package io.quarkus.hibernate.orm.runtime.boot.scan; import java.util.Collections; import java.util.Set; @@ -33,10 +33,10 @@ /** * A hard coded scanner. This scanner is serialized to bytecode, and used to avoid scanning on Hibernate startup. * Technically the scanners are receiving all classes and categorize them as JPA useful or not. - * In Shamrock's case, we detect the JPA friendly ones and not list the other ones. + * In Quarkus's case, we detect the JPA friendly ones and not list the other ones. * Emmanuel thinks it's fine as AFAICS, Hibernate ORM filter out the non JPA specific ones. */ -public class ShamrockScanner implements Scanner { +public class QuarkusScanner implements Scanner { private Set classDescriptors; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/entitymanager/ForwardingEntityManager.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/entitymanager/ForwardingEntityManager.java index e57b57be88716..f43c9b4c19cd0 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/entitymanager/ForwardingEntityManager.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/entitymanager/ForwardingEntityManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.entitymanager; +package io.quarkus.hibernate.orm.runtime.entitymanager; import java.util.List; import java.util.Map; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/entitymanager/TransactionScopedEntityManager.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/entitymanager/TransactionScopedEntityManager.java index 96943d860ffaf..03e68314d2b47 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/entitymanager/TransactionScopedEntityManager.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/entitymanager/TransactionScopedEntityManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.entitymanager; +package io.quarkus.hibernate.orm.runtime.entitymanager; import java.util.List; import java.util.Map; @@ -39,7 +39,7 @@ import javax.transaction.TransactionManager; import javax.transaction.TransactionSynchronizationRegistry; -import org.jboss.shamrock.hibernate.orm.runtime.RequestScopedEntityManagerHolder; +import io.quarkus.hibernate.orm.runtime.RequestScopedEntityManagerHolder; public class TransactionScopedEntityManager implements EntityManager { diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Delete_ConfigXsdSupport.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Delete_ConfigXsdSupport.java index bace254484036..c17eab8ebdf79 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Delete_ConfigXsdSupport.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Delete_ConfigXsdSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.graal; +package io.quarkus.hibernate.orm.runtime.graal; import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Delete_HibernatePersistenceProvider.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Delete_HibernatePersistenceProvider.java index 2034cdc40a2aa..c20781ec96a34 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Delete_HibernatePersistenceProvider.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Delete_HibernatePersistenceProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.graal; +package io.quarkus.hibernate.orm.runtime.graal; import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Substitute_JmxServiceImpl.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Substitute_JmxServiceImpl.java index f1b0d5b3f5497..1436da46b74a4 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Substitute_JmxServiceImpl.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/Substitute_JmxServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.graal; +package io.quarkus.hibernate.orm.runtime.graal; import java.util.Map; import javax.management.ObjectName; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/context/Substitute_ThreadLocalSessionContext.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/context/Substitute_ThreadLocalSessionContext.java index 96d1b7f87735c..fb2abcbaeda4f 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/context/Substitute_ThreadLocalSessionContext.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/context/Substitute_ThreadLocalSessionContext.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.hibernate.orm.runtime.graal.context; +package io.quarkus.hibernate.orm.runtime.graal.context; import org.hibernate.HibernateException; import org.hibernate.Session; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/service/jacc/Delete_StandardJaccServiceImpl.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/service/jacc/Delete_StandardJaccServiceImpl.java index e7cb18ee8e0bf..ef951c76e1f24 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/service/jacc/Delete_StandardJaccServiceImpl.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/service/jacc/Delete_StandardJaccServiceImpl.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.hibernate.orm.runtime.graal.service.jacc; +package io.quarkus.hibernate.orm.runtime.graal.service.jacc; import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/service/jacc/Substitute_JaccIntegrator.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/service/jacc/Substitute_JaccIntegrator.java index 6c812206e6d45..c7312725831b1 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/service/jacc/Substitute_JaccIntegrator.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/graal/service/jacc/Substitute_JaccIntegrator.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.hibernate.orm.runtime.graal.service.jacc; +package io.quarkus.hibernate.orm.runtime.graal.service.jacc; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.secure.internal.DisabledJaccServiceImpl; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordableBootstrap.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordableBootstrap.java index 1b27cc6eb4a1b..eff6cf5fab5ef 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordableBootstrap.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordableBootstrap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.recording; +package io.quarkus.hibernate.orm.runtime.recording; import java.io.File; import java.net.URL; @@ -64,9 +64,9 @@ import org.hibernate.service.spi.ServiceContributor; import org.hibernate.tool.hbm2ddl.ImportSqlCommandExtractorInitiator; import org.hibernate.tool.schema.internal.SchemaManagementToolInitiator; -import org.jboss.shamrock.hibernate.orm.runtime.service.DialectFactoryInitiator; -import org.jboss.shamrock.hibernate.orm.runtime.service.DisabledJMXInitiator; -import org.jboss.shamrock.hibernate.orm.runtime.service.ProteanRegionFactoryInitiator; +import io.quarkus.hibernate.orm.runtime.service.DialectFactoryInitiator; +import io.quarkus.hibernate.orm.runtime.service.DisabledJMXInitiator; +import io.quarkus.hibernate.orm.runtime.service.QuarkusRegionFactoryInitiator; /** * Has to extend StandardServiceRegistryBuilder even if we don't want: needs to @@ -146,7 +146,7 @@ private static List standardInitiatorList() { serviceInitiators.add(SessionFactoryServiceRegistryFactoryInitiator.INSTANCE); - serviceInitiators.add(ProteanRegionFactoryInitiator.INSTANCE); + serviceInitiators.add(QuarkusRegionFactoryInitiator.INSTANCE); serviceInitiators.add(TransactionCoordinatorBuilderInitiator.INSTANCE); diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordedState.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordedState.java index 46f5d88c2258c..ca1d2e9aae286 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordedState.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordedState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.recording; +package io.quarkus.hibernate.orm.runtime.recording; import java.util.Map; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordingDialectFactory.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordingDialectFactory.java index 288e38f7f3833..8ae4571605011 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordingDialectFactory.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/recording/RecordingDialectFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.recording; +package io.quarkus.hibernate.orm.runtime.recording; import java.util.Map; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/CfgXmlAccessServiceInitiatorProtean.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/CfgXmlAccessServiceInitiatorProtean.java index 6222ec57ce266..00685b9d5ab2a 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/CfgXmlAccessServiceInitiatorProtean.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/CfgXmlAccessServiceInitiatorProtean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.service; +package io.quarkus.hibernate.orm.runtime.service; import java.util.Map; @@ -23,9 +23,9 @@ import org.hibernate.boot.registry.StandardServiceInitiator; import org.hibernate.service.spi.ServiceRegistryImplementor; -public final class CfgXmlAccessServiceInitiatorProtean implements StandardServiceInitiator { +public final class CfgXmlAccessServiceInitiatorQuarkus implements StandardServiceInitiator { - public static final CfgXmlAccessServiceInitiatorProtean INSTANCE = new CfgXmlAccessServiceInitiatorProtean(); + public static final CfgXmlAccessServiceInitiatorQuarkus INSTANCE = new CfgXmlAccessServiceInitiatorQuarkus(); @Override public CfgXmlAccessService initiateService(Map configurationValues, ServiceRegistryImplementor registry) { diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/DialectFactoryInitiator.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/DialectFactoryInitiator.java index 00d02908dca8f..bb2e4a61b2356 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/DialectFactoryInitiator.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/DialectFactoryInitiator.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.service; +package io.quarkus.hibernate.orm.runtime.service; import java.util.Map; import org.hibernate.boot.registry.StandardServiceInitiator; import org.hibernate.engine.jdbc.dialect.spi.DialectFactory; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.jboss.shamrock.hibernate.orm.runtime.recording.RecordingDialectFactory; +import io.quarkus.hibernate.orm.runtime.recording.RecordingDialectFactory; /** * Copied from diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/DisabledJMXInitiator.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/DisabledJMXInitiator.java index 467b5b12c146f..1b778d59738ad 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/DisabledJMXInitiator.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/DisabledJMXInitiator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.service; +package io.quarkus.hibernate.orm.runtime.service; import java.util.Map; @@ -45,7 +45,7 @@ public Class getServiceInitiated() { public JmxService initiateService(Map configurationValues, ServiceRegistryImplementor registry) { if (ConfigurationHelper.getBoolean(AvailableSettings.JMX_ENABLED, configurationValues, false)) { Logger.getLogger(DisabledJMXInitiator.class) - .warn("Enabling JMX is not allowed in Protean: forcefully disabled. Ignoring property:" + .warn("Enabling JMX is not allowed in Quarkus: forcefully disabled. Ignoring property:" + AvailableSettings.JMX_ENABLED); } return DisabledJmxServiceImpl.INSTANCE; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/FlatClassLoaderService.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/FlatClassLoaderService.java index ba2cf31fbb2f7..5b91a9a2808e6 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/FlatClassLoaderService.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/FlatClassLoaderService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.service; +package io.quarkus.hibernate.orm.runtime.service; import java.io.IOException; import java.io.InputStream; diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanJdbcEnvironmentInitiator.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanJdbcEnvironmentInitiator.java index ef333478d598e..4fbaa5f80fc3b 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanJdbcEnvironmentInitiator.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanJdbcEnvironmentInitiator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.service; +package io.quarkus.hibernate.orm.runtime.service; import java.util.Map; @@ -24,11 +24,11 @@ import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.service.spi.ServiceRegistryImplementor; -public final class ProteanJdbcEnvironmentInitiator implements StandardServiceInitiator { +public final class QuarkusJdbcEnvironmentInitiator implements StandardServiceInitiator { private final Dialect dialect; - public ProteanJdbcEnvironmentInitiator(Dialect dialect) { + public QuarkusJdbcEnvironmentInitiator(Dialect dialect) { this.dialect = dialect; } diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanJtaPlatformResolver.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanJtaPlatformResolver.java index 62839c8cf8b3b..c427146dc6798 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanJtaPlatformResolver.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanJtaPlatformResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.orm.runtime.service; +package io.quarkus.hibernate.orm.runtime.service; import java.util.Map; @@ -23,11 +23,11 @@ import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformResolver; import org.hibernate.service.spi.ServiceRegistryImplementor; -public final class ProteanJtaPlatformResolver implements StandardServiceInitiator { +public final class QuarkusJtaPlatformResolver implements StandardServiceInitiator { private final JtaPlatform jtaPlatform; - public ProteanJtaPlatformResolver(JtaPlatform jtaPlatform) { + public QuarkusJtaPlatformResolver(JtaPlatform jtaPlatform) { this.jtaPlatform = jtaPlatform; } diff --git a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanRegionFactoryInitiator.java b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanRegionFactoryInitiator.java index c59f4e5942376..391c19617dded 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanRegionFactoryInitiator.java +++ b/extensions/hibernate-orm/runtime/src/main/java/org/jboss/shamrock/hibernate/orm/runtime/service/ProteanRegionFactoryInitiator.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.hibernate.orm.runtime.service; +package io.quarkus.hibernate.orm.runtime.service; import org.hibernate.boot.registry.StandardServiceInitiator; import org.hibernate.cache.internal.NoCachingRegionFactory; @@ -6,17 +6,17 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.infinispan.protean.hibernate.cache.ProteanInfinispanRegionFactory; +import org.infinispan.quarkus.hibernate.cache.QuarkusInfinispanRegionFactory; import java.util.Map; import static java.lang.Boolean.FALSE; -public final class ProteanRegionFactoryInitiator implements StandardServiceInitiator { +public final class QuarkusRegionFactoryInitiator implements StandardServiceInitiator { - public static final ProteanRegionFactoryInitiator INSTANCE = new ProteanRegionFactoryInitiator(); + public static final QuarkusRegionFactoryInitiator INSTANCE = new QuarkusRegionFactoryInitiator(); - private ProteanRegionFactoryInitiator() { + private QuarkusRegionFactoryInitiator() { } @Override @@ -46,7 +46,7 @@ public RegionFactory initiateService(Map configurationValues, ServiceRegistryImp } } - return new ProteanInfinispanRegionFactory(); + return new QuarkusInfinispanRegionFactory(); } } diff --git a/extensions/hibernate-validator/deployment/pom.xml b/extensions/hibernate-validator/deployment/pom.xml index bbade7da68b2d..0659949a97197 100644 --- a/extensions/hibernate-validator/deployment/pom.xml +++ b/extensions/hibernate-validator/deployment/pom.xml @@ -19,28 +19,28 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-hibernate-validator - org.jboss.shamrock + quarkus-hibernate-validator + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-hibernate-validator-deployment - Shamrock - Hibernate Validator - Deployment + quarkus-hibernate-validator-deployment + Quarkus - Hibernate Validator - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-hibernate-validator-runtime + io.quarkus + quarkus-hibernate-validator-runtime @@ -51,8 +51,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/hibernate-validator/deployment/src/main/java/org/jboss/shamrock/hibernate/validator/HibernateValidatorProcessor.java b/extensions/hibernate-validator/deployment/src/main/java/org/jboss/shamrock/hibernate/validator/HibernateValidatorProcessor.java index 8867f79f406a7..342efc9f13261 100644 --- a/extensions/hibernate-validator/deployment/src/main/java/org/jboss/shamrock/hibernate/validator/HibernateValidatorProcessor.java +++ b/extensions/hibernate-validator/deployment/src/main/java/org/jboss/shamrock/hibernate/validator/HibernateValidatorProcessor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.validator; +package io.quarkus.hibernate.validator; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.STATIC_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; @@ -36,21 +36,21 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; import org.jboss.jandex.Type; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.arc.deployment.AnnotationsTransformerBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.HotDeploymentConfigFileBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveFieldBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveMethodBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateConfigBuildItem; -import org.jboss.shamrock.deployment.recording.RecorderContext; -import org.jboss.shamrock.hibernate.validator.runtime.HibernateValidatorTemplate; -import org.jboss.shamrock.hibernate.validator.runtime.ValidatorProvider; -import org.jboss.shamrock.hibernate.validator.runtime.interceptor.MethodValidationInterceptor; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.HotDeploymentConfigFileBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveFieldBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveMethodBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateConfigBuildItem; +import io.quarkus.deployment.recording.RecorderContext; +import io.quarkus.hibernate.validator.runtime.HibernateValidatorTemplate; +import io.quarkus.hibernate.validator.runtime.ValidatorProvider; +import io.quarkus.hibernate.validator.runtime.interceptor.MethodValidationInterceptor; class HibernateValidatorProcessor { @@ -73,7 +73,7 @@ void registerAdditionalBeans(BuildProducer additionalBe if (isResteasyInClasspath()) { // The CDI interceptor which will validate the methods annotated with @JaxrsEndPointValidated - additionalBeans.produce(new AdditionalBeanBuildItem("org.jboss.shamrock.hibernate.validator.runtime.jaxrs.JaxrsEndPointValidationInterceptor")); + additionalBeans.produce(new AdditionalBeanBuildItem("io.quarkus.hibernate.validator.runtime.jaxrs.JaxrsEndPointValidationInterceptor")); } } diff --git a/extensions/hibernate-validator/deployment/src/main/java/org/jboss/shamrock/hibernate/validator/MethodValidatedAnnotationsTransformer.java b/extensions/hibernate-validator/deployment/src/main/java/org/jboss/shamrock/hibernate/validator/MethodValidatedAnnotationsTransformer.java index 0e45dce24972d..b986197dea024 100644 --- a/extensions/hibernate-validator/deployment/src/main/java/org/jboss/shamrock/hibernate/validator/MethodValidatedAnnotationsTransformer.java +++ b/extensions/hibernate-validator/deployment/src/main/java/org/jboss/shamrock/hibernate/validator/MethodValidatedAnnotationsTransformer.java @@ -1,13 +1,13 @@ -package org.jboss.shamrock.hibernate.validator; +package io.quarkus.hibernate.validator; import java.util.Set; import org.jboss.jandex.AnnotationTarget.Kind; import org.jboss.jandex.DotName; import org.jboss.jandex.MethodInfo; -import org.jboss.protean.arc.processor.AnnotationsTransformer; -import org.jboss.shamrock.hibernate.validator.runtime.interceptor.MethodValidated; -import org.jboss.shamrock.hibernate.validator.runtime.jaxrs.JaxrsEndPointValidated; +import org.jboss.quarkus.arc.processor.AnnotationsTransformer; +import io.quarkus.hibernate.validator.runtime.interceptor.MethodValidated; +import io.quarkus.hibernate.validator.runtime.jaxrs.JaxrsEndPointValidated; /** * Add {@link MethodValidated} annotations to the methods requiring validation. diff --git a/extensions/hibernate-validator/pom.xml b/extensions/hibernate-validator/pom.xml index ce7af89d80ad8..731c8ea213244 100644 --- a/extensions/hibernate-validator/pom.xml +++ b/extensions/hibernate-validator/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-hibernate-validator - Shamrock - Hibernate Validator + quarkus-hibernate-validator + Quarkus - Hibernate Validator pom deployment diff --git a/extensions/hibernate-validator/runtime/pom.xml b/extensions/hibernate-validator/runtime/pom.xml index e4a168e88c1ac..c0bbcd1ba5954 100644 --- a/extensions/hibernate-validator/runtime/pom.xml +++ b/extensions/hibernate-validator/runtime/pom.xml @@ -19,24 +19,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-hibernate-validator - org.jboss.shamrock + quarkus-hibernate-validator + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-hibernate-validator-runtime - Shamrock - Hibernate Validator - Runtime + quarkus-hibernate-validator-runtime + Quarkus - Hibernate Validator - Runtime - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime org.hibernate.validator @@ -89,8 +89,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizer.java b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizer.java index 6f7dd56f357f0..f323468cd0640 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizer.java +++ b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizer.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.hibernate.validator.runtime; +package io.quarkus.hibernate.validator.runtime; import org.hibernate.validator.metadata.BeanMetaDataClassNormalizer; -import org.jboss.protean.arc.Subclass; +import org.jboss.quarkus.arc.Subclass; /** * In the case of a proxy generated by Arc, return the parent class. diff --git a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/HibernateValidatorTemplate.java b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/HibernateValidatorTemplate.java index 83535bf57e292..cd6873731021d 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/HibernateValidatorTemplate.java +++ b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/HibernateValidatorTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.validator.runtime; +package io.quarkus.hibernate.validator.runtime; import java.lang.reflect.Method; import java.util.Collections; @@ -26,7 +26,7 @@ import org.hibernate.validator.PredefinedScopeHibernateValidator; import org.hibernate.validator.PredefinedScopeHibernateValidatorConfiguration; import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.runtime.annotations.Template; @Template public class HibernateValidatorTemplate { diff --git a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ValidatorHolder.java b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ValidatorHolder.java index 8c78b95de830b..245f89948ca10 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ValidatorHolder.java +++ b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ValidatorHolder.java @@ -15,7 +15,7 @@ */ -package org.jboss.shamrock.hibernate.validator.runtime; +package io.quarkus.hibernate.validator.runtime; import javax.validation.Validator; import javax.validation.ValidatorFactory; diff --git a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ValidatorProvider.java b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ValidatorProvider.java index 34189d544d1c4..62836537d1e64 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ValidatorProvider.java +++ b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/ValidatorProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.hibernate.validator.runtime; +package io.quarkus.hibernate.validator.runtime; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; diff --git a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java index 2677a18d4f167..bb035f6cf5625 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java +++ b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/AbstractMethodValidationInterceptor.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.hibernate.validator.runtime.interceptor; +package io.quarkus.hibernate.validator.runtime.interceptor; import java.io.Serializable; import java.lang.reflect.Member; diff --git a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/MethodValidated.java b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/MethodValidated.java index 7abd5dc7c39fe..70694c89efd74 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/MethodValidated.java +++ b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/MethodValidated.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.hibernate.validator.runtime.interceptor; +package io.quarkus.hibernate.validator.runtime.interceptor; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/MethodValidationInterceptor.java b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/MethodValidationInterceptor.java index af3d16c2456b6..3033666274f01 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/MethodValidationInterceptor.java +++ b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/interceptor/MethodValidationInterceptor.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.hibernate.validator.runtime.interceptor; +package io.quarkus.hibernate.validator.runtime.interceptor; import javax.annotation.Priority; import javax.interceptor.AroundConstruct; diff --git a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/ConstraintTypeUtil20.java b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/ConstraintTypeUtil20.java index a02c1a98e07da..89bff0d30e82c 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/ConstraintTypeUtil20.java +++ b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/ConstraintTypeUtil20.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.hibernate.validator.runtime.jaxrs; +package io.quarkus.hibernate.validator.runtime.jaxrs; import java.util.Iterator; diff --git a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidated.java b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidated.java index cbff61e6c0a8c..4bfb3d358d832 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidated.java +++ b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidated.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.hibernate.validator.runtime.jaxrs; +package io.quarkus.hibernate.validator.runtime.jaxrs; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java index 2e81abfffe725..a06b8c67f1a4d 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java +++ b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/JaxrsEndPointValidationInterceptor.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.hibernate.validator.runtime.jaxrs; +package io.quarkus.hibernate.validator.runtime.jaxrs; import java.lang.reflect.Method; import java.util.Arrays; @@ -13,7 +13,7 @@ import javax.ws.rs.core.MediaType; import org.jboss.resteasy.util.MediaTypeHelper; -import org.jboss.shamrock.hibernate.validator.runtime.interceptor.AbstractMethodValidationInterceptor; +import io.quarkus.hibernate.validator.runtime.interceptor.AbstractMethodValidationInterceptor; @JaxrsEndPointValidated @Interceptor diff --git a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionImpl.java b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionImpl.java index 54eaad912fc8a..78250e0dc89a7 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionImpl.java +++ b/extensions/hibernate-validator/runtime/src/main/java/org/jboss/shamrock/hibernate/validator/runtime/jaxrs/ResteasyViolationExceptionImpl.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.hibernate.validator.runtime.jaxrs; +package io.quarkus.hibernate.validator.runtime.jaxrs; import java.util.List; import java.util.Set; diff --git a/extensions/infinispan-client/README.MD b/extensions/infinispan-client/README.MD index e29fc9bd4d0fa..819db641bc208 100644 --- a/extensions/infinispan-client/README.MD +++ b/extensions/infinispan-client/README.MD @@ -1,4 +1,4 @@ -# Infinispan Client for Protean +# Infinispan Client for Quarkus ## Status @@ -82,7 +82,7 @@ java cacerts file. You (currently) need to enable all security services in Substrate (https://github.com/oracle/graal/blob/master/substratevm/JCA-SECURITY-SERVICES.md). This can be done by adding -`true` to the shamrock-maven-plugin configuration values. +`true` to the quarkus-maven-plugin configuration values. You may have to also enable JNI, depending on the security provider by also adding `true` to the same configuration values. If you have to enable JNI you will then also have to add the appropriate shared library to diff --git a/extensions/infinispan-client/deployment/pom.xml b/extensions/infinispan-client/deployment/pom.xml index 046289ab60bb0..968f733d77b56 100644 --- a/extensions/infinispan-client/deployment/pom.xml +++ b/extensions/infinispan-client/deployment/pom.xml @@ -19,35 +19,35 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-infinispan-client - org.jboss.shamrock + quarkus-infinispan-client + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-infinispan-client-deployment - Shamrock - Infinispan - Client - Deployment + quarkus-infinispan-client-deployment + Quarkus - Infinispan - Client - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-infinispan-client-runtime + io.quarkus + quarkus-infinispan-client-runtime - org.jboss.shamrock - shamrock-caffeine-deployment + io.quarkus + quarkus-caffeine-deployment - org.jboss.shamrock - shamrock-netty-deployment + io.quarkus + quarkus-netty-deployment @@ -58,8 +58,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/infinispan-client/deployment/src/main/java/org/jboss/shamrock/infinispan/client/InfinispanClientProcessor.java b/extensions/infinispan-client/deployment/src/main/java/org/jboss/shamrock/infinispan/client/InfinispanClientProcessor.java index 4c431d4e89879..743f2d37a0e79 100644 --- a/extensions/infinispan-client/deployment/src/main/java/org/jboss/shamrock/infinispan/client/InfinispanClientProcessor.java +++ b/extensions/infinispan-client/deployment/src/main/java/org/jboss/shamrock/infinispan/client/InfinispanClientProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.infinispan.client; +package io.quarkus.infinispan.client; import java.io.File; import java.io.IOException; @@ -43,22 +43,22 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.Index; import org.jboss.jandex.Type; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.arc.deployment.BeanContainerListenerBuildItem; -import org.jboss.shamrock.arc.deployment.UnremovableBeanBuildItem; -import org.jboss.shamrock.deployment.ApplicationArchive; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.ApplicationArchivesBuildItem; -import org.jboss.shamrock.deployment.builditem.ApplicationIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.HotDeploymentConfigFileBuildItem; -import org.jboss.shamrock.deployment.builditem.SystemPropertyBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.infinispan.client.runtime.InfinispanClientConfiguration; -import org.jboss.shamrock.infinispan.client.runtime.InfinispanClientProducer; -import org.jboss.shamrock.infinispan.client.runtime.InfinispanTemplate; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.BeanContainerListenerBuildItem; +import io.quarkus.arc.deployment.UnremovableBeanBuildItem; +import io.quarkus.deployment.ApplicationArchive; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem; +import io.quarkus.deployment.builditem.ApplicationIndexBuildItem; +import io.quarkus.deployment.builditem.HotDeploymentConfigFileBuildItem; +import io.quarkus.deployment.builditem.SystemPropertyBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.infinispan.client.runtime.InfinispanClientConfiguration; +import io.quarkus.infinispan.client.runtime.InfinispanClientProducer; +import io.quarkus.infinispan.client.runtime.InfinispanTemplate; class InfinispanClientProcessor { private static final Log log = LogFactory.getLog(InfinispanClientProcessor.class); @@ -119,7 +119,7 @@ PropertiesBuildItem setup(ApplicationArchivesBuildItem applicationArchivesBuildI .iterator(); // We monitor the entire meta inf directory if properties are available if (protoFiles.hasNext()) { - // Protean doesn't currently support hot deployment watching directories + // Quarkus doesn't currently support hot deployment watching directories // hotDeployment.produce(new HotDeploymentConfigFileBuildItem(META_INF)); } diff --git a/extensions/infinispan-client/deployment/src/main/java/org/jboss/shamrock/infinispan/client/PropertiesBuildItem.java b/extensions/infinispan-client/deployment/src/main/java/org/jboss/shamrock/infinispan/client/PropertiesBuildItem.java index 6f509d3f8c162..9b36264b1ac98 100644 --- a/extensions/infinispan-client/deployment/src/main/java/org/jboss/shamrock/infinispan/client/PropertiesBuildItem.java +++ b/extensions/infinispan-client/deployment/src/main/java/org/jboss/shamrock/infinispan/client/PropertiesBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.infinispan.client; +package io.quarkus.infinispan.client; import java.util.Properties; diff --git a/extensions/infinispan-client/pom.xml b/extensions/infinispan-client/pom.xml index 3de696c364dc4..eb0ba5c1743e2 100644 --- a/extensions/infinispan-client/pom.xml +++ b/extensions/infinispan-client/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-infinispan-client - Shamrock - Infinispan - Client + quarkus-infinispan-client + Quarkus - Infinispan - Client pom deployment diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml index 1fb176da07592..35bf2fdbb04fe 100644 --- a/extensions/infinispan-client/runtime/pom.xml +++ b/extensions/infinispan-client/runtime/pom.xml @@ -19,31 +19,31 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-infinispan-client - org.jboss.shamrock + quarkus-infinispan-client + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-infinispan-client-runtime - Shamrock - Infinispan - Client - Runtime + quarkus-infinispan-client-runtime + Quarkus - Infinispan - Client - Runtime - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime - org.jboss.shamrock - shamrock-caffeine-runtime + io.quarkus + quarkus-caffeine-runtime - org.jboss.shamrock - shamrock-netty-runtime + io.quarkus + quarkus-netty-runtime org.infinispan @@ -78,8 +78,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanClientConfiguration.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanClientConfiguration.java index 43cfb23d68eab..fabd971dd2597 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanClientConfiguration.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanClientConfiguration.java @@ -1,10 +1,10 @@ -package org.jboss.shamrock.infinispan.client.runtime; +package io.quarkus.infinispan.client.runtime; import java.util.Optional; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; /** * @author William Burns diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanClientProducer.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanClientProducer.java index 795608f07c908..a3694bd5e8f98 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanClientProducer.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanClientProducer.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.infinispan.client.runtime; +package io.quarkus.infinispan.client.runtime; import java.io.IOException; import java.io.InputStream; diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanTemplate.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanTemplate.java index 0747e9540aa48..739f2473bf506 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanTemplate.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/InfinispanTemplate.java @@ -1,9 +1,9 @@ -package org.jboss.shamrock.infinispan.client.runtime; +package io.quarkus.infinispan.client.runtime; import java.util.Properties; -import org.jboss.shamrock.runtime.annotations.Template; -import org.jboss.shamrock.arc.runtime.BeanContainerListener; +import io.quarkus.runtime.annotations.Template; +import io.quarkus.arc.runtime.BeanContainerListener; @Template public class InfinispanTemplate { diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/Remote.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/Remote.java index 0f352b172a39b..dafe2917e533f 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/Remote.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/runtime/Remote.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.infinispan.client.runtime; +package io.quarkus.infinispan.client.runtime; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/DeleteJBossBasedClasses.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/DeleteJBossBasedClasses.java index 29ce77ab53cc4..386f98bbbd7d6 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/DeleteJBossBasedClasses.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/DeleteJBossBasedClasses.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.infinispan.client.substitutions; +package io.quarkus.infinispan.client.substitutions; import org.infinispan.commons.dataconversion.DefaultTranscoder; import org.infinispan.commons.dataconversion.GenericJbossMarshallerEncoder; diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/QuerySubstitutions.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/QuerySubstitutions.java index 7819b05e4cfbb..5cc91d228da13 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/QuerySubstitutions.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/QuerySubstitutions.java @@ -1,11 +1,11 @@ -package org.jboss.shamrock.infinispan.client.substitutions; +package io.quarkus.infinispan.client.substitutions; import java.io.IOException; import java.util.function.BooleanSupplier; import org.infinispan.protostream.SerializationContext; import org.infinispan.query.remote.client.impl.MarshallerRegistration; -import org.jboss.shamrock.infinispan.client.runtime.InfinispanClientProducer; +import io.quarkus.infinispan.client.runtime.InfinispanClientProducer; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteConfigurationBuilder.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteConfigurationBuilder.java index 640b345429719..20044e5e31c75 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteConfigurationBuilder.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteConfigurationBuilder.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.infinispan.client.substitutions; +package io.quarkus.infinispan.client.substitutions; import org.infinispan.client.hotrod.configuration.ConfigurationBuilder; import org.infinispan.client.hotrod.marshall.BytesOnlyMarshaller; diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteConfigurationProperties.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteConfigurationProperties.java index 16d727bd5f422..592deffe94cc3 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteConfigurationProperties.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteConfigurationProperties.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.infinispan.client.substitutions; +package io.quarkus.infinispan.client.substitutions; import org.infinispan.client.hotrod.impl.ConfigurationProperties; import org.infinispan.client.hotrod.marshall.BytesOnlyMarshaller; diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteExecutorFactoryConfigurationBuilder.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteExecutorFactoryConfigurationBuilder.java index 4d649b986627c..6dd19d4e4520b 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteExecutorFactoryConfigurationBuilder.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteExecutorFactoryConfigurationBuilder.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.infinispan.client.substitutions; +package io.quarkus.infinispan.client.substitutions; import java.util.Properties; diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteRemoteCacheImpl.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteRemoteCacheImpl.java index 45b3eb1eee43d..2669f50e8702a 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteRemoteCacheImpl.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteRemoteCacheImpl.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.infinispan.client.substitutions; +package io.quarkus.infinispan.client.substitutions; import javax.management.ObjectName; diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteRemoteCacheManager.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteRemoteCacheManager.java index 290a6ef750e97..defcdb9f292cc 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteRemoteCacheManager.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteRemoteCacheManager.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.infinispan.client.substitutions; +package io.quarkus.infinispan.client.substitutions; import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.client.hotrod.configuration.Configuration; diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteStatisticsConfiguration.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteStatisticsConfiguration.java index 37de9d7c501ff..b46b4a8adc447 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteStatisticsConfiguration.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteStatisticsConfiguration.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.infinispan.client.substitutions; +package io.quarkus.infinispan.client.substitutions; import org.infinispan.client.hotrod.configuration.StatisticsConfiguration; diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteStatisticsConfigurationBuilder.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteStatisticsConfigurationBuilder.java index c33d4c7055e67..8da9484783d08 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteStatisticsConfigurationBuilder.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteStatisticsConfigurationBuilder.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.infinispan.client.substitutions; +package io.quarkus.infinispan.client.substitutions; import org.infinispan.client.hotrod.configuration.StatisticsConfigurationBuilder; diff --git a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteTransportHelper.java b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteTransportHelper.java index b21dc2c3332b9..338d7d140c82a 100644 --- a/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteTransportHelper.java +++ b/extensions/infinispan-client/runtime/src/main/java/org/jboss/shamrock/infinispan/client/substitutions/SubstituteTransportHelper.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.infinispan.client.substitutions; +package io.quarkus.infinispan.client.substitutions; import java.util.concurrent.ExecutorService; diff --git a/extensions/jaeger/deployment/pom.xml b/extensions/jaeger/deployment/pom.xml index 0a491d916bbbe..73b498e606d7a 100644 --- a/extensions/jaeger/deployment/pom.xml +++ b/extensions/jaeger/deployment/pom.xml @@ -19,24 +19,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-jaeger - org.jboss.shamrock + quarkus-jaeger + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-jaeger-deployment - Shamrock - Jaeger - Deployment + quarkus-jaeger-deployment + Quarkus - Jaeger - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-jaeger-runtime + io.quarkus + quarkus-jaeger-runtime javax.enterprise @@ -51,8 +51,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/jaeger/deployment/src/main/java/org/jboss/shamrock/jaeger/JaegerProcessor.java b/extensions/jaeger/deployment/src/main/java/org/jboss/shamrock/jaeger/JaegerProcessor.java index 1410b801d8856..69e509f9b4aac 100644 --- a/extensions/jaeger/deployment/src/main/java/org/jboss/shamrock/jaeger/JaegerProcessor.java +++ b/extensions/jaeger/deployment/src/main/java/org/jboss/shamrock/jaeger/JaegerProcessor.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.jboss.shamrock.jaeger; +package io.quarkus.jaeger; import javax.inject.Inject; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.ExtensionSslNativeSupportBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.jaeger.runtime.JaegerConfig; -import org.jboss.shamrock.jaeger.runtime.JaegerDeploymentTemplate; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.jaeger.runtime.JaegerConfig; +import io.quarkus.jaeger.runtime.JaegerDeploymentTemplate; public class JaegerProcessor { diff --git a/extensions/jaeger/pom.xml b/extensions/jaeger/pom.xml index 54246981a77d0..33fab9f4b6ad4 100644 --- a/extensions/jaeger/pom.xml +++ b/extensions/jaeger/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-jaeger - Shamrock - Jaeger + quarkus-jaeger + Quarkus - Jaeger pom deployment diff --git a/extensions/jaeger/runtime/pom.xml b/extensions/jaeger/runtime/pom.xml index e7c8784d7164e..cfc061f6de2ac 100644 --- a/extensions/jaeger/runtime/pom.xml +++ b/extensions/jaeger/runtime/pom.xml @@ -19,21 +19,21 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-jaeger - org.jboss.shamrock + quarkus-jaeger + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-jaeger-runtime - Shamrock - Jaeger - Runtime + quarkus-jaeger-runtime + Quarkus - Jaeger - Runtime - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime io.jaegertracing @@ -63,8 +63,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/JaegerConfig.java b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/JaegerConfig.java index 6e5d9822c3ace..92f3a22ae15ac 100644 --- a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/JaegerConfig.java +++ b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/JaegerConfig.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jaeger.runtime; +package io.quarkus.jaeger.runtime; import java.math.BigDecimal; import java.net.InetSocketAddress; @@ -6,9 +6,9 @@ import java.time.Duration; import java.util.Optional; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; /** * The Jaeger configuration. diff --git a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/JaegerDeploymentTemplate.java b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/JaegerDeploymentTemplate.java index 7e54f25c2ba29..7d7e7c39bb491 100644 --- a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/JaegerDeploymentTemplate.java +++ b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/JaegerDeploymentTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.jaeger.runtime; +package io.quarkus.jaeger.runtime; import static io.jaegertracing.Configuration.JAEGER_ENDPOINT; import static io.jaegertracing.Configuration.JAEGER_SERVICE_NAME; @@ -25,7 +25,7 @@ import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.runtime.annotations.Template; import io.opentracing.util.GlobalTracer; @@ -39,7 +39,7 @@ public void registerTracer(JaegerConfig jaeger) { if (!registered) { if (isValidConfig(jaeger)) { initTracerConfig(jaeger); - GlobalTracer.register(new ShamrockJaegerTracer()); + GlobalTracer.register(new QuarkusJaegerTracer()); } registered = true; } diff --git a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/ShamrockJaegerMetricsFactory.java b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/ShamrockJaegerMetricsFactory.java index 171b438b2fbee..0e26b69e0235c 100644 --- a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/ShamrockJaegerMetricsFactory.java +++ b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/ShamrockJaegerMetricsFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.jaeger.runtime; +package io.quarkus.jaeger.runtime; import java.util.HashMap; import java.util.Map; @@ -31,7 +31,7 @@ import io.jaegertracing.spi.MetricsFactory; import io.smallrye.metrics.MetricRegistries; -public class ShamrockJaegerMetricsFactory implements MetricsFactory { +public class QuarkusJaegerMetricsFactory implements MetricsFactory { MetricRegistry registry = MetricRegistries.get(MetricRegistry.Type.BASE); diff --git a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/ShamrockJaegerTracer.java b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/ShamrockJaegerTracer.java index 4a083486efc44..5de1cadabc726 100644 --- a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/ShamrockJaegerTracer.java +++ b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/ShamrockJaegerTracer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.jaeger.runtime; +package io.quarkus.jaeger.runtime; import java.util.concurrent.atomic.AtomicReference; @@ -25,11 +25,11 @@ import io.opentracing.Tracer; import io.opentracing.propagation.Format; -public class ShamrockJaegerTracer implements Tracer { +public class QuarkusJaegerTracer implements Tracer { static AtomicReference REF = new AtomicReference<>(); - public ShamrockJaegerTracer() { + public QuarkusJaegerTracer() { } @Override @@ -42,7 +42,7 @@ Tracer tracer() { if (orig != null) { return orig; } - return Configuration.fromEnv().withMetricsFactory(new ShamrockJaegerMetricsFactory()).getTracer(); + return Configuration.fromEnv().withMetricsFactory(new QuarkusJaegerMetricsFactory()).getTracer(); }); } diff --git a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_JaegerTracer.java b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_JaegerTracer.java index 3f0d97b56215b..e018d4d0b0e29 100644 --- a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_JaegerTracer.java +++ b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_JaegerTracer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.jaeger.runtime; +package io.quarkus.jaeger.runtime; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_LoggingReporter.java b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_LoggingReporter.java index afd4ff3aaf77a..a77309a008fe5 100644 --- a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_LoggingReporter.java +++ b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_LoggingReporter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.jaeger.runtime; +package io.quarkus.jaeger.runtime; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_Metrics.java b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_Metrics.java index 5b5bf50b226b2..9ff42c0da1cb1 100644 --- a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_Metrics.java +++ b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_Metrics.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.jaeger.runtime; +package io.quarkus.jaeger.runtime; import java.util.Collections; import java.util.HashMap; diff --git a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_SenderResolver.java b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_SenderResolver.java index d69b9a8c4b446..4da12ccfe4c2f 100644 --- a/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_SenderResolver.java +++ b/extensions/jaeger/runtime/src/main/java/org/jboss/shamrock/jaeger/runtime/Target_SenderResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.jaeger.runtime; +package io.quarkus.jaeger.runtime; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/jdbc/jdbc-h2/jdbc-h2-deployment/pom.xml b/extensions/jdbc/jdbc-h2/jdbc-h2-deployment/pom.xml index 9bd36a4855376..bfa3577d878bf 100644 --- a/extensions/jdbc/jdbc-h2/jdbc-h2-deployment/pom.xml +++ b/extensions/jdbc/jdbc-h2/jdbc-h2-deployment/pom.xml @@ -19,23 +19,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-jdbc-h2 - org.jboss.shamrock + quarkus-jdbc-h2 + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-jdbc-h2-deployment - Shamrock - JDBC - H2 - Deployment + quarkus-jdbc-h2-deployment + Quarkus - JDBC - H2 - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-jdbc-h2-runtime + io.quarkus + quarkus-jdbc-h2-runtime @@ -46,8 +46,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/jdbc/jdbc-h2/jdbc-h2-deployment/src/main/java/org/jboss/shamrock/jdbc/h2/deployment/H2JDBCReflections.java b/extensions/jdbc/jdbc-h2/jdbc-h2-deployment/src/main/java/org/jboss/shamrock/jdbc/h2/deployment/H2JDBCReflections.java index a5d9fb509f8b4..095793adbdc71 100644 --- a/extensions/jdbc/jdbc-h2/jdbc-h2-deployment/src/main/java/org/jboss/shamrock/jdbc/h2/deployment/H2JDBCReflections.java +++ b/extensions/jdbc/jdbc-h2/jdbc-h2-deployment/src/main/java/org/jboss/shamrock/jdbc/h2/deployment/H2JDBCReflections.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jboss.shamrock.jdbc.h2.deployment; +package io.quarkus.jdbc.h2.deployment; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; /** * Registers the {@code org.h2.Driver} so that it can be loaded diff --git a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/pom.xml b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/pom.xml index 85e498bbe16fe..681e7eb54c06a 100644 --- a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/pom.xml +++ b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/pom.xml @@ -19,14 +19,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-jdbc-h2 - org.jboss.shamrock + quarkus-jdbc-h2 + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-jdbc-h2-runtime - Shamrock - JDBC - H2 - Runtime + quarkus-jdbc-h2-runtime + Quarkus - JDBC - H2 - Runtime @@ -61,8 +61,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/CompareMode.java b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/CompareMode.java index 267a300feafbb..71d0a3449b48c 100644 --- a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/CompareMode.java +++ b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/CompareMode.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jdbc.h2.runtime.graal; +package io.quarkus.jdbc.h2.runtime.graal; import org.h2.engine.SysProperties; diff --git a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/Engine.java b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/Engine.java index 8596ebc073234..6f24d199462f4 100644 --- a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/Engine.java +++ b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/Engine.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jdbc.h2.runtime.graal; +package io.quarkus.jdbc.h2.runtime.graal; import org.h2.engine.ConnectionInfo; import org.h2.engine.Session; diff --git a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/H2ServerDisable.java b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/H2ServerDisable.java index 0f7175e3ac9f5..edbdbc33baff1 100644 --- a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/H2ServerDisable.java +++ b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/H2ServerDisable.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jdbc.h2.runtime.graal; +package io.quarkus.jdbc.h2.runtime.graal; import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/RemoteOnly.java b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/RemoteOnly.java index 16f16d35a7e9f..50baafff343ce 100644 --- a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/RemoteOnly.java +++ b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/RemoteOnly.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jdbc.h2.runtime.graal; +package io.quarkus.jdbc.h2.runtime.graal; import org.h2.engine.ConnectionInfo; diff --git a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/SessionDisable.java b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/SessionDisable.java index 1ef9fda649a72..fa38a3facdd7a 100644 --- a/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/SessionDisable.java +++ b/extensions/jdbc/jdbc-h2/jdbc-h2-runtime/src/main/java/org/jboss/shamrock/jdbc/h2/runtime/graal/SessionDisable.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jdbc.h2.runtime.graal; +package io.quarkus.jdbc.h2.runtime.graal; import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/jdbc/jdbc-h2/pom.xml b/extensions/jdbc/jdbc-h2/pom.xml index 923b108356b3f..39bdf96d10c64 100644 --- a/extensions/jdbc/jdbc-h2/pom.xml +++ b/extensions/jdbc/jdbc-h2/pom.xml @@ -19,14 +19,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-jdbc - org.jboss.shamrock + quarkus-jdbc + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-jdbc-h2 - Shamrock - JDBC - H2 + quarkus-jdbc-h2 + Quarkus - JDBC - H2 pom jdbc-h2-deployment diff --git a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-deployment/pom.xml b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-deployment/pom.xml index c405f47606f15..303560679c0bf 100644 --- a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-deployment/pom.xml +++ b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-deployment/pom.xml @@ -19,23 +19,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-jdbc-mariadb - org.jboss.shamrock + quarkus-jdbc-mariadb + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-jdbc-mariadb-deployment - Shamrock - JDBC - MariaDB - Deployment + quarkus-jdbc-mariadb-deployment + Quarkus - JDBC - MariaDB - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-jdbc-mariadb-runtime + io.quarkus + quarkus-jdbc-mariadb-runtime @@ -46,8 +46,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-deployment/src/main/java/org/jboss/shamrock/jdbc/mariadb/deployment/MariaDBJDBCReflections.java b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-deployment/src/main/java/org/jboss/shamrock/jdbc/mariadb/deployment/MariaDBJDBCReflections.java index ce72fcc0e0d80..4caff9e4873ff 100644 --- a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-deployment/src/main/java/org/jboss/shamrock/jdbc/mariadb/deployment/MariaDBJDBCReflections.java +++ b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-deployment/src/main/java/org/jboss/shamrock/jdbc/mariadb/deployment/MariaDBJDBCReflections.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jboss.shamrock.jdbc.mariadb.deployment; +package io.quarkus.jdbc.mariadb.deployment; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; public final class MariaDBJDBCReflections { diff --git a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/pom.xml b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/pom.xml index dc879d7aa7647..abfb97d73720b 100644 --- a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/pom.xml +++ b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/pom.xml @@ -19,14 +19,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-jdbc-mariadb - org.jboss.shamrock + quarkus-jdbc-mariadb + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-jdbc-mariadb-runtime - Shamrock - JDBC - MariaDB - Runtime + quarkus-jdbc-mariadb-runtime + Quarkus - JDBC - MariaDB - Runtime @@ -50,8 +50,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/DefaultAuthenticationProvider_Substitutions.java b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/DefaultAuthenticationProvider_Substitutions.java index e3ebb559f77d7..b6513dfb196d6 100644 --- a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/DefaultAuthenticationProvider_Substitutions.java +++ b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/DefaultAuthenticationProvider_Substitutions.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jdbc.mariadb.runtime.graal; +package io.quarkus.jdbc.mariadb.runtime.graal; import java.sql.SQLException; diff --git a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/Pool_disable_JMX.java b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/Pool_disable_JMX.java index 8a77c986edca0..f7634281cdd84 100644 --- a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/Pool_disable_JMX.java +++ b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/Pool_disable_JMX.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jdbc.mariadb.runtime.graal; +package io.quarkus.jdbc.mariadb.runtime.graal; import org.mariadb.jdbc.internal.logging.Logger; diff --git a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/SendPamAuthPacket_Removal.java b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/SendPamAuthPacket_Removal.java index d3e04fac5822b..9d3c52d190eec 100644 --- a/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/SendPamAuthPacket_Removal.java +++ b/extensions/jdbc/jdbc-mariadb/jdbc-mariadb-runtime/src/main/java/org/jboss/shamrock/jdbc/mariadb/runtime/graal/SendPamAuthPacket_Removal.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jdbc.mariadb.runtime.graal; +package io.quarkus.jdbc.mariadb.runtime.graal; import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/jdbc/jdbc-mariadb/pom.xml b/extensions/jdbc/jdbc-mariadb/pom.xml index 23cec33c70b74..f992b77ae30bc 100644 --- a/extensions/jdbc/jdbc-mariadb/pom.xml +++ b/extensions/jdbc/jdbc-mariadb/pom.xml @@ -19,14 +19,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-jdbc - org.jboss.shamrock + quarkus-jdbc + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-jdbc-mariadb - Shamrock - JDBC - MariaDB + quarkus-jdbc-mariadb + Quarkus - JDBC - MariaDB pom jdbc-mariadb-deployment diff --git a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-deployment/pom.xml b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-deployment/pom.xml index d435bf2a2a03b..62a32315016f7 100644 --- a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-deployment/pom.xml +++ b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-deployment/pom.xml @@ -19,23 +19,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-jdbc-postgresql - org.jboss.shamrock + quarkus-jdbc-postgresql + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-jdbc-postgresql-deployment - Shamrock - JDBC - PostgreSQL - Deployment + quarkus-jdbc-postgresql-deployment + Quarkus - JDBC - PostgreSQL - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-jdbc-postgresql-runtime + io.quarkus + quarkus-jdbc-postgresql-runtime @@ -46,8 +46,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-deployment/src/main/java/org/jboss/shamrock/jdbc/postresql/deployment/PostgreSQLJDBCReflections.java b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-deployment/src/main/java/org/jboss/shamrock/jdbc/postresql/deployment/PostgreSQLJDBCReflections.java index b8bb8094ea1c0..d3a01464c1591 100644 --- a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-deployment/src/main/java/org/jboss/shamrock/jdbc/postresql/deployment/PostgreSQLJDBCReflections.java +++ b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-deployment/src/main/java/org/jboss/shamrock/jdbc/postresql/deployment/PostgreSQLJDBCReflections.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jboss.shamrock.jdbc.postresql.deployment; +package io.quarkus.jdbc.postresql.deployment; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; /** * Registers the {@code org.postgresql.Driver} so that it can be loaded diff --git a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/pom.xml b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/pom.xml index 5be1188af4a49..32e2d99e19ca5 100644 --- a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/pom.xml +++ b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/pom.xml @@ -19,14 +19,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-jdbc-postgresql - org.jboss.shamrock + quarkus-jdbc-postgresql + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-jdbc-postgresql-runtime - Shamrock - JDBC - PostgreSQL - Runtime + quarkus-jdbc-postgresql-runtime + Quarkus - JDBC - PostgreSQL - Runtime @@ -50,8 +50,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/DisableSSPIClient.java b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/DisableSSPIClient.java index 02075c33f132d..50b39e3bf375d 100644 --- a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/DisableSSPIClient.java +++ b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/DisableSSPIClient.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jdbc.postresql.runtime.graal; +package io.quarkus.jdbc.postresql.runtime.graal; import org.postgresql.core.PGStream; import org.postgresql.core.v3.ConnectionFactoryImpl; diff --git a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/DriverSubstitutions.java b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/DriverSubstitutions.java index 5d13658d21517..255970e6ff694 100644 --- a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/DriverSubstitutions.java +++ b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/DriverSubstitutions.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jdbc.postresql.runtime.graal; +package io.quarkus.jdbc.postresql.runtime.graal; import java.util.Properties; diff --git a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/Remove_NTDSAPIWrapper.java b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/Remove_NTDSAPIWrapper.java index 5b30904df1218..3306ddbca0012 100644 --- a/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/Remove_NTDSAPIWrapper.java +++ b/extensions/jdbc/jdbc-postgresql/jdbc-postgresql-runtime/src/main/java/org/jboss/shamrock/jdbc/postresql/runtime/graal/Remove_NTDSAPIWrapper.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jdbc.postresql.runtime.graal; +package io.quarkus.jdbc.postresql.runtime.graal; import org.postgresql.sspi.NTDSAPIWrapper; diff --git a/extensions/jdbc/jdbc-postgresql/pom.xml b/extensions/jdbc/jdbc-postgresql/pom.xml index d2da0aaadd460..8e9835ac69525 100644 --- a/extensions/jdbc/jdbc-postgresql/pom.xml +++ b/extensions/jdbc/jdbc-postgresql/pom.xml @@ -19,14 +19,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-jdbc - org.jboss.shamrock + quarkus-jdbc + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-jdbc-postgresql - Shamrock - JDBC - PostgreSQL + quarkus-jdbc-postgresql + Quarkus - JDBC - PostgreSQL pom jdbc-postgresql-deployment diff --git a/extensions/jdbc/pom.xml b/extensions/jdbc/pom.xml index 8743a491755c7..d5921b719b7e3 100644 --- a/extensions/jdbc/pom.xml +++ b/extensions/jdbc/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-jdbc - Shamrock - JDBC + quarkus-jdbc + Quarkus - JDBC pom jdbc-postgresql diff --git a/extensions/kafka-client/deployment/pom.xml b/extensions/kafka-client/deployment/pom.xml index 88b7309443362..f1bb040ac378b 100644 --- a/extensions/kafka-client/deployment/pom.xml +++ b/extensions/kafka-client/deployment/pom.xml @@ -5,25 +5,25 @@ 4.0.0 - org.jboss.shamrock - shamrock-kafka-client + io.quarkus + quarkus-kafka-client 1.0.0.Alpha1-SNAPSHOT - shamrock-kafka-client-deployment + quarkus-kafka-client-deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-kafka-client-runtime + io.quarkus + quarkus-kafka-client-runtime - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal @@ -34,8 +34,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/kafka-client/deployment/src/main/java/org/jboss/shamrock/kafka/KafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/org/jboss/shamrock/kafka/KafkaProcessor.java index 43a21275d6da9..f99c8c71d7ca4 100644 --- a/extensions/kafka-client/deployment/src/main/java/org/jboss/shamrock/kafka/KafkaProcessor.java +++ b/extensions/kafka-client/deployment/src/main/java/org/jboss/shamrock/kafka/KafkaProcessor.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.kafka; +package io.quarkus.kafka; import java.util.Arrays; import java.util.Collection; @@ -31,10 +31,10 @@ import org.apache.kafka.common.serialization.StringSerializer; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; public class KafkaProcessor { diff --git a/extensions/kafka-client/pom.xml b/extensions/kafka-client/pom.xml index d2f68a3e78563..d12765732310e 100644 --- a/extensions/kafka-client/pom.xml +++ b/extensions/kafka-client/pom.xml @@ -3,15 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-kafka-client - Shamrock - Kafka - Client + quarkus-kafka-client + Quarkus - Kafka - Client pom diff --git a/extensions/kafka-client/runtime/pom.xml b/extensions/kafka-client/runtime/pom.xml index 81583f78f4a1e..0725a6bdc0792 100644 --- a/extensions/kafka-client/runtime/pom.xml +++ b/extensions/kafka-client/runtime/pom.xml @@ -5,12 +5,12 @@ 4.0.0 - org.jboss.shamrock - shamrock-kafka-client + io.quarkus + quarkus-kafka-client 1.0.0.Alpha1-SNAPSHOT - shamrock-kafka-client-runtime + quarkus-kafka-client-runtime @@ -36,8 +36,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/narayana-jta/deployment/pom.xml b/extensions/narayana-jta/deployment/pom.xml index 2fda5438fb86b..8756eed50f81e 100644 --- a/extensions/narayana-jta/deployment/pom.xml +++ b/extensions/narayana-jta/deployment/pom.xml @@ -19,28 +19,28 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-narayana-jta - org.jboss.shamrock + quarkus-narayana-jta + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-narayana-jta-deployment - Shamrock - Narayana JTA - Deployment + quarkus-narayana-jta-deployment + Quarkus - Narayana JTA - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-narayana-jta-runtime + io.quarkus + quarkus-narayana-jta-runtime @@ -51,8 +51,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/narayana-jta/deployment/src/main/java/org/jboss/shamrock/narayana/jta/NarayanaJtaProcessor.java b/extensions/narayana-jta/deployment/src/main/java/org/jboss/shamrock/narayana/jta/NarayanaJtaProcessor.java index 1da82c2b08202..137892e5fe605 100644 --- a/extensions/narayana-jta/deployment/src/main/java/org/jboss/shamrock/narayana/jta/NarayanaJtaProcessor.java +++ b/extensions/narayana-jta/deployment/src/main/java/org/jboss/shamrock/narayana/jta/NarayanaJtaProcessor.java @@ -14,33 +14,33 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta; +package io.quarkus.narayana.jta; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.RUNTIME_INIT; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.STATIC_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; import java.util.Properties; import javax.inject.Inject; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.deployment.Capabilities; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; -import org.jboss.shamrock.deployment.logging.LogCleanupFilterBuildItem; -import org.jboss.shamrock.narayana.jta.runtime.NarayanaJtaConfiguration; -import org.jboss.shamrock.narayana.jta.runtime.NarayanaJtaProducers; -import org.jboss.shamrock.narayana.jta.runtime.NarayanaJtaTemplate; -import org.jboss.shamrock.narayana.jta.runtime.interceptor.TransactionalInterceptorMandatory; -import org.jboss.shamrock.narayana.jta.runtime.interceptor.TransactionalInterceptorNever; -import org.jboss.shamrock.narayana.jta.runtime.interceptor.TransactionalInterceptorNotSupported; -import org.jboss.shamrock.narayana.jta.runtime.interceptor.TransactionalInterceptorRequired; -import org.jboss.shamrock.narayana.jta.runtime.interceptor.TransactionalInterceptorRequiresNew; -import org.jboss.shamrock.narayana.jta.runtime.interceptor.TransactionalInterceptorSupports; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.deployment.Capabilities; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; +import io.quarkus.deployment.logging.LogCleanupFilterBuildItem; +import io.quarkus.narayana.jta.runtime.NarayanaJtaConfiguration; +import io.quarkus.narayana.jta.runtime.NarayanaJtaProducers; +import io.quarkus.narayana.jta.runtime.NarayanaJtaTemplate; +import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorMandatory; +import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorNever; +import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorNotSupported; +import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorRequired; +import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorRequiresNew; +import io.quarkus.narayana.jta.runtime.interceptor.TransactionalInterceptorSupports; import com.arjuna.ats.internal.arjuna.coordinator.CheckedActionFactoryImple; import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; diff --git a/extensions/narayana-jta/pom.xml b/extensions/narayana-jta/pom.xml index b4c29c796e5f0..1797b15b27d56 100644 --- a/extensions/narayana-jta/pom.xml +++ b/extensions/narayana-jta/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-narayana-jta - Shamrock - Narayana JTA + quarkus-narayana-jta + Quarkus - Narayana JTA pom deployment diff --git a/extensions/narayana-jta/runtime/pom.xml b/extensions/narayana-jta/runtime/pom.xml index 7117e7c9998ae..38f7fe21f0a6c 100644 --- a/extensions/narayana-jta/runtime/pom.xml +++ b/extensions/narayana-jta/runtime/pom.xml @@ -19,24 +19,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-narayana-jta - org.jboss.shamrock + quarkus-narayana-jta + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-narayana-jta-runtime - Shamrock - Narayana JTA - Runtime + quarkus-narayana-jta-runtime + Quarkus - Narayana JTA - Runtime - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime com.oracle.substratevm @@ -66,8 +66,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaConfiguration.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaConfiguration.java index bd2f9c20e15a5..7c203b7421a27 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaConfiguration.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaConfiguration.java @@ -1,10 +1,10 @@ -package org.jboss.shamrock.narayana.jta.runtime; +package io.quarkus.narayana.jta.runtime; import java.util.Optional; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; /** * @@ -14,7 +14,7 @@ public final class NarayanaJtaConfiguration { /** * The node name used by the transaction manager */ - @ConfigItem(defaultValue = "shamrock") + @ConfigItem(defaultValue = "quarkus") public String nodeName; /** diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaProducers.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaProducers.java index 291aae9d627c9..11e15e9f5fb14 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaProducers.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaProducers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime; +package io.quarkus.narayana.jta.runtime; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaTemplate.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaTemplate.java index 2e1a2fac90f92..5cd2bc38b16a3 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaTemplate.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/NarayanaJtaTemplate.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime; +package io.quarkus.narayana.jta.runtime; import java.lang.reflect.Field; import java.util.Properties; import org.jboss.logging.Logger; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.runtime.annotations.Template; import com.arjuna.ats.arjuna.common.CoreEnvironmentBeanException; import com.arjuna.ats.arjuna.common.arjPropertyManager; @@ -50,7 +50,7 @@ public void setDefaultProperties(Properties properties) { try { Field field = PropertiesFactory.class.getDeclaredField("delegatePropertiesFactory"); field.setAccessible(true); - field.set(null, new ShamrockPropertiesFactory(properties)); + field.set(null, new QuarkusPropertiesFactory(properties)); } catch (Exception e) { log.error("Could not override transaction properties factory", e); diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/ShamrockPropertiesFactory.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/ShamrockPropertiesFactory.java index c06104f8796c4..22adcd9a82054 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/ShamrockPropertiesFactory.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/ShamrockPropertiesFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime; +package io.quarkus.narayana.jta.runtime; import java.io.IOException; import java.io.InputStream; @@ -22,11 +22,11 @@ import com.arjuna.common.util.propertyservice.AbstractPropertiesFactory; -public class ShamrockPropertiesFactory extends AbstractPropertiesFactory { +public class QuarkusPropertiesFactory extends AbstractPropertiesFactory { private final Properties properties; - public ShamrockPropertiesFactory(Properties properties) { + public QuarkusPropertiesFactory(Properties properties) { this.properties = properties; } diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/graal/ConfigurationInfoSubstitution.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/graal/ConfigurationInfoSubstitution.java index 17db30b9b11c9..4b21e9c1daec4 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/graal/ConfigurationInfoSubstitution.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/graal/ConfigurationInfoSubstitution.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime.graal; +package io.quarkus.narayana.jta.runtime.graal; import com.arjuna.common.util.ConfigurationInfo; import com.oracle.svm.core.annotate.Alias; diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/graal/PropertiesFactorySubstitution.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/graal/PropertiesFactorySubstitution.java index 3b67f719354fa..e4a87aee276f0 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/graal/PropertiesFactorySubstitution.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/graal/PropertiesFactorySubstitution.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime.graal; +package io.quarkus.narayana.jta.runtime.graal; import java.util.Properties; -import org.jboss.shamrock.narayana.jta.runtime.NarayanaJtaTemplate; +import io.quarkus.narayana.jta.runtime.NarayanaJtaTemplate; import com.arjuna.common.util.propertyservice.PropertiesFactory; import com.oracle.svm.core.annotate.Substitute; diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java index 69d1f41419c3d..8727a5007898a 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime.interceptor; +package io.quarkus.narayana.jta.runtime.interceptor; import java.io.Serializable; @@ -28,7 +28,7 @@ import javax.transaction.TransactionManager; import javax.transaction.Transactional; -import org.jboss.shamrock.arc.runtime.InterceptorBindings; +import io.quarkus.arc.runtime.InterceptorBindings; import org.jboss.tm.usertx.client.ServerVMClientUserTransaction; import com.arjuna.ats.jta.logging.jtaLogger; diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorMandatory.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorMandatory.java index 138080bd958f4..67e04c5bc3968 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorMandatory.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorMandatory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime.interceptor; +package io.quarkus.narayana.jta.runtime.interceptor; import javax.annotation.Priority; import javax.interceptor.AroundInvoke; diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorNever.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorNever.java index 0ee517caced75..33b4a854d2c28 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorNever.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorNever.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime.interceptor; +package io.quarkus.narayana.jta.runtime.interceptor; import javax.annotation.Priority; import javax.interceptor.AroundInvoke; diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorNotSupported.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorNotSupported.java index dce873ede0c37..44eefb036525e 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorNotSupported.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorNotSupported.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime.interceptor; +package io.quarkus.narayana.jta.runtime.interceptor; import javax.annotation.Priority; import javax.interceptor.AroundInvoke; diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorRequired.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorRequired.java index e9224899d0f87..46afbdc097719 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorRequired.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorRequired.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime.interceptor; +package io.quarkus.narayana.jta.runtime.interceptor; import javax.annotation.Priority; import javax.interceptor.AroundInvoke; diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorRequiresNew.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorRequiresNew.java index 2f15aba71a308..c527331332d90 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorRequiresNew.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorRequiresNew.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime.interceptor; +package io.quarkus.narayana.jta.runtime.interceptor; import javax.annotation.Priority; import javax.interceptor.AroundInvoke; diff --git a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorSupports.java b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorSupports.java index 394dd4586824f..d55492da52802 100644 --- a/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorSupports.java +++ b/extensions/narayana-jta/runtime/src/main/java/org/jboss/shamrock/narayana/jta/runtime/interceptor/TransactionalInterceptorSupports.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.narayana.jta.runtime.interceptor; +package io.quarkus.narayana.jta.runtime.interceptor; import javax.annotation.Priority; import javax.interceptor.AroundInvoke; diff --git a/extensions/netty/deployment/pom.xml b/extensions/netty/deployment/pom.xml index 54f9d63962e82..3ea1e252eeb5d 100644 --- a/extensions/netty/deployment/pom.xml +++ b/extensions/netty/deployment/pom.xml @@ -19,23 +19,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-netty - org.jboss.shamrock + quarkus-netty + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-netty-deployment - Shamrock - Netty - Deployment + quarkus-netty-deployment + Quarkus - Netty - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-netty-runtime + io.quarkus + quarkus-netty-runtime @@ -46,8 +46,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/netty/pom.xml b/extensions/netty/pom.xml index 8684a40e412bb..7fd932f480cb9 100644 --- a/extensions/netty/pom.xml +++ b/extensions/netty/pom.xml @@ -20,15 +20,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-netty - Shamrock - Netty + quarkus-netty + Quarkus - Netty pom deployment diff --git a/extensions/netty/runtime/pom.xml b/extensions/netty/runtime/pom.xml index 8a662007a755d..8df60a6cccfff 100644 --- a/extensions/netty/runtime/pom.xml +++ b/extensions/netty/runtime/pom.xml @@ -19,14 +19,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-netty - org.jboss.shamrock + quarkus-netty + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-netty-runtime - Shamrock - Netty - Runtime + quarkus-netty-runtime + Quarkus - Netty - Runtime diff --git a/extensions/reactive-streams-operators/pom.xml b/extensions/reactive-streams-operators/pom.xml index 261168241d6a0..4ef2725d5352e 100644 --- a/extensions/reactive-streams-operators/pom.xml +++ b/extensions/reactive-streams-operators/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-reactive-streams-operators - Shamrock - Reactive Streams Operators + quarkus-reactive-streams-operators + Quarkus - Reactive Streams Operators pom smallrye-reactive-streams-operators diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/pom.xml index cd83c2e77fa67..56e2c04344b06 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/pom.xml +++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/pom.xml @@ -19,23 +19,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-reactive-streams-operators - org.jboss.shamrock + quarkus-smallrye-reactive-streams-operators + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-smallrye-reactive-streams-operators-deployment - Shamrock - SmallRye Reactive Streams Operators - Deployment + quarkus-smallrye-reactive-streams-operators-deployment + Quarkus - SmallRye Reactive Streams Operators - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-smallrye-reactive-streams-operators-runtime + io.quarkus + quarkus-smallrye-reactive-streams-operators-runtime @@ -46,8 +46,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/main/java/org/jboss/shamrock/smallrye/reactivestreamoperators/SmallRyeReactiveStreamsOperatorsProcessor.java b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/main/java/org/jboss/shamrock/smallrye/reactivestreamoperators/SmallRyeReactiveStreamsOperatorsProcessor.java index 88438f4d6ee9a..76b9b79cc8a3e 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/main/java/org/jboss/shamrock/smallrye/reactivestreamoperators/SmallRyeReactiveStreamsOperatorsProcessor.java +++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/main/java/org/jboss/shamrock/smallrye/reactivestreamoperators/SmallRyeReactiveStreamsOperatorsProcessor.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.reactivestreamoperators; +package io.quarkus.smallrye.reactivestreamoperators; import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreamsFactory; import org.eclipse.microprofile.reactive.streams.operators.core.ReactiveStreamsFactoryImpl; import org.eclipse.microprofile.reactive.streams.operators.spi.ReactiveStreamsEngine; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ServiceProviderBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.substrate.ServiceProviderBuildItem; import io.smallrye.reactive.streams.Engine; diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml index c4c50147b5f58..26f38eed72e16 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml +++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../../build-parent/pom.xml 4.0.0 - shamrock-smallrye-reactive-streams-operators - Shamrock - SmallRye Reactive Streams Operators + quarkus-smallrye-reactive-streams-operators + Quarkus - SmallRye Reactive Streams Operators pom diff --git a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/pom.xml index c2a27b251731f..488e7a2e2ce87 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/pom.xml +++ b/extensions/reactive-streams-operators/smallrye-reactive-streams-operators/runtime/pom.xml @@ -19,14 +19,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-reactive-streams-operators - org.jboss.shamrock + quarkus-smallrye-reactive-streams-operators + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-smallrye-reactive-streams-operators-runtime - Shamrock - SmallRye Reactive Streams Operators - Runtime + quarkus-smallrye-reactive-streams-operators-runtime + Quarkus - SmallRye Reactive Streams Operators - Runtime @@ -67,8 +67,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/deployment/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/deployment/pom.xml index ef46461a9e007..6384f9be1aeca 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/deployment/pom.xml +++ b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/deployment/pom.xml @@ -5,22 +5,22 @@ 4.0.0 - org.jboss.shamrock - shamrock-smallrye-reactive-type-converters + io.quarkus + quarkus-smallrye-reactive-type-converters 1.0.0.Alpha1-SNAPSHOT - shamrock-smallrye-reactive-type-converters-deployment - Shamrock - SmallRye Reactive Type Converters - Deployment + quarkus-smallrye-reactive-type-converters-deployment + Quarkus - SmallRye Reactive Type Converters - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-smallrye-reactive-type-converters-runtime + io.quarkus + quarkus-smallrye-reactive-type-converters-runtime @@ -31,8 +31,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/deployment/src/main/java/org/jboss/shamrock/smallrye/typeconverters/SmallRyeReactiveTypeConvertersProcessor.java b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/deployment/src/main/java/org/jboss/shamrock/smallrye/typeconverters/SmallRyeReactiveTypeConvertersProcessor.java index e63c6de5e6580..69219de9f691c 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/deployment/src/main/java/org/jboss/shamrock/smallrye/typeconverters/SmallRyeReactiveTypeConvertersProcessor.java +++ b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/deployment/src/main/java/org/jboss/shamrock/smallrye/typeconverters/SmallRyeReactiveTypeConvertersProcessor.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.typeconverters; +package io.quarkus.smallrye.typeconverters; import io.smallrye.reactive.converters.ReactiveTypeConverter; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ServiceProviderBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.substrate.ServiceProviderBuildItem; import java.util.Collection; diff --git a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml index 0146a3fa925de..91f8b1ed2f8c0 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml +++ b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/pom.xml @@ -5,14 +5,14 @@ 4.0.0 - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../../build-parent/pom.xml - shamrock-smallrye-reactive-type-converters - Shamrock - SmallRye Reactive Type Converters + quarkus-smallrye-reactive-type-converters + Quarkus - SmallRye Reactive Type Converters pom diff --git a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/pom.xml b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/pom.xml index e7a5281ae4920..c0e685a33ddb0 100644 --- a/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/pom.xml +++ b/extensions/reactive-streams-operators/smallrye-reactive-type-converters/runtime/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - org.jboss.shamrock - shamrock-smallrye-reactive-type-converters + io.quarkus + quarkus-smallrye-reactive-type-converters 1.0.0.Alpha1-SNAPSHOT - shamrock-smallrye-reactive-type-converters-runtime - Shamrock - SmallRye Reactive Type Converters - Runtime + quarkus-smallrye-reactive-type-converters-runtime + Quarkus - SmallRye Reactive Type Converters - Runtime diff --git a/extensions/resteasy-common/deployment/pom.xml b/extensions/resteasy-common/deployment/pom.xml index 06d70e32f43c0..b3f13723da10b 100644 --- a/extensions/resteasy-common/deployment/pom.xml +++ b/extensions/resteasy-common/deployment/pom.xml @@ -19,20 +19,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-resteasy-common - org.jboss.shamrock + quarkus-resteasy-common + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-resteasy-common-deployment - Shamrock - RESTEasy - Common - Deployment + quarkus-resteasy-common-deployment + Quarkus - RESTEasy - Common - Deployment - org.jboss.shamrock - shamrock-resteasy-common-runtime + io.quarkus + quarkus-resteasy-common-runtime com.oracle.substratevm @@ -47,8 +47,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/resteasy-common/pom.xml b/extensions/resteasy-common/pom.xml index 66da4cfe80ec5..26910efbd6c1c 100644 --- a/extensions/resteasy-common/pom.xml +++ b/extensions/resteasy-common/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-resteasy-common - Shamrock - RESTEasy - Common + quarkus-resteasy-common + Quarkus - RESTEasy - Common pom deployment diff --git a/extensions/resteasy-common/runtime/pom.xml b/extensions/resteasy-common/runtime/pom.xml index fe84bc2c8f5ca..bde0c6aca6623 100644 --- a/extensions/resteasy-common/runtime/pom.xml +++ b/extensions/resteasy-common/runtime/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-resteasy-common - org.jboss.shamrock + quarkus-resteasy-common + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-resteasy-common-runtime - Shamrock - RESTEasy - Common - Runtime + quarkus-resteasy-common-runtime + Quarkus - RESTEasy - Common - Runtime @@ -35,8 +35,8 @@ svm - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime org.jboss.resteasy @@ -54,8 +54,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/DeleteDocumentProvider.java b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/DeleteDocumentProvider.java index c6994ca9d5593..12f9df3770854 100644 --- a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/DeleteDocumentProvider.java +++ b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/DeleteDocumentProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.resteasy.common.runtime.graal; +package io.quarkus.resteasy.common.runtime.graal; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/DeleteIIOImageProvider.java b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/DeleteIIOImageProvider.java index 1db41b90502bb..7b3d71cd93a0b 100644 --- a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/DeleteIIOImageProvider.java +++ b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/DeleteIIOImageProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.resteasy.common.runtime.graal; +package io.quarkus.resteasy.common.runtime.graal; import java.io.IOException; import java.io.InputStream; diff --git a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/ImageIOSubstitutions.java b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/ImageIOSubstitutions.java index 70a3eb970e4a8..f0984b53be3a6 100644 --- a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/ImageIOSubstitutions.java +++ b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/ImageIOSubstitutions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.resteasy.common.runtime.graal; +package io.quarkus.resteasy.common.runtime.graal; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; diff --git a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/InternalLocatableAnnotationSubstitutions.java b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/InternalLocatableAnnotationSubstitutions.java index 6d5deca035c24..bcf48355b6685 100644 --- a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/InternalLocatableAnnotationSubstitutions.java +++ b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/InternalLocatableAnnotationSubstitutions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.resteasy.common.runtime.graal; +package io.quarkus.resteasy.common.runtime.graal; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/LCMSSubstitutions.java b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/LCMSSubstitutions.java index 16b916bf2159a..c074796f55ca2 100644 --- a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/LCMSSubstitutions.java +++ b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/LCMSSubstitutions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.resteasy.common.runtime.graal; +package io.quarkus.resteasy.common.runtime.graal; import java.awt.color.ICC_Profile; diff --git a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/LocatableAnnotationSubstitutions.java b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/LocatableAnnotationSubstitutions.java index f3c625e3caef2..66d512f3085d9 100644 --- a/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/LocatableAnnotationSubstitutions.java +++ b/extensions/resteasy-common/runtime/src/main/java/org/jboss/shamrock/resteasy/common/runtime/graal/LocatableAnnotationSubstitutions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.resteasy.common.runtime.graal; +package io.quarkus.resteasy.common.runtime.graal; import java.lang.annotation.Annotation; import java.util.function.BooleanSupplier; diff --git a/extensions/resteasy-jsonb/deployment/pom.xml b/extensions/resteasy-jsonb/deployment/pom.xml index 8c48a3fb15f70..854eabcbd1e26 100644 --- a/extensions/resteasy-jsonb/deployment/pom.xml +++ b/extensions/resteasy-jsonb/deployment/pom.xml @@ -19,24 +19,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-resteasy-jsonb - org.jboss.shamrock + quarkus-resteasy-jsonb + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-resteasy-jsonb-deployment - Shamrock - RESTEasy - JSON-B - Deployment + quarkus-resteasy-jsonb-deployment + Quarkus - RESTEasy - JSON-B - Deployment - org.jboss.shamrock - shamrock-resteasy-deployment + io.quarkus + quarkus-resteasy-deployment - org.jboss.shamrock - shamrock-resteasy-jsonb-runtime + io.quarkus + quarkus-resteasy-jsonb-runtime @@ -47,8 +47,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/resteasy-jsonb/deployment/src/main/java/org/jboss/shamrock/resteasy/jsonb/ResteasyJsonbProcessor.java b/extensions/resteasy-jsonb/deployment/src/main/java/org/jboss/shamrock/resteasy/jsonb/ResteasyJsonbProcessor.java index 7a7cbad975dfc..d76adaa1a3c9b 100755 --- a/extensions/resteasy-jsonb/deployment/src/main/java/org/jboss/shamrock/resteasy/jsonb/ResteasyJsonbProcessor.java +++ b/extensions/resteasy-jsonb/deployment/src/main/java/org/jboss/shamrock/resteasy/jsonb/ResteasyJsonbProcessor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.resteasy.jsonb; +package io.quarkus.resteasy.jsonb; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; public class ResteasyJsonbProcessor { diff --git a/extensions/resteasy-jsonb/pom.xml b/extensions/resteasy-jsonb/pom.xml index f4cb3474a24ad..ff1f99e0391ae 100644 --- a/extensions/resteasy-jsonb/pom.xml +++ b/extensions/resteasy-jsonb/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-resteasy-jsonb - Shamrock - RESTEasy - JSON-B + quarkus-resteasy-jsonb + Quarkus - RESTEasy - JSON-B pom deployment diff --git a/extensions/resteasy-jsonb/runtime/pom.xml b/extensions/resteasy-jsonb/runtime/pom.xml index 0858ccf26399f..c82f4dbde7dc0 100644 --- a/extensions/resteasy-jsonb/runtime/pom.xml +++ b/extensions/resteasy-jsonb/runtime/pom.xml @@ -19,20 +19,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-resteasy-jsonb - org.jboss.shamrock + quarkus-resteasy-jsonb + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-resteasy-jsonb-runtime - Shamrock - RESTEasy - JSON-B - Runtime + quarkus-resteasy-jsonb-runtime + Quarkus - RESTEasy - JSON-B - Runtime - org.jboss.shamrock - shamrock-resteasy-runtime + io.quarkus + quarkus-resteasy-runtime org.jboss.resteasy @@ -54,8 +54,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/resteasy/deployment/pom.xml b/extensions/resteasy/deployment/pom.xml index 8da5ffd158eb5..046a450d5b71d 100644 --- a/extensions/resteasy/deployment/pom.xml +++ b/extensions/resteasy/deployment/pom.xml @@ -19,36 +19,36 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-resteasy - org.jboss.shamrock + quarkus-resteasy + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-resteasy-deployment - Shamrock - RESTEasy - Deployment + quarkus-resteasy-deployment + Quarkus - RESTEasy - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-resteasy-common-deployment + io.quarkus + quarkus-resteasy-common-deployment - org.jboss.shamrock - shamrock-undertow-deployment + io.quarkus + quarkus-undertow-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-resteasy-runtime + io.quarkus + quarkus-resteasy-runtime com.oracle.substratevm @@ -63,8 +63,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyJaxrsConfig.java b/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyJaxrsConfig.java index 9e0c296f15906..dfbdfdd874f52 100644 --- a/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyJaxrsConfig.java +++ b/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyJaxrsConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.resteasy; +package io.quarkus.resteasy; import org.jboss.builder.item.SimpleBuildItem; diff --git a/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyJaxrsProviderBuildItem.java b/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyJaxrsProviderBuildItem.java index 815981d681cfa..82c63c7f23f6f 100644 --- a/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyJaxrsProviderBuildItem.java +++ b/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyJaxrsProviderBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.resteasy; +package io.quarkus.resteasy; import org.jboss.builder.item.MultiBuildItem; diff --git a/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyScanningProcessor.java b/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyScanningProcessor.java index 1b10ba75f061d..a8f4d773c3e99 100755 --- a/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyScanningProcessor.java +++ b/extensions/resteasy/deployment/src/main/java/org/jboss/shamrock/resteasy/ResteasyScanningProcessor.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.resteasy; +package io.quarkus.resteasy; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.STATIC_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -60,31 +60,31 @@ import org.jboss.resteasy.plugins.interceptors.GZIPEncodingInterceptor; import org.jboss.resteasy.plugins.server.servlet.HttpServlet30Dispatcher; import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters; -import org.jboss.shamrock.arc.deployment.BeanContainerBuildItem; -import org.jboss.shamrock.arc.deployment.BeanDefiningAnnotationBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.ProxyUnwrapperBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveHierarchyBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateConfigBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateResourceBuildItem; -import org.jboss.shamrock.deployment.logging.LogCleanupFilterBuildItem; -import org.jboss.shamrock.deployment.util.ServiceUtil; -import org.jboss.shamrock.resteasy.runtime.ResteasyFilter; -import org.jboss.shamrock.resteasy.runtime.ResteasyTemplate; -import org.jboss.shamrock.resteasy.runtime.RolesFilterRegistrar; -import org.jboss.shamrock.resteasy.runtime.ShamrockInjectorFactory; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; -import org.jboss.shamrock.undertow.FilterBuildItem; -import org.jboss.shamrock.undertow.ServletBuildItem; -import org.jboss.shamrock.undertow.ServletInitParamBuildItem; +import io.quarkus.arc.deployment.BeanContainerBuildItem; +import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.ProxyUnwrapperBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveHierarchyBuildItem; +import io.quarkus.deployment.builditem.substrate.RuntimeInitializedClassBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateConfigBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem; +import io.quarkus.deployment.logging.LogCleanupFilterBuildItem; +import io.quarkus.deployment.util.ServiceUtil; +import io.quarkus.resteasy.runtime.ResteasyFilter; +import io.quarkus.resteasy.runtime.ResteasyTemplate; +import io.quarkus.resteasy.runtime.RolesFilterRegistrar; +import io.quarkus.resteasy.runtime.QuarkusInjectorFactory; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigRoot; +import io.quarkus.undertow.FilterBuildItem; +import io.quarkus.undertow.ServletBuildItem; +import io.quarkus.undertow.ServletInitParamBuildItem; /** * Processor that finds JAX-RS classes in the deployment @@ -201,11 +201,11 @@ static final class ResteasyConfig { String path; } - private static final Logger log = Logger.getLogger("org.jboss.shamrock.resteasy"); + private static final Logger log = Logger.getLogger("io.quarkus.resteasy"); @BuildStep - org.jboss.shamrock.resteasy.ResteasyJaxrsConfig exportConfig() { - return new org.jboss.shamrock.resteasy.ResteasyJaxrsConfig(resteasyConfig.path); + io.quarkus.resteasy.ResteasyJaxrsConfig exportConfig() { + return new io.quarkus.resteasy.ResteasyJaxrsConfig(resteasyConfig.path); } @BuildStep @@ -458,7 +458,7 @@ void setupInjection(ResteasyTemplate template, } template.setupIntegration(beanContainerBuildItem.getValue(), unwrappers); - servletContextParams.produce(new ServletInitParamBuildItem("resteasy.injector.factory", ShamrockInjectorFactory.class.getName())); + servletContextParams.produce(new ServletInitParamBuildItem("resteasy.injector.factory", QuarkusInjectorFactory.class.getName())); } diff --git a/extensions/resteasy/pom.xml b/extensions/resteasy/pom.xml index 5209b7f501845..204a3ff716116 100644 --- a/extensions/resteasy/pom.xml +++ b/extensions/resteasy/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-resteasy - Shamrock - RESTEasy + quarkus-resteasy + Quarkus - RESTEasy pom deployment diff --git a/extensions/resteasy/runtime/pom.xml b/extensions/resteasy/runtime/pom.xml index 5ce6d7ac3d09f..05190b43c5daa 100644 --- a/extensions/resteasy/runtime/pom.xml +++ b/extensions/resteasy/runtime/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-resteasy - org.jboss.shamrock + quarkus-resteasy + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-resteasy-runtime - Shamrock - RESTEasy - Runtime + quarkus-resteasy-runtime + Quarkus - RESTEasy - Runtime @@ -35,20 +35,20 @@ svm - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-undertow-runtime + io.quarkus + quarkus-undertow-runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime - org.jboss.shamrock - shamrock-resteasy-common-runtime + io.quarkus + quarkus-resteasy-common-runtime javax.validation @@ -70,8 +70,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/DenyAllFilter.java b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/DenyAllFilter.java index a09c1ece0db7f..f8a7e3dd98ac1 100644 --- a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/DenyAllFilter.java +++ b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/DenyAllFilter.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.resteasy.runtime; +package io.quarkus.resteasy.runtime; import javax.annotation.Priority; import javax.ws.rs.Priorities; diff --git a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RequestFailer.java b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RequestFailer.java index 4c7f046898e2c..0cef204bcebfe 100644 --- a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RequestFailer.java +++ b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RequestFailer.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.resteasy.runtime; +package io.quarkus.resteasy.runtime; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.core.Response; diff --git a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ResteasyFilter.java b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ResteasyFilter.java index 21ad3bea0bc16..e07e17b0790bf 100644 --- a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ResteasyFilter.java +++ b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ResteasyFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.resteasy.runtime; +package io.quarkus.resteasy.runtime; import java.io.IOException; diff --git a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ResteasyTemplate.java b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ResteasyTemplate.java index 7d1dd5b56806e..5ed90f04b537d 100644 --- a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ResteasyTemplate.java +++ b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ResteasyTemplate.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.jboss.shamrock.resteasy.runtime; +package io.quarkus.resteasy.runtime; import java.util.List; import java.util.function.Function; -import org.jboss.shamrock.arc.runtime.BeanContainer; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.runtime.annotations.Template; @Template public class ResteasyTemplate { public void setupIntegration(BeanContainer container, List> propertyUnwrappers) { - ShamrockInjectorFactory.CONTAINER = container; - ShamrockInjectorFactory.PROXY_UNWRAPPER = new Function() { + QuarkusInjectorFactory.CONTAINER = container; + QuarkusInjectorFactory.PROXY_UNWRAPPER = new Function() { @Override public Object apply(Object o) { Object res = o; diff --git a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RolesAllowedFilter.java b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RolesAllowedFilter.java index d76ddebcd4883..da43991e58464 100644 --- a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RolesAllowedFilter.java +++ b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RolesAllowedFilter.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.resteasy.runtime; +package io.quarkus.resteasy.runtime; import javax.annotation.Priority; import javax.ws.rs.Priorities; diff --git a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RolesFilterRegistrar.java b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RolesFilterRegistrar.java index 610fcd9ac6948..2aa81e41fe3f7 100644 --- a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RolesFilterRegistrar.java +++ b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/RolesFilterRegistrar.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.resteasy.runtime; +package io.quarkus.resteasy.runtime; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ShamrockConstructorInjector.java b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ShamrockConstructorInjector.java index 77bafff18cdd4..a5ecf526c0d56 100644 --- a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ShamrockConstructorInjector.java +++ b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ShamrockConstructorInjector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.resteasy.runtime; +package io.quarkus.resteasy.runtime; import java.lang.reflect.Constructor; import java.util.concurrent.CompletableFuture; @@ -27,9 +27,9 @@ import org.jboss.resteasy.spi.Failure; import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.HttpResponse; -import org.jboss.shamrock.arc.runtime.BeanContainer; +import io.quarkus.arc.runtime.BeanContainer; -public class ShamrockConstructorInjector implements ConstructorInjector { +public class QuarkusConstructorInjector implements ConstructorInjector { private volatile BeanContainer.Factory factory; @@ -37,7 +37,7 @@ public class ShamrockConstructorInjector implements ConstructorInjector { private final Constructor ctor; - public ShamrockConstructorInjector(Constructor ctor, ConstructorInjector delegate) { + public QuarkusConstructorInjector(Constructor ctor, ConstructorInjector delegate) { this.ctor = ctor; this.delegate = delegate; } @@ -50,11 +50,11 @@ public CompletionStage construct(boolean unwrapAsync) { @Override public CompletionStage construct(HttpRequest request, HttpResponse response, boolean unwrapAsync) throws Failure, WebApplicationException, ApplicationException { - if (ShamrockInjectorFactory.CONTAINER == null) { + if (QuarkusInjectorFactory.CONTAINER == null) { return delegate.construct(request, response, unwrapAsync); } if(factory == null) { - factory = ShamrockInjectorFactory.CONTAINER.instanceFactory(this.ctor.getDeclaringClass()); + factory = QuarkusInjectorFactory.CONTAINER.instanceFactory(this.ctor.getDeclaringClass()); } if(factory == null) { return delegate.construct(request, response, unwrapAsync); diff --git a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ShamrockInjectorFactory.java b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ShamrockInjectorFactory.java index 6587291881508..d6a3655fc9838 100644 --- a/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ShamrockInjectorFactory.java +++ b/extensions/resteasy/runtime/src/main/java/org/jboss/shamrock/resteasy/runtime/ShamrockInjectorFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.resteasy.runtime; +package io.quarkus.resteasy.runtime; import java.lang.reflect.Constructor; import java.util.concurrent.CompletionStage; @@ -33,11 +33,11 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.jboss.resteasy.spi.metadata.ResourceClass; import org.jboss.resteasy.spi.metadata.ResourceConstructor; -import org.jboss.shamrock.arc.runtime.BeanContainer; +import io.quarkus.arc.runtime.BeanContainer; -public class ShamrockInjectorFactory extends InjectorFactoryImpl { +public class QuarkusInjectorFactory extends InjectorFactoryImpl { - private static final Logger log = Logger.getLogger("org.jboss.shamrock.resteasy.runtime"); + private static final Logger log = Logger.getLogger("io.quarkus.resteasy.runtime"); static volatile BeanContainer CONTAINER = null; static volatile Function PROXY_UNWRAPPER; @@ -51,7 +51,7 @@ public ConstructorInjector createConstructor(Constructor constructor, ResteasyPr @Override public ConstructorInjector createConstructor(ResourceConstructor constructor, ResteasyProviderFactory providerFactory) { log.debugf("Create resource constructor: %s", constructor.getConstructor()); - return new ShamrockConstructorInjector(constructor.getConstructor(), super.createConstructor(constructor, providerFactory)); + return new QuarkusConstructorInjector(constructor.getConstructor(), super.createConstructor(constructor, providerFactory)); } @SuppressWarnings("rawtypes") diff --git a/extensions/scheduler/deployment/pom.xml b/extensions/scheduler/deployment/pom.xml index 4a3d2f0debb65..ccc3a04626cee 100644 --- a/extensions/scheduler/deployment/pom.xml +++ b/extensions/scheduler/deployment/pom.xml @@ -3,34 +3,34 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-scheduler - org.jboss.shamrock + quarkus-scheduler + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-scheduler-deployment - Shamrock - Scheduler - Deployment + quarkus-scheduler-deployment + Quarkus - Scheduler - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-scheduler-runtime + io.quarkus + quarkus-scheduler-runtime - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal @@ -42,8 +42,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/scheduler/deployment/src/main/java/org/jboss/shamrock/scheduler/deployment/ScheduledBusinessMethodItem.java b/extensions/scheduler/deployment/src/main/java/org/jboss/shamrock/scheduler/deployment/ScheduledBusinessMethodItem.java index 4d67979c4fcd3..2df58aa82af12 100644 --- a/extensions/scheduler/deployment/src/main/java/org/jboss/shamrock/scheduler/deployment/ScheduledBusinessMethodItem.java +++ b/extensions/scheduler/deployment/src/main/java/org/jboss/shamrock/scheduler/deployment/ScheduledBusinessMethodItem.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.deployment; +package io.quarkus.scheduler.deployment; import java.util.List; import org.jboss.builder.item.MultiBuildItem; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.MethodInfo; -import org.jboss.protean.arc.processor.BeanInfo; +import org.jboss.quarkus.arc.processor.BeanInfo; public final class ScheduledBusinessMethodItem extends MultiBuildItem { diff --git a/extensions/scheduler/deployment/src/main/java/org/jboss/shamrock/scheduler/deployment/SchedulerProcessor.java b/extensions/scheduler/deployment/src/main/java/org/jboss/shamrock/scheduler/deployment/SchedulerProcessor.java index a8baec386c931..d1e54953af4de 100644 --- a/extensions/scheduler/deployment/src/main/java/org/jboss/shamrock/scheduler/deployment/SchedulerProcessor.java +++ b/extensions/scheduler/deployment/src/main/java/org/jboss/shamrock/scheduler/deployment/SchedulerProcessor.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.deployment; +package io.quarkus.scheduler.deployment; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.STATIC_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; import java.text.ParseException; import java.time.Duration; @@ -35,42 +35,42 @@ import org.jboss.jandex.Type; import org.jboss.jandex.Type.Kind; import org.jboss.logging.Logger; -import org.jboss.protean.arc.Arc; -import org.jboss.protean.arc.ArcContainer; -import org.jboss.protean.arc.InjectableBean; -import org.jboss.protean.arc.InstanceHandle; -import org.jboss.protean.arc.processor.AnnotationStore; -import org.jboss.protean.arc.processor.AnnotationsTransformer; -import org.jboss.protean.arc.processor.BeanDeploymentValidator; -import org.jboss.protean.arc.processor.BeanDeploymentValidator.ValidationContext; -import org.jboss.protean.arc.processor.BeanInfo; -import org.jboss.protean.arc.processor.DotNames; -import org.jboss.protean.arc.processor.ScopeInfo; +import org.jboss.quarkus.arc.Arc; +import org.jboss.quarkus.arc.ArcContainer; +import org.jboss.quarkus.arc.InjectableBean; +import org.jboss.quarkus.arc.InstanceHandle; +import org.jboss.quarkus.arc.processor.AnnotationStore; +import org.jboss.quarkus.arc.processor.AnnotationsTransformer; +import org.jboss.quarkus.arc.processor.BeanDeploymentValidator; +import org.jboss.quarkus.arc.processor.BeanDeploymentValidator.ValidationContext; +import org.jboss.quarkus.arc.processor.BeanInfo; +import org.jboss.quarkus.arc.processor.DotNames; +import org.jboss.quarkus.arc.processor.ScopeInfo; import org.jboss.protean.gizmo.ClassCreator; import org.jboss.protean.gizmo.ClassOutput; import org.jboss.protean.gizmo.MethodCreator; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.arc.deployment.AnnotationsTransformerBuildItem; -import org.jboss.shamrock.arc.deployment.BeanContainerBuildItem; -import org.jboss.shamrock.arc.deployment.BeanDeploymentValidatorBuildItem; -import org.jboss.shamrock.arc.deployment.UnremovableBeanBuildItem; -import org.jboss.shamrock.arc.deployment.UnremovableBeanBuildItem.BeanClassAnnotationExclusion; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.AnnotationProxyBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.GeneratedClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.deployment.util.HashUtil; -import org.jboss.shamrock.scheduler.api.Scheduled; -import org.jboss.shamrock.scheduler.api.ScheduledExecution; -import org.jboss.shamrock.scheduler.runtime.QuartzScheduler; -import org.jboss.shamrock.scheduler.runtime.ScheduledInvoker; -import org.jboss.shamrock.scheduler.runtime.SchedulerConfiguration; -import org.jboss.shamrock.scheduler.runtime.SchedulerDeploymentTemplate; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem; +import io.quarkus.arc.deployment.BeanContainerBuildItem; +import io.quarkus.arc.deployment.BeanDeploymentValidatorBuildItem; +import io.quarkus.arc.deployment.UnremovableBeanBuildItem; +import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanClassAnnotationExclusion; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.AnnotationProxyBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.GeneratedClassBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.util.HashUtil; +import io.quarkus.scheduler.api.Scheduled; +import io.quarkus.scheduler.api.ScheduledExecution; +import io.quarkus.scheduler.runtime.QuartzScheduler; +import io.quarkus.scheduler.runtime.ScheduledInvoker; +import io.quarkus.scheduler.runtime.SchedulerConfiguration; +import io.quarkus.scheduler.runtime.SchedulerDeploymentTemplate; import org.quartz.CronExpression; import org.quartz.simpl.CascadingClassLoadHelper; import org.quartz.simpl.RAMJobStore; @@ -82,7 +82,7 @@ */ public class SchedulerProcessor { - private static final Logger LOGGER = Logger.getLogger("org.jboss.shamrock.scheduler.deployment.processor"); + private static final Logger LOGGER = Logger.getLogger("io.quarkus.scheduler.deployment.processor"); static final DotName SCHEDULED_NAME = DotName.createSimple(Scheduled.class.getName()); static final DotName SCHEDULES_NAME = DotName.createSimple(Scheduled.Schedules.class.getName()); diff --git a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/InvalidCronExpressionTest.java b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/InvalidCronExpressionTest.java index e2c10f6075013..758c125411d9f 100644 --- a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/InvalidCronExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/InvalidCronExpressionTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.test; +package io.quarkus.scheduler.test; import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shamrock.scheduler.api.Scheduled; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.scheduler.api.Scheduled; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ public class InvalidCronExpressionTest { @RegisterExtension - static final ShamrockUnitTest test = new ShamrockUnitTest() + static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(InvalidBean.class)); diff --git a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/InvalidEveryExpressionTest.java b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/InvalidEveryExpressionTest.java index 5cb1866389668..8590652a96f12 100644 --- a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/InvalidEveryExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/InvalidEveryExpressionTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.test; +package io.quarkus.scheduler.test; import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shamrock.scheduler.api.Scheduled; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.scheduler.api.Scheduled; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ public class InvalidEveryExpressionTest { @RegisterExtension - static final ShamrockUnitTest test = new ShamrockUnitTest() + static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(InvalidEveryExpressionTest.InvalidBean.class)); diff --git a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/MissingConfigCronExpressionTest.java b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/MissingConfigCronExpressionTest.java index 017600a18d83e..a80b7c4788918 100644 --- a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/MissingConfigCronExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/MissingConfigCronExpressionTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.test; +package io.quarkus.scheduler.test; -import org.jboss.shamrock.scheduler.api.Scheduled; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.scheduler.api.Scheduled; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; @@ -25,7 +25,7 @@ public class MissingConfigCronExpressionTest { @RegisterExtension - static final ShamrockUnitTest test = new ShamrockUnitTest() + static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(IllegalStateException.class) .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(MissingConfigCronExpressionTest.InvalidBean.class)); diff --git a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/NoExpressionTest.java b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/NoExpressionTest.java index de4883cdbe1f9..d5b47267a1c80 100644 --- a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/NoExpressionTest.java +++ b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/NoExpressionTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.test; +package io.quarkus.scheduler.test; import javax.enterprise.inject.spi.DeploymentException; -import org.jboss.shamrock.scheduler.api.Scheduled; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.scheduler.api.Scheduled; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ public class NoExpressionTest { @RegisterExtension - static final ShamrockUnitTest test = new ShamrockUnitTest() + static final QuarkusUnitTest test = new QuarkusUnitTest() .setExpectedException(DeploymentException.class) .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(InvalidBean.class)); diff --git a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/SimpleJobs.java b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/SimpleJobs.java index 527f7db644ec9..85147193f395c 100644 --- a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/SimpleJobs.java +++ b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/SimpleJobs.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.test; +package io.quarkus.scheduler.test; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; -import org.jboss.shamrock.scheduler.api.Scheduled; +import io.quarkus.scheduler.api.Scheduled; public class SimpleJobs { diff --git a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/SimpleScheduledMethodTest.java b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/SimpleScheduledMethodTest.java index b685ecce60438..983295b1acb2f 100644 --- a/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/SimpleScheduledMethodTest.java +++ b/extensions/scheduler/deployment/src/test/java/org/jboss/shamrock/scheduler/test/SimpleScheduledMethodTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.test; +package io.quarkus.scheduler.test; import static org.wildfly.common.Assert.assertNotNull; import static org.wildfly.common.Assert.assertTrue; @@ -23,8 +23,8 @@ import javax.inject.Inject; -import org.jboss.shamrock.scheduler.api.Scheduler; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.scheduler.api.Scheduler; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -35,7 +35,7 @@ public class SimpleScheduledMethodTest { @RegisterExtension - static final ShamrockUnitTest test = new ShamrockUnitTest() + static final QuarkusUnitTest test = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(SimpleJobs.class) .addAsManifestResource(new StringAsset("simpleJobs.cron=0/1 * * * * ?\nsimpleJobs.every=1s"), "microprofile-config.properties")); diff --git a/extensions/scheduler/pom.xml b/extensions/scheduler/pom.xml index f060f5de323a8..955ac0027170a 100644 --- a/extensions/scheduler/pom.xml +++ b/extensions/scheduler/pom.xml @@ -3,15 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-scheduler - Shamrock - Scheduler + quarkus-scheduler + Quarkus - Scheduler pom diff --git a/extensions/scheduler/runtime/pom.xml b/extensions/scheduler/runtime/pom.xml index 2426271719690..1a33d376d3805 100644 --- a/extensions/scheduler/runtime/pom.xml +++ b/extensions/scheduler/runtime/pom.xml @@ -3,20 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-scheduler - org.jboss.shamrock + quarkus-scheduler + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-scheduler-runtime - Shamrock - Scheduler - Runtime + quarkus-scheduler-runtime + Quarkus - Scheduler - Runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime org.slf4j @@ -64,8 +64,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Scheduled.java b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Scheduled.java index 907abffae2dee..e87b22affa5f5 100644 --- a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Scheduled.java +++ b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Scheduled.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.api; +package io.quarkus.scheduler.api; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -24,7 +24,7 @@ import java.time.Duration; import java.util.concurrent.TimeUnit; -import org.jboss.shamrock.scheduler.api.Scheduled.Schedules; +import io.quarkus.scheduler.api.Scheduled.Schedules; /** * Marks a business method to be automatically scheduled and invoked by the container. diff --git a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/ScheduledExecution.java b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/ScheduledExecution.java index 62fabaf231dd7..23559682f03e3 100644 --- a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/ScheduledExecution.java +++ b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/ScheduledExecution.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.api; +package io.quarkus.scheduler.api; import java.time.Instant; diff --git a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Scheduler.java b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Scheduler.java index a4bd3fa459612..e96fc97d4a38b 100644 --- a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Scheduler.java +++ b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Scheduler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.api; +package io.quarkus.scheduler.api; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Default; diff --git a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Trigger.java b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Trigger.java index 903c722e15fa1..1bc383d9fdde0 100644 --- a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Trigger.java +++ b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/api/Trigger.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.api; +package io.quarkus.scheduler.api; import java.time.Instant; diff --git a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/graal/QuartzSubstitutions.java b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/graal/QuartzSubstitutions.java index 017cedd502e1e..fa10b5509f7d1 100644 --- a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/graal/QuartzSubstitutions.java +++ b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/graal/QuartzSubstitutions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.scheduler.graal; +package io.quarkus.scheduler.graal; import java.rmi.RemoteException; diff --git a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/QuartzScheduler.java b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/QuartzScheduler.java index c7961404b8f1b..2073e60c210bb 100644 --- a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/QuartzScheduler.java +++ b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/QuartzScheduler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.runtime; +package io.quarkus.scheduler.runtime; import java.time.Duration; import java.time.Instant; @@ -35,11 +35,11 @@ import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger; -import org.jboss.shamrock.runtime.StartupEvent; -import org.jboss.shamrock.scheduler.api.Scheduled; -import org.jboss.shamrock.scheduler.api.ScheduledExecution; -import org.jboss.shamrock.scheduler.api.Scheduler; -import org.jboss.shamrock.scheduler.api.Trigger; +import io.quarkus.runtime.StartupEvent; +import io.quarkus.scheduler.api.Scheduled; +import io.quarkus.scheduler.api.ScheduledExecution; +import io.quarkus.scheduler.api.Scheduler; +import io.quarkus.scheduler.api.Trigger; import org.quartz.CronScheduleBuilder; import org.quartz.Job; import org.quartz.JobBuilder; @@ -126,7 +126,7 @@ void start(@Observes StartupEvent startupEvent) { if (running.compareAndSet(false, true)) { try { - // TODO: leverage shamrock config - these values are just copied from the default quartz.properties + // TODO: leverage quarkus config - these values are just copied from the default quartz.properties Properties props = new Properties(); props.put("org.quartz.scheduler.instanceName", "DefaultQuartzScheduler"); props.put("org.quartz.scheduler.rmi.export", false); diff --git a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/ScheduledInvoker.java b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/ScheduledInvoker.java index 4f16ca1b94a3a..1c00bcfa5f793 100644 --- a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/ScheduledInvoker.java +++ b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/ScheduledInvoker.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.runtime; +package io.quarkus.scheduler.runtime; -import org.jboss.shamrock.scheduler.api.ScheduledExecution; +import io.quarkus.scheduler.api.ScheduledExecution; /** * Invokes a scheduled business method of a bean. diff --git a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/SchedulerConfiguration.java b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/SchedulerConfiguration.java index 42f3d22c87f21..925db4e2158e9 100644 --- a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/SchedulerConfiguration.java +++ b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/SchedulerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.runtime; +package io.quarkus.scheduler.runtime; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -22,7 +22,7 @@ import javax.enterprise.context.ApplicationScoped; -import org.jboss.shamrock.scheduler.api.Scheduled; +import io.quarkus.scheduler.api.Scheduled; /** * diff --git a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/SchedulerDeploymentTemplate.java b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/SchedulerDeploymentTemplate.java index d7c3527b2148c..20b1be73a228d 100644 --- a/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/SchedulerDeploymentTemplate.java +++ b/extensions/scheduler/runtime/src/main/java/org/jboss/shamrock/scheduler/runtime/SchedulerDeploymentTemplate.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.scheduler.runtime; +package io.quarkus.scheduler.runtime; import java.util.List; import java.util.Map; -import org.jboss.shamrock.arc.runtime.BeanContainer; -import org.jboss.shamrock.runtime.annotations.Template; -import org.jboss.shamrock.scheduler.api.Scheduled; +import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.runtime.annotations.Template; +import io.quarkus.scheduler.api.Scheduled; /** * diff --git a/extensions/security/deployment/pom.xml b/extensions/security/deployment/pom.xml index 858ffbadbfdfe..3dfd21591a8af 100644 --- a/extensions/security/deployment/pom.xml +++ b/extensions/security/deployment/pom.xml @@ -19,38 +19,38 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-security - org.jboss.shamrock + quarkus-security + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-security-deployment - Shamrock - Security - Deployment + quarkus-security-deployment + Quarkus - Security - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-resteasy-deployment + io.quarkus + quarkus-resteasy-deployment - org.jboss.shamrock - shamrock-undertow-deployment + io.quarkus + quarkus-undertow-deployment - org.jboss.shamrock - shamrock-security-runtime + io.quarkus + quarkus-security-runtime - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal test @@ -67,8 +67,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/AuthConfigBuildItem.java b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/AuthConfigBuildItem.java index c54bbf2b23207..35c0bda68e7b5 100644 --- a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/AuthConfigBuildItem.java +++ b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/AuthConfigBuildItem.java @@ -1,9 +1,9 @@ -package org.jboss.shamrock.security; +package io.quarkus.security; import java.util.List; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.runtime.RuntimeValue; +import io.quarkus.runtime.RuntimeValue; /** * Information about an authentication mechanism to enable. This is used to call the diff --git a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/IdentityManagerBuildItem.java b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/IdentityManagerBuildItem.java index 855f825bf6f74..14bdf377829fd 100644 --- a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/IdentityManagerBuildItem.java +++ b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/IdentityManagerBuildItem.java @@ -1,11 +1,11 @@ -package org.jboss.shamrock.security; +package io.quarkus.security; import java.util.List; import io.undertow.security.idm.IdentityManager; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.runtime.RuntimeValue; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.runtime.RuntimeValue; /** * Used to identify which {@linkplain IdentityManager} to install in the deployment. Even though this is a MultiBuildItem, diff --git a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/PasswordRealmBuildItem.java b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/PasswordRealmBuildItem.java index 0c12c46677c5c..57492c4fa89b5 100644 --- a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/PasswordRealmBuildItem.java +++ b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/PasswordRealmBuildItem.java @@ -1,9 +1,9 @@ -package org.jboss.shamrock.security; +package io.quarkus.security; import java.util.List; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildProducer; /** * Marker build item indicating that a password based realm was installed. diff --git a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityDeploymentProcessor.java b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityDeploymentProcessor.java index cdc3bd62fd34d..cec0fd2ed307f 100644 --- a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityDeploymentProcessor.java +++ b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityDeploymentProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.security; +package io.quarkus.security; import java.util.ArrayList; import java.util.List; @@ -23,16 +23,16 @@ import io.undertow.security.idm.IdentityManager; import io.undertow.servlet.ServletExtension; import org.jboss.logging.Logger; -import org.jboss.shamrock.deployment.ShamrockConfig; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateResourceBuildItem; -import org.jboss.shamrock.runtime.RuntimeValue; -import org.jboss.shamrock.undertow.ServletExtensionBuildItem; +import io.quarkus.deployment.QuarkusConfig; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem; +import io.quarkus.runtime.RuntimeValue; +import io.quarkus.undertow.ServletExtensionBuildItem; import org.wildfly.security.auth.server.SecurityDomain; import org.wildfly.security.auth.server.SecurityRealm; @@ -126,18 +126,18 @@ AuthConfigBuildItem configureMPRealmConfig(SecurityTemplate template, // These are not being populated correctly by the core config Map logic for some reason, so reparse them here log.debugf("MPRealmConfig.users: %s", realmConfig.users); log.debugf("MPRealmConfig.roles: %s", realmConfig.roles); - Set userKeys = ShamrockConfig.getNames("shamrock.security.embedded.users"); + Set userKeys = QuarkusConfig.getNames("quarkus.security.embedded.users"); log.debugf("userKeys: %s", userKeys); for(String key : userKeys) { - String pass = ShamrockConfig.getString("shamrock.security.embedded.users."+key, null, false); + String pass = QuarkusConfig.getString("quarkus.security.embedded.users."+key, null, false); log.debugf("%s.pass = %s", key, pass); realmConfig.users.put(key, pass); } - Set roleKeys = ShamrockConfig.getNames("shamrock.security.embedded.roles"); + Set roleKeys = QuarkusConfig.getNames("quarkus.security.embedded.roles"); log.debugf("roleKeys: %s", roleKeys); for(String key : roleKeys) { - String roles = ShamrockConfig.getString("shamrock.security.embedded.roles."+key, null, false); + String roles = QuarkusConfig.getString("quarkus.security.embedded.roles."+key, null, false); log.debugf("%s.roles = %s", key, roles); realmConfig.roles.put(key, roles); } diff --git a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityDomainBuildItem.java b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityDomainBuildItem.java index 0f18775686999..f5c252a4adbeb 100644 --- a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityDomainBuildItem.java +++ b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityDomainBuildItem.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.security; +package io.quarkus.security; import org.jboss.builder.item.SimpleBuildItem; -import org.jboss.shamrock.runtime.RuntimeValue; +import io.quarkus.runtime.RuntimeValue; import org.wildfly.security.auth.server.SecurityDomain; /** diff --git a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityRealmBuildItem.java b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityRealmBuildItem.java index 7c382f0348863..f1207a4677d64 100644 --- a/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityRealmBuildItem.java +++ b/extensions/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityRealmBuildItem.java @@ -1,7 +1,7 @@ -package org.jboss.shamrock.security; +package io.quarkus.security; import org.jboss.builder.item.MultiBuildItem; -import org.jboss.shamrock.runtime.RuntimeValue; +import io.quarkus.runtime.RuntimeValue; import org.wildfly.security.auth.server.SecurityRealm; /** diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/BasicAuthTestCase.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/BasicAuthTestCase.java index 0bc4d14b3fcd4..a31e54c425949 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/BasicAuthTestCase.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/BasicAuthTestCase.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import static org.hamcrest.Matchers.equalTo; import io.restassured.RestAssured; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; @@ -17,7 +17,7 @@ public class BasicAuthTestCase { ParametrizedPathsResource.class, SubjectExposingResource.class }; @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuth.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuth.java index 303d3fcc779d5..f9b18972a1487 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuth.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuth.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthEmbeddedTestCase.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthEmbeddedTestCase.java index d9bf70bbbf713..ed9918539d187 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthEmbeddedTestCase.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthEmbeddedTestCase.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import io.restassured.RestAssured; import io.undertow.servlet.ServletExtension; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -20,7 +20,7 @@ public class CustomAuthEmbeddedTestCase { ParametrizedPathsResource.class, SubjectExposingResource.class }; @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthExtension.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthExtension.java index 2434489137311..feb932c28a911 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthExtension.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthExtension.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import javax.servlet.ServletContext; diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthFactory.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthFactory.java index 7594f332c77cc..4211e7d95a422 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthFactory.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthFactory.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import java.util.Map; diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthTestCase.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthTestCase.java index 5d3a8c536b072..de32be656dde1 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthTestCase.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/CustomAuthTestCase.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import io.restassured.RestAssured; import io.undertow.servlet.ServletExtension; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -12,7 +12,7 @@ public class CustomAuthTestCase { @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(TestSecureServlet.class, CustomAuth.class, CustomAuthExtension.class, CustomAuthFactory.class) diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/DebugAnnProcessor.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/DebugAnnProcessor.java index bc236cf0b6713..87bdc1b09cb15 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/DebugAnnProcessor.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/DebugAnnProcessor.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; /** * Sample main to boot the BuildAnnotationProcessor for testing/debugging the processor. @@ -7,9 +7,9 @@ public class DebugAnnProcessor { public static void main(String[] args) throws Exception { String[] compArgs = {"-proc:only", - "-processor", "org.jboss.shamrock.annotations.BuildAnnotationProcessor", - "/Users/starksm/Dev/JBoss/Protean/starksm64-protean-shamrock/security/runtime/src/main/java/org/jboss/shamrock/security/MPRealmConfig.java", - "/Users/starksm/Dev/JBoss/Protean/starksm64-protean-shamrock/security/deployment/src/main/java/org/jboss/shamrock/security/SecurityDeploymentProcessor.java"}; + "-processor", "io.quarkus.annotations.BuildAnnotationProcessor", + "/Users/starksm/Dev/JBoss/Quarkus/starksm64-quarkus/security/runtime/src/main/java/io.quarkus/security/MPRealmConfig.java", + "/Users/starksm/Dev/JBoss/Quarkus/starksm64-quarkus/security/deployment/src/main/java/io.quarkus/security/SecurityDeploymentProcessor.java"}; // Have tools.jar in classpath and then run //com.sun.tools.javac.Main.main(compArgs); } diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/ParametrizedPathsResource.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/ParametrizedPathsResource.java index e55a5e80ba8d6..2cf4de3067a44 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/ParametrizedPathsResource.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/ParametrizedPathsResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import javax.annotation.security.RolesAllowed; import javax.ws.rs.GET; diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/RolesEndpointClassLevel.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/RolesEndpointClassLevel.java index f073e01fac831..5b4e84e012427 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/RolesEndpointClassLevel.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/RolesEndpointClassLevel.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import javax.annotation.security.RolesAllowed; import javax.ws.rs.GET; diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/SecurityRealmsTestCase.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/SecurityRealmsTestCase.java index da1c5795d25b9..61237df9f8f1e 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/SecurityRealmsTestCase.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/SecurityRealmsTestCase.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import java.io.IOException; import java.io.InputStream; diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/SubjectExposingResource.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/SubjectExposingResource.java index 7c07ccd7e4554..51a5258178d1b 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/SubjectExposingResource.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/SubjectExposingResource.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import java.security.Principal; diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestApplication.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestApplication.java index 178ea5387857e..909d4ad45a662 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestApplication.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestApplication.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import javax.enterprise.context.ApplicationScoped; import javax.ws.rs.ApplicationPath; diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestCharClone.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestCharClone.java index 84d1078167790..dcf9d34f85893 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestCharClone.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestCharClone.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestSecureServlet.java b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestSecureServlet.java index 24e5b9ae5748a..886af558dc9e5 100644 --- a/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestSecureServlet.java +++ b/extensions/security/deployment/src/test/java/org/jboss/shamrock/security/test/TestSecureServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.security.test; +package io.quarkus.security.test; import java.io.IOException; diff --git a/extensions/security/deployment/src/test/resources/microprofile-config-custom-auth-embedded.properties b/extensions/security/deployment/src/test/resources/microprofile-config-custom-auth-embedded.properties index 0d312fb984457..a1ef79ae03ca7 100644 --- a/extensions/security/deployment/src/test/resources/microprofile-config-custom-auth-embedded.properties +++ b/extensions/security/deployment/src/test/resources/microprofile-config-custom-auth-embedded.properties @@ -1,14 +1,14 @@ -shamrock.security.embedded.enabled=true -shamrock.security.embedded.users.scott=jb0ss -shamrock.security.embedded.users.stuart=test -shamrock.security.embedded.users.jdoe=p4ssw0rd -shamrock.security.embedded.users.noadmin=n0Adm1n -shamrock.security.embedded.roles.scott=Admin,admin,Tester,user -shamrock.security.embedded.roles.stuart=admin,user -shamrock.security.embedded.roles.jdoe=NoRolesUser -shamrock.security.embedded.roles.noadmin=user -shamrock.security.embedded.auth-mechanism=CUSTOM +quarkus.security.embedded.enabled=true +quarkus.security.embedded.users.scott=jb0ss +quarkus.security.embedded.users.stuart=test +quarkus.security.embedded.users.jdoe=p4ssw0rd +quarkus.security.embedded.users.noadmin=n0Adm1n +quarkus.security.embedded.roles.scott=Admin,admin,Tester,user +quarkus.security.embedded.roles.stuart=admin,user +quarkus.security.embedded.roles.jdoe=NoRolesUser +quarkus.security.embedded.roles.noadmin=user +quarkus.security.embedded.auth-mechanism=CUSTOM -shamrock.log.min-level=DEBUG -shamrock.log.level=DEBUG -shamrock.log.console.level=DEBUG \ No newline at end of file +quarkus.log.min-level=DEBUG +quarkus.log.level=DEBUG +quarkus.log.console.level=DEBUG \ No newline at end of file diff --git a/extensions/security/deployment/src/test/resources/microprofile-config-custom-auth.properties b/extensions/security/deployment/src/test/resources/microprofile-config-custom-auth.properties index 5c2e23a6b9c8b..39faac7315ec1 100644 --- a/extensions/security/deployment/src/test/resources/microprofile-config-custom-auth.properties +++ b/extensions/security/deployment/src/test/resources/microprofile-config-custom-auth.properties @@ -1,8 +1,8 @@ -shamrock.security.file.enabled=true -shamrock.security.file.users=test-users.properties -shamrock.security.file.roles=test-roles.properties -shamrock.security.file.auth-mechanism=CUSTOM +quarkus.security.file.enabled=true +quarkus.security.file.users=test-users.properties +quarkus.security.file.roles=test-roles.properties +quarkus.security.file.auth-mechanism=CUSTOM -shamrock.log.min-level=DEBUG -shamrock.log.level=DEBUG -shamrock.log.console.level=DEBUG \ No newline at end of file +quarkus.log.min-level=DEBUG +quarkus.log.level=DEBUG +quarkus.log.console.level=DEBUG \ No newline at end of file diff --git a/extensions/security/deployment/src/test/resources/microprofile-config.properties b/extensions/security/deployment/src/test/resources/microprofile-config.properties index 0eb6dfbb2aff2..30d907bf4c91b 100644 --- a/extensions/security/deployment/src/test/resources/microprofile-config.properties +++ b/extensions/security/deployment/src/test/resources/microprofile-config.properties @@ -1,3 +1,3 @@ -shamrock.security.file.enabled=true -shamrock.security.file.users=test-users.properties -shamrock.security.file.roles=test-roles.properties +quarkus.security.file.enabled=true +quarkus.security.file.users=test-users.properties +quarkus.security.file.roles=test-roles.properties diff --git a/extensions/security/pom.xml b/extensions/security/pom.xml index c20448eadf36b..5f4a8e61ddfb2 100644 --- a/extensions/security/pom.xml +++ b/extensions/security/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-security - Shamrock - Security + quarkus-security + Quarkus - Security pom deployment diff --git a/extensions/security/runtime/pom.xml b/extensions/security/runtime/pom.xml index 59e17823bc049..5d241c582b621 100644 --- a/extensions/security/runtime/pom.xml +++ b/extensions/security/runtime/pom.xml @@ -18,20 +18,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-security - org.jboss.shamrock + quarkus-security + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-security-runtime - Shamrock - Security - Runtime + quarkus-security-runtime + Quarkus - Security - Runtime - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime com.oracle.substratevm @@ -66,8 +66,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/AuthConfig.java b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/AuthConfig.java index 73cb0cd686df3..45902ceddaf07 100644 --- a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/AuthConfig.java +++ b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/AuthConfig.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security; +package io.quarkus.security; import org.eclipse.microprofile.config.inject.ConfigProperty; @@ -16,7 +16,7 @@ public class AuthConfig { /** * The authentication mechanism */ - @ConfigProperty(name = "realmName", defaultValue = "Shamrock") + @ConfigProperty(name = "realmName", defaultValue = "Quarkus") public String realmName; private Class type; diff --git a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/ElytronAccount.java b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/ElytronAccount.java index 03994c1753f6b..11a98f6670a81 100644 --- a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/ElytronAccount.java +++ b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/ElytronAccount.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.security; +package io.quarkus.security; import java.security.Principal; import java.util.HashSet; diff --git a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/ElytronIdentityManager.java b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/ElytronIdentityManager.java index 180b8e16fcb37..2041830760b18 100644 --- a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/ElytronIdentityManager.java +++ b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/ElytronIdentityManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.security; +package io.quarkus.security; import org.jboss.logging.Logger; import org.wildfly.security.auth.server.RealmUnavailableException; diff --git a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/MPRealmConfig.java b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/MPRealmConfig.java index 75650eb2d35f7..aeba36ba54478 100644 --- a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/MPRealmConfig.java +++ b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/MPRealmConfig.java @@ -1,9 +1,9 @@ -package org.jboss.shamrock.security; +package io.quarkus.security; import java.util.Map; -import org.jboss.shamrock.runtime.annotations.ConfigGroup; -import org.jboss.shamrock.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; /** * Configuration information used to populate a {@linkplain org.wildfly.security.auth.realm.SimpleMapBackedSecurityRealm} @@ -21,7 +21,7 @@ public class MPRealmConfig { /** * The authentication mechanism */ - @ConfigItem(defaultValue = "Shamrock") + @ConfigItem(defaultValue = "Quarkus") public String realmName; /** diff --git a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/PropertiesRealmConfig.java b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/PropertiesRealmConfig.java index 72353bee6e47d..d75a820f40967 100644 --- a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/PropertiesRealmConfig.java +++ b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/PropertiesRealmConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.security; +package io.quarkus.security; -import org.jboss.shamrock.runtime.annotations.ConfigGroup; -import org.jboss.shamrock.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; /** * A configuration object for a properties resource based realm configuration, {@linkplain org.wildfly.security.auth.realm.LegacyPropertiesSecurityRealm} @@ -41,7 +41,7 @@ public class PropertiesRealmConfig { /** * The authentication mechanism */ - @ConfigItem(defaultValue = "Shamrock") + @ConfigItem(defaultValue = "Quarkus") public String realmName; /** diff --git a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/SecurityConfig.java b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/SecurityConfig.java index 90e76fc36fddc..0443f6f014ec9 100644 --- a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/SecurityConfig.java +++ b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/SecurityConfig.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.security; +package io.quarkus.security; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; /** * diff --git a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/SecurityTemplate.java b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/SecurityTemplate.java index 4ec686266dddd..2362242243045 100644 --- a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/SecurityTemplate.java +++ b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/SecurityTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.security; +package io.quarkus.security; import java.net.URL; import java.security.Permission; @@ -32,8 +32,8 @@ import io.undertow.security.idm.IdentityManager; import org.jboss.logging.Logger; -import org.jboss.shamrock.runtime.RuntimeValue; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.runtime.RuntimeValue; +import io.quarkus.runtime.annotations.Template; import org.wildfly.security.WildFlyElytronProvider; import org.wildfly.security.auth.realm.LegacyPropertiesSecurityRealm; import org.wildfly.security.auth.realm.SimpleMapBackedSecurityRealm; @@ -85,7 +85,7 @@ public void loadRealm(RuntimeValue realm, PropertiesRealmConfig c URL roles = Thread.currentThread().getContextClassLoader().getResource( config.roles); log.debugf("roles: %s", roles); if(users == null && roles == null) { - String msg = String.format("No PropertiesRealmConfig users/roles settings found. Configure the shamrock.security.file.%s properties", config.help()); + String msg = String.format("No PropertiesRealmConfig users/roles settings found. Configure the quarkus.security.file.%s properties", config.help()); throw new IllegalStateException(msg); } LegacyPropertiesSecurityRealm propsRealm = (LegacyPropertiesSecurityRealm) secRealm; diff --git a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/Target_org_wildfly_security_password_interfaces_ClearPassword.java b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/Target_org_wildfly_security_password_interfaces_ClearPassword.java index 9538b1e3971e4..1600b2408c20c 100644 --- a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/Target_org_wildfly_security_password_interfaces_ClearPassword.java +++ b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/Target_org_wildfly_security_password_interfaces_ClearPassword.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security; +package io.quarkus.security; import static org.wildfly.common.Assert.checkNotNullParam; diff --git a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/Target_org_wildfly_security_password_interfaces_RawClearPassword.java b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/Target_org_wildfly_security_password_interfaces_RawClearPassword.java index ba6ffb888c76b..9d35f17479fd8 100644 --- a/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/Target_org_wildfly_security_password_interfaces_RawClearPassword.java +++ b/extensions/security/runtime/src/main/java/org/jboss/shamrock/security/Target_org_wildfly_security_password_interfaces_RawClearPassword.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.security; +package io.quarkus.security; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/smallrye-fault-tolerance/deployment/pom.xml b/extensions/smallrye-fault-tolerance/deployment/pom.xml index 2246e56d76dc8..f1a6cdf195acb 100644 --- a/extensions/smallrye-fault-tolerance/deployment/pom.xml +++ b/extensions/smallrye-fault-tolerance/deployment/pom.xml @@ -19,32 +19,32 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-fault-tolerance - org.jboss.shamrock + quarkus-smallrye-fault-tolerance + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-fault-tolerance-deployment - Shamrock - SmallRye Fault tolerance - Deployment + quarkus-smallrye-fault-tolerance-deployment + Quarkus - SmallRye Fault tolerance - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-smallrye-metrics-deployment + io.quarkus + quarkus-smallrye-metrics-deployment - org.jboss.shamrock - shamrock-smallrye-fault-tolerance-runtime + io.quarkus + quarkus-smallrye-fault-tolerance-runtime com.oracle.substratevm @@ -59,8 +59,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-fault-tolerance/deployment/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/SmallRyeFaultToleranceProcessor.java b/extensions/smallrye-fault-tolerance/deployment/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/SmallRyeFaultToleranceProcessor.java index 048223e669e1a..70d3fe0682bf5 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/SmallRyeFaultToleranceProcessor.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/SmallRyeFaultToleranceProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.faulttolerance; +package io.quarkus.smallrye.faulttolerance; import java.util.Collection; import java.util.HashSet; @@ -34,17 +34,17 @@ import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; -import org.jboss.protean.arc.processor.AnnotationsTransformer; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.arc.deployment.AnnotationsTransformerBuildItem; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateSystemPropertyBuildItem; -import org.jboss.shamrock.smallrye.faulttolerance.runtime.ShamrockFallbackHandlerProvider; -import org.jboss.shamrock.smallrye.faulttolerance.runtime.ShamrockFaultToleranceOperationProvider; +import org.jboss.quarkus.arc.processor.AnnotationsTransformer; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateSystemPropertyBuildItem; +import io.quarkus.smallrye.faulttolerance.runtime.QuarkusFallbackHandlerProvider; +import io.quarkus.smallrye.faulttolerance.runtime.QuarkusFaultToleranceOperationProvider; import com.netflix.hystrix.HystrixCircuitBreaker; @@ -126,7 +126,7 @@ public void transform(TransformationContext context) { } // Register bean classes additionalBean.produce(new AdditionalBeanBuildItem(HystrixCommandInterceptor.class, HystrixInitializer.class, DefaultHystrixConcurrencyStrategy.class, - ShamrockFaultToleranceOperationProvider.class, ShamrockFallbackHandlerProvider.class, DefaultCommandListenersProvider.class, + QuarkusFaultToleranceOperationProvider.class, QuarkusFallbackHandlerProvider.class, DefaultCommandListenersProvider.class, MetricsCollectorFactory.class)); } diff --git a/extensions/smallrye-fault-tolerance/deployment/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/substitutions/rxjava/UnsafeAccess.java b/extensions/smallrye-fault-tolerance/deployment/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/substitutions/rxjava/UnsafeAccess.java index c273236464b68..49d5a5df68078 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/substitutions/rxjava/UnsafeAccess.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/substitutions/rxjava/UnsafeAccess.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.faulttolerance.substitutions.rxjava; +package io.quarkus.smallrye.faulttolerance.substitutions.rxjava; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/smallrye-fault-tolerance/pom.xml b/extensions/smallrye-fault-tolerance/pom.xml index 72b746543889c..6e199eb5e7817 100644 --- a/extensions/smallrye-fault-tolerance/pom.xml +++ b/extensions/smallrye-fault-tolerance/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-smallrye-fault-tolerance - Shamrock - SmallRye Fault tolerance + quarkus-smallrye-fault-tolerance + Quarkus - SmallRye Fault tolerance pom diff --git a/extensions/smallrye-fault-tolerance/runtime/pom.xml b/extensions/smallrye-fault-tolerance/runtime/pom.xml index 54c73f19da707..0b1de7f55b540 100644 --- a/extensions/smallrye-fault-tolerance/runtime/pom.xml +++ b/extensions/smallrye-fault-tolerance/runtime/pom.xml @@ -19,20 +19,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-fault-tolerance - org.jboss.shamrock + quarkus-smallrye-fault-tolerance + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-fault-tolerance-runtime - Shamrock - SmallRye Fault tolerance - Runtime + quarkus-smallrye-fault-tolerance-runtime + Quarkus - SmallRye Fault tolerance - Runtime - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime io.smallrye @@ -62,8 +62,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/ShamrockFallbackHandlerProvider.java b/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/ShamrockFallbackHandlerProvider.java index 313daa4fe9b02..2a5ddfa02619a 100644 --- a/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/ShamrockFallbackHandlerProvider.java +++ b/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/ShamrockFallbackHandlerProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.faulttolerance.runtime; +package io.quarkus.smallrye.faulttolerance.runtime; import javax.annotation.Priority; import javax.enterprise.context.Dependent; @@ -33,7 +33,7 @@ @Dependent @Alternative @Priority(1) -public class ShamrockFallbackHandlerProvider implements FallbackHandlerProvider { +public class QuarkusFallbackHandlerProvider implements FallbackHandlerProvider { @Inject @Any diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/ShamrockFaultToleranceOperationProvider.java b/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/ShamrockFaultToleranceOperationProvider.java index dfa01a589fdba..2bda2efbca397 100644 --- a/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/ShamrockFaultToleranceOperationProvider.java +++ b/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/ShamrockFaultToleranceOperationProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.faulttolerance.runtime; +package io.quarkus.smallrye.faulttolerance.runtime; import java.lang.reflect.Method; @@ -28,7 +28,7 @@ @Dependent @Alternative @Priority(1) -public class ShamrockFaultToleranceOperationProvider implements FaultToleranceOperationProvider { +public class QuarkusFaultToleranceOperationProvider implements FaultToleranceOperationProvider { @Override public FaultToleranceOperation get(Class beanClass, Method method) { diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/graal/FaultToleranceSubstitutions.java b/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/graal/FaultToleranceSubstitutions.java index b6868c5d4d385..f0f3ff173ba49 100644 --- a/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/graal/FaultToleranceSubstitutions.java +++ b/extensions/smallrye-fault-tolerance/runtime/src/main/java/org/jboss/shamrock/smallrye/faulttolerance/runtime/graal/FaultToleranceSubstitutions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.faulttolerance.runtime.graal; +package io.quarkus.smallrye.faulttolerance.runtime.graal; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/extensions/smallrye-health/deployment/pom.xml b/extensions/smallrye-health/deployment/pom.xml index ddf3c1b04085a..68f1d05e06fcf 100644 --- a/extensions/smallrye-health/deployment/pom.xml +++ b/extensions/smallrye-health/deployment/pom.xml @@ -19,38 +19,38 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-health - org.jboss.shamrock + quarkus-smallrye-health + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-health-deployment - Shamrock - SmallRye Health - Deployment + quarkus-smallrye-health-deployment + Quarkus - SmallRye Health - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-undertow-deployment + io.quarkus + quarkus-undertow-deployment - org.jboss.shamrock - shamrock-smallrye-health-runtime + io.quarkus + quarkus-smallrye-health-runtime - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal test @@ -67,8 +67,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-health/deployment/src/main/java/org/jboss/shamrock/smallrye/health/SmallRyeHealthProcessor.java b/extensions/smallrye-health/deployment/src/main/java/org/jboss/shamrock/smallrye/health/SmallRyeHealthProcessor.java index 85cb512cb5912..9aadcf76dd6d0 100644 --- a/extensions/smallrye-health/deployment/src/main/java/org/jboss/shamrock/smallrye/health/SmallRyeHealthProcessor.java +++ b/extensions/smallrye-health/deployment/src/main/java/org/jboss/shamrock/smallrye/health/SmallRyeHealthProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.health; +package io.quarkus.smallrye.health; import java.io.IOException; import java.util.Set; @@ -22,20 +22,20 @@ import org.eclipse.microprofile.health.Health; import org.eclipse.microprofile.health.spi.HealthCheckResponseProvider; import org.jboss.jandex.DotName; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.arc.deployment.BeanDefiningAnnotationBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.recording.RecorderContext; -import org.jboss.shamrock.deployment.util.ServiceUtil; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; -import org.jboss.shamrock.smallrye.health.runtime.SmallRyeHealthServlet; -import org.jboss.shamrock.smallrye.health.runtime.SmallRyeHealthTemplate; -import org.jboss.shamrock.undertow.ServletBuildItem; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.recording.RecorderContext; +import io.quarkus.deployment.util.ServiceUtil; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigRoot; +import io.quarkus.smallrye.health.runtime.SmallRyeHealthServlet; +import io.quarkus.smallrye.health.runtime.SmallRyeHealthTemplate; +import io.quarkus.undertow.ServletBuildItem; import io.smallrye.health.SmallRyeHealthReporter; diff --git a/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/BasicHealthCheck.java b/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/BasicHealthCheck.java index 0a6d3b0078e3c..f727af7ab3875 100644 --- a/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/BasicHealthCheck.java +++ b/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/BasicHealthCheck.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.health.test; +package io.quarkus.smallrye.health.test; import java.util.Collections; import java.util.Map; diff --git a/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/FailingHealthCheck.java b/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/FailingHealthCheck.java index 5dd0dbff820ed..e06fd17893b07 100644 --- a/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/FailingHealthCheck.java +++ b/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/FailingHealthCheck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.health.test; +package io.quarkus.smallrye.health.test; import java.util.Collections; import java.util.Map; diff --git a/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/FailingUnitTest.java b/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/FailingUnitTest.java index 896bbe5055015..78f242e858452 100644 --- a/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/FailingUnitTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/FailingUnitTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.health.test; +package io.quarkus.smallrye.health.test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -27,7 +27,7 @@ import org.eclipse.microprofile.health.Health; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -40,7 +40,7 @@ public class FailingUnitTest { @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(FailingHealthCheck.class) diff --git a/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/HealthUnitTest.java b/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/HealthUnitTest.java index 01a9f8b36d4a6..6cb8f437bae1c 100644 --- a/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/HealthUnitTest.java +++ b/extensions/smallrye-health/deployment/src/test/java/org/jboss/shamrock/smallrye/health/test/HealthUnitTest.java @@ -1,9 +1,9 @@ -package org.jboss.shamrock.smallrye.health.test; +package io.quarkus.smallrye.health.test; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -17,7 +17,7 @@ public class HealthUnitTest { @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(BasicHealthCheck.class) diff --git a/extensions/smallrye-health/pom.xml b/extensions/smallrye-health/pom.xml index 8d1720a53294f..f8b2679c5f1dc 100644 --- a/extensions/smallrye-health/pom.xml +++ b/extensions/smallrye-health/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-smallrye-health - Shamrock - SmallRye Health + quarkus-smallrye-health + Quarkus - SmallRye Health pom diff --git a/extensions/smallrye-health/runtime/pom.xml b/extensions/smallrye-health/runtime/pom.xml index 3ca18707d2695..96d45648593c3 100644 --- a/extensions/smallrye-health/runtime/pom.xml +++ b/extensions/smallrye-health/runtime/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-health - org.jboss.shamrock + quarkus-smallrye-health + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-health-runtime - Shamrock - SmallRye Health - Runtime + quarkus-smallrye-health-runtime + Quarkus - SmallRye Health - Runtime @@ -36,12 +36,12 @@ smallrye-health - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-undertow-runtime + io.quarkus + quarkus-undertow-runtime org.glassfish @@ -63,8 +63,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-health/runtime/src/main/java/org/jboss/shamrock/smallrye/health/runtime/SmallRyeHealthServlet.java b/extensions/smallrye-health/runtime/src/main/java/org/jboss/shamrock/smallrye/health/runtime/SmallRyeHealthServlet.java index dd499a39f1414..a8b457e25d89f 100644 --- a/extensions/smallrye-health/runtime/src/main/java/org/jboss/shamrock/smallrye/health/runtime/SmallRyeHealthServlet.java +++ b/extensions/smallrye-health/runtime/src/main/java/org/jboss/shamrock/smallrye/health/runtime/SmallRyeHealthServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.health.runtime; +package io.quarkus.smallrye.health.runtime; import java.io.IOException; diff --git a/extensions/smallrye-health/runtime/src/main/java/org/jboss/shamrock/smallrye/health/runtime/SmallRyeHealthTemplate.java b/extensions/smallrye-health/runtime/src/main/java/org/jboss/shamrock/smallrye/health/runtime/SmallRyeHealthTemplate.java index e8eb02f8891ef..310e568031680 100644 --- a/extensions/smallrye-health/runtime/src/main/java/org/jboss/shamrock/smallrye/health/runtime/SmallRyeHealthTemplate.java +++ b/extensions/smallrye-health/runtime/src/main/java/org/jboss/shamrock/smallrye/health/runtime/SmallRyeHealthTemplate.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.smallrye.health.runtime; +package io.quarkus.smallrye.health.runtime; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.spi.HealthCheckResponseProvider; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.runtime.annotations.Template; @Template public class SmallRyeHealthTemplate { diff --git a/extensions/smallrye-jwt/deployment/pom.xml b/extensions/smallrye-jwt/deployment/pom.xml index 7bf65ff2eca2f..8edf63d31dfd1 100644 --- a/extensions/smallrye-jwt/deployment/pom.xml +++ b/extensions/smallrye-jwt/deployment/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-jwt - org.jboss.shamrock + quarkus-smallrye-jwt + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-jwt-deployment - Shamrock - SmallRye JWT - Deployment + quarkus-smallrye-jwt-deployment + Quarkus - SmallRye JWT - Deployment @@ -39,35 +39,35 @@ wildfly-elytron - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-undertow-deployment + io.quarkus + quarkus-undertow-deployment - org.jboss.shamrock - shamrock-security-deployment + io.quarkus + quarkus-security-deployment - org.jboss.shamrock - shamrock-smallrye-jwt-runtime + io.quarkus + quarkus-smallrye-jwt-runtime - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal test - org.jboss.shamrock - shamrock-resteasy-jsonb-runtime + io.quarkus + quarkus-resteasy-jsonb-runtime io.rest-assured @@ -89,8 +89,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-jwt/deployment/src/main/java/org/jboss/shamrock/smallrye/jwt/deployment/SmallRyeJwtProcessor.java b/extensions/smallrye-jwt/deployment/src/main/java/org/jboss/shamrock/smallrye/jwt/deployment/SmallRyeJwtProcessor.java index 7dbbb627cf426..4bee9a59b0acf 100644 --- a/extensions/smallrye-jwt/deployment/src/main/java/org/jboss/shamrock/smallrye/jwt/deployment/SmallRyeJwtProcessor.java +++ b/extensions/smallrye-jwt/deployment/src/main/java/org/jboss/shamrock/smallrye/jwt/deployment/SmallRyeJwtProcessor.java @@ -14,43 +14,43 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.jwt.deployment; +package io.quarkus.smallrye.jwt.deployment; import java.security.interfaces.RSAPublicKey; import io.undertow.security.idm.IdentityManager; import io.undertow.servlet.ServletExtension; import org.jboss.logging.Logger; -import org.jboss.shamrock.arc.deployment.BeanContainerBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.BeanContainerBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.smallrye.jwt.config.JWTAuthContextInfoProvider; -import org.jboss.shamrock.deployment.builditem.ObjectSubstitutionBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.runtime.RuntimeValue; -import org.jboss.shamrock.security.AuthConfig; -import org.jboss.shamrock.security.AuthConfigBuildItem; -import org.jboss.shamrock.security.IdentityManagerBuildItem; -import org.jboss.shamrock.security.SecurityDomainBuildItem; -import org.jboss.shamrock.security.SecurityRealmBuildItem; -import org.jboss.shamrock.smallrye.jwt.runtime.ClaimValueProducer; -import org.jboss.shamrock.smallrye.jwt.runtime.CommonJwtProducer; -import org.jboss.shamrock.smallrye.jwt.runtime.JWTAuthContextInfoGroup; -import org.jboss.shamrock.smallrye.jwt.runtime.JsonValueProducer; -import org.jboss.shamrock.smallrye.jwt.runtime.SmallRyeJwtTemplate; -import org.jboss.shamrock.smallrye.jwt.runtime.PrincipalProducer; -import org.jboss.shamrock.smallrye.jwt.runtime.RawClaimTypeProducer; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.ClaimAttributes; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.ElytronJwtCallerPrincipal; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.JWTAuthMethodExtension; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.MpJwtValidator; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.PublicKeyProxy; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.PublicKeySubstitution; -import org.jboss.shamrock.undertow.ServletExtensionBuildItem; +import io.quarkus.deployment.builditem.ObjectSubstitutionBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.runtime.RuntimeValue; +import io.quarkus.security.AuthConfig; +import io.quarkus.security.AuthConfigBuildItem; +import io.quarkus.security.IdentityManagerBuildItem; +import io.quarkus.security.SecurityDomainBuildItem; +import io.quarkus.security.SecurityRealmBuildItem; +import io.quarkus.smallrye.jwt.runtime.ClaimValueProducer; +import io.quarkus.smallrye.jwt.runtime.CommonJwtProducer; +import io.quarkus.smallrye.jwt.runtime.JWTAuthContextInfoGroup; +import io.quarkus.smallrye.jwt.runtime.JsonValueProducer; +import io.quarkus.smallrye.jwt.runtime.SmallRyeJwtTemplate; +import io.quarkus.smallrye.jwt.runtime.PrincipalProducer; +import io.quarkus.smallrye.jwt.runtime.RawClaimTypeProducer; +import io.quarkus.smallrye.jwt.runtime.auth.ClaimAttributes; +import io.quarkus.smallrye.jwt.runtime.auth.ElytronJwtCallerPrincipal; +import io.quarkus.smallrye.jwt.runtime.auth.JWTAuthMethodExtension; +import io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator; +import io.quarkus.smallrye.jwt.runtime.auth.PublicKeyProxy; +import io.quarkus.smallrye.jwt.runtime.auth.PublicKeySubstitution; +import io.quarkus.undertow.ServletExtensionBuildItem; import org.wildfly.security.auth.server.SecurityRealm; /** diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/ClaimAttributesUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/ClaimAttributesUnitTest.java index 9267d68ae410c..48615f1fe58ad 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/ClaimAttributesUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/ClaimAttributesUnitTest.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.io.InputStream; import java.util.Arrays; @@ -7,7 +7,7 @@ import javax.json.Json; import javax.json.JsonObject; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.ClaimAttributes; +import io.quarkus.smallrye.jwt.runtime.auth.ClaimAttributes; import org.jose4j.jwt.JwtClaims; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JsonValuejectionEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JsonValuejectionEndpoint.java index e817835ef1b96..0e3c5d4e21f09 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JsonValuejectionEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JsonValuejectionEndpoint.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.math.BigDecimal; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JwtAuthUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JwtAuthUnitTest.java index 926a832f31ed6..abdb7b571031c 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JwtAuthUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JwtAuthUnitTest.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.io.StringReader; import java.net.HttpURLConnection; @@ -11,7 +11,7 @@ import io.restassured.RestAssured; import io.restassured.response.Response; import org.eclipse.microprofile.jwt.Claims; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; @@ -34,7 +34,7 @@ public class JwtAuthUnitTest { private Long expClaim; @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JwtCallerPrincipalUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JwtCallerPrincipalUnitTest.java index f22119103dcb0..6b409038ae217 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JwtCallerPrincipalUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/JwtCallerPrincipalUnitTest.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.io.InputStream; import java.util.Arrays; @@ -12,7 +12,7 @@ import javax.json.JsonString; import org.eclipse.microprofile.jwt.Claims; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.ElytronJwtCallerPrincipal; +import io.quarkus.smallrye.jwt.runtime.auth.ElytronJwtCallerPrincipal; import org.jose4j.jwt.JwtClaims; import org.jose4j.jwt.consumer.InvalidJwtException; import org.junit.jupiter.api.Assertions; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PKSubUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PKSubUnitTest.java index 1c58674887c5d..d6011ec4a9290 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PKSubUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PKSubUnitTest.java @@ -1,11 +1,11 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.security.interfaces.RSAPublicKey; import io.smallrye.jwt.KeyUtils; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.PublicKeyProxy; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.PublicKeySubstitution; +import io.quarkus.smallrye.jwt.runtime.auth.PublicKeyProxy; +import io.quarkus.smallrye.jwt.runtime.auth.PublicKeySubstitution; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrimitiveInjectionEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrimitiveInjectionEndpoint.java index de15af3b85d6e..02a7df1047a23 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrimitiveInjectionEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrimitiveInjectionEndpoint.java @@ -17,7 +17,7 @@ * limitations under the License. * */ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.util.List; import java.util.Set; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrimitiveInjectionUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrimitiveInjectionUnitTest.java index 342ef15a22914..f844ff32a56f0 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrimitiveInjectionUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrimitiveInjectionUnitTest.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.io.StringReader; import java.net.HttpURLConnection; @@ -10,7 +10,7 @@ import io.restassured.RestAssured; import org.eclipse.microprofile.jwt.Claims; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; @@ -39,7 +39,7 @@ public class PrimitiveInjectionUnitTest { private Long expClaim; @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrincipalInjectionEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrincipalInjectionEndpoint.java index 91179f6a62792..5672296a53fad 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrincipalInjectionEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrincipalInjectionEndpoint.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.security.Principal; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrincipalInjectionUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrincipalInjectionUnitTest.java index 900f07773197a..7327128c070dd 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrincipalInjectionUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/PrincipalInjectionUnitTest.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.io.StringReader; import java.net.HttpURLConnection; @@ -10,7 +10,7 @@ import io.restassured.RestAssured; import org.eclipse.microprofile.jwt.Claims; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; @@ -32,7 +32,7 @@ public class PrincipalInjectionUnitTest { private Long expClaim; @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RequiredClaimsEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RequiredClaimsEndpoint.java index c7d253c6b13e2..073dc1c7d8942 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RequiredClaimsEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RequiredClaimsEndpoint.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import org.eclipse.microprofile.jwt.Claims; import org.eclipse.microprofile.jwt.JsonWebToken; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RequiredClaimsUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RequiredClaimsUnitTest.java index 3957e0828ce18..22e371ea4d1de 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RequiredClaimsUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RequiredClaimsUnitTest.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.io.StringReader; import java.net.HttpURLConnection; @@ -10,7 +10,7 @@ import io.restassured.RestAssured; import org.eclipse.microprofile.jwt.Claims; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; @@ -36,7 +36,7 @@ public class RequiredClaimsUnitTest { private Long expClaim; @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RolesAllowedUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RolesAllowedUnitTest.java index 9620357d1fb09..e075aac28f494 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RolesAllowedUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RolesAllowedUnitTest.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.io.StringReader; import java.net.HttpURLConnection; @@ -11,7 +11,7 @@ import io.restassured.RestAssured; import io.restassured.response.Response; import org.eclipse.microprofile.jwt.Claims; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; @@ -33,7 +33,7 @@ public class RolesAllowedUnitTest { private Long expClaim; @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RolesEndpoint.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RolesEndpoint.java index a5644f9e8531c..ef91e5c9b1712 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RolesEndpoint.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/RolesEndpoint.java @@ -17,7 +17,7 @@ * limitations under the License. * */ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.security.Principal; import java.util.Date; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/TokenRealmUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/TokenRealmUnitTest.java index ae53161d3127d..03f6daa59af34 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/TokenRealmUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/TokenRealmUnitTest.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import java.security.KeyPair; import java.security.KeyPairGenerator; @@ -16,7 +16,7 @@ import io.smallrye.jwt.auth.principal.JWTAuthContextInfo; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.MpJwtValidator; +import io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator; import org.junit.jupiter.api.Test; import org.wildfly.security.auth.principal.NamePrincipal; diff --git a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/TokenUtils.java b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/TokenUtils.java index d6955e265e434..908ddede55129 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/TokenUtils.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/org/jboss/shamrock/jwt/test/TokenUtils.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.jwt.test; +package io.quarkus.jwt.test; import com.nimbusds.jose.JOSEObjectType; diff --git a/extensions/smallrye-jwt/deployment/src/test/resources/microprofile-config.properties b/extensions/smallrye-jwt/deployment/src/test/resources/microprofile-config.properties index 61d429d6c0ce8..ced62eed1cea9 100644 --- a/extensions/smallrye-jwt/deployment/src/test/resources/microprofile-config.properties +++ b/extensions/smallrye-jwt/deployment/src/test/resources/microprofile-config.properties @@ -1,5 +1,5 @@ mp.jwt.verify.publickey.location=/publicKey.pem mp.jwt.verify.issuer=https://server.example.com -shamrock.jwt.auth-mechanism=MP-JWT -shamrock.jwt.enabled=true \ No newline at end of file +quarkus.jwt.auth-mechanism=MP-JWT +quarkus.jwt.enabled=true \ No newline at end of file diff --git a/extensions/smallrye-jwt/pom.xml b/extensions/smallrye-jwt/pom.xml index 5455da8a4c935..15d1c74497d82 100644 --- a/extensions/smallrye-jwt/pom.xml +++ b/extensions/smallrye-jwt/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-smallrye-jwt - Shamrock - SmallRye JWT + quarkus-smallrye-jwt + Quarkus - SmallRye JWT pom diff --git a/extensions/smallrye-jwt/runtime/pom.xml b/extensions/smallrye-jwt/runtime/pom.xml index 30a88fee01a9d..b4b244e9712bf 100644 --- a/extensions/smallrye-jwt/runtime/pom.xml +++ b/extensions/smallrye-jwt/runtime/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-jwt - org.jboss.shamrock + quarkus-smallrye-jwt + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-jwt-runtime - Shamrock - SmallRye JWT - Runtime + quarkus-smallrye-jwt-runtime + Quarkus - SmallRye JWT - Runtime @@ -36,16 +36,16 @@ smallrye-jwt - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-security-runtime + io.quarkus + quarkus-security-runtime - org.jboss.shamrock - shamrock-undertow-runtime + io.quarkus + quarkus-undertow-runtime org.glassfish @@ -71,8 +71,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/ClaimValueProducer.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/ClaimValueProducer.java index 6bc5774a81403..6cc787fe99846 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/ClaimValueProducer.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/ClaimValueProducer.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime; +package io.quarkus.smallrye.jwt.runtime; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/ClaimValueWrapper.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/ClaimValueWrapper.java index db9bbac9389ee..90c363648d981 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/ClaimValueWrapper.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/ClaimValueWrapper.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime; +package io.quarkus.smallrye.jwt.runtime; import org.eclipse.microprofile.jwt.ClaimValue; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/CommonJwtProducer.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/CommonJwtProducer.java index 86f118e9b5075..6e0ece622ff3f 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/CommonJwtProducer.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/CommonJwtProducer.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime; +package io.quarkus.smallrye.jwt.runtime; import java.lang.annotation.Annotation; import java.util.Collection; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/JWTAuthContextInfoGroup.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/JWTAuthContextInfoGroup.java index da0d4f153f921..3a77e58e99b8f 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/JWTAuthContextInfoGroup.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/JWTAuthContextInfoGroup.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.smallrye.jwt.runtime; +package io.quarkus.smallrye.jwt.runtime; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigPhase; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; /** * deployment configuration @@ -19,7 +19,7 @@ public class JWTAuthContextInfoGroup { /** * The authentication mechanism */ - @ConfigItem(defaultValue = "Shamrock-JWT") + @ConfigItem(defaultValue = "Quarkus-JWT") public String realmName; /** diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/JsonValueProducer.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/JsonValueProducer.java index f0040ace9e40e..a4fc31143c2d9 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/JsonValueProducer.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/JsonValueProducer.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime; +package io.quarkus.smallrye.jwt.runtime; import java.util.Optional; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/PrincipalProducer.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/PrincipalProducer.java index 4449bbf9f2cc2..3f6cbaa4a4bd2 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/PrincipalProducer.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/PrincipalProducer.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime; +package io.quarkus.smallrye.jwt.runtime; import javax.annotation.Priority; import javax.enterprise.context.RequestScoped; @@ -6,7 +6,7 @@ import javax.enterprise.inject.Produces; import org.eclipse.microprofile.jwt.JsonWebToken; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.JWTAccount; +import io.quarkus.smallrye.jwt.runtime.auth.JWTAccount; /** * Override the default CDI Principal bean to allow the injection of a Principal to be both a diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/RawClaimTypeProducer.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/RawClaimTypeProducer.java index 9dcf55eac299b..a8de53214a228 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/RawClaimTypeProducer.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/RawClaimTypeProducer.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime; +package io.quarkus.smallrye.jwt.runtime; import java.lang.annotation.Annotation; import java.util.Optional; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/SmallRyeJwtTemplate.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/SmallRyeJwtTemplate.java index 48a1b52a03fb9..d2d57473cca80 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/SmallRyeJwtTemplate.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/SmallRyeJwtTemplate.java @@ -1,14 +1,14 @@ -package org.jboss.shamrock.smallrye.jwt.runtime; +package io.quarkus.smallrye.jwt.runtime; import java.security.Principal; -import org.jboss.shamrock.arc.runtime.BeanContainer; -import org.jboss.shamrock.runtime.RuntimeValue; -import org.jboss.shamrock.runtime.annotations.Template; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.ElytronJwtCallerPrincipal; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.JWTAuthMethodExtension; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.JwtIdentityManager; -import org.jboss.shamrock.smallrye.jwt.runtime.auth.MpJwtValidator; +import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.runtime.RuntimeValue; +import io.quarkus.runtime.annotations.Template; +import io.quarkus.smallrye.jwt.runtime.auth.ElytronJwtCallerPrincipal; +import io.quarkus.smallrye.jwt.runtime.auth.JWTAuthMethodExtension; +import io.quarkus.smallrye.jwt.runtime.auth.JwtIdentityManager; +import io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator; import org.wildfly.security.auth.realm.token.TokenSecurityRealm; import org.wildfly.security.auth.server.SecurityDomain; import org.wildfly.security.auth.server.SecurityRealm; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/ClaimAttributes.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/ClaimAttributes.java index c485dfb4b38b1..7e830a71a1143 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/ClaimAttributes.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/ClaimAttributes.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; import java.util.Collection; import java.util.HashMap; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/ElytronJwtCallerPrincipal.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/ElytronJwtCallerPrincipal.java index 0e219cb80465b..cfdd556ea898b 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/ElytronJwtCallerPrincipal.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/ElytronJwtCallerPrincipal.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; import java.util.Collection; import java.util.HashSet; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAccount.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAccount.java index 7c1f83ee37aad..a5ad78aeb7a31 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAccount.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAccount.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; import java.security.Principal; import java.util.Set; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMechanism.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMechanism.java index 3ac8ca46f04a6..aa7220c793b19 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMechanism.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMechanism.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; import java.util.List; import java.util.Locale; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMechanismFactory.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMechanismFactory.java index dec32ae62c709..bc0ca03263396 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMechanismFactory.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMechanismFactory.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; import io.smallrye.jwt.auth.principal.JWTAuthContextInfo; import io.undertow.security.api.AuthenticationMechanism; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMethodExtension.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMethodExtension.java index 18087ae9b28d4..1cac8219f4522 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMethodExtension.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTAuthMethodExtension.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; import javax.servlet.ServletContext; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTCredential.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTCredential.java index e9048c2e79d5c..adbcb6778f2cf 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTCredential.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JWTCredential.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; import io.smallrye.jwt.auth.principal.JWTAuthContextInfo; import io.undertow.security.idm.Credential; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JwtIdentityManager.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JwtIdentityManager.java index f05785de24a69..3348b361d3dcb 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JwtIdentityManager.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/JwtIdentityManager.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; import io.smallrye.jwt.auth.principal.JWTCallerPrincipal; import io.smallrye.jwt.auth.principal.JWTCallerPrincipalFactory; @@ -7,7 +7,7 @@ import io.undertow.security.idm.Credential; import io.undertow.security.idm.IdentityManager; import org.jboss.logging.Logger; -import org.jboss.shamrock.security.ElytronAccount; +import io.quarkus.security.ElytronAccount; import org.wildfly.security.auth.server.RealmUnavailableException; import org.wildfly.security.auth.server.SecurityDomain; import org.wildfly.security.auth.server.SecurityIdentity; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/MpJwtPrincipalHandler.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/MpJwtPrincipalHandler.java index 85aa5e0795d17..09fc03f8707c8 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/MpJwtPrincipalHandler.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/MpJwtPrincipalHandler.java @@ -1,8 +1,8 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; import javax.enterprise.inject.spi.CDI; -import org.jboss.shamrock.smallrye.jwt.runtime.PrincipalProducer; +import io.quarkus.smallrye.jwt.runtime.PrincipalProducer; import io.undertow.security.idm.Account; import io.undertow.server.HttpHandler; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/MpJwtValidator.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/MpJwtValidator.java index 91b5c5c5adb9e..c29e04cde13b6 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/MpJwtValidator.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/MpJwtValidator.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; import java.util.ArrayList; import java.util.List; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/PublicKeyProxy.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/PublicKeyProxy.java index 513292cfcb7ad..4b00802040ec6 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/PublicKeyProxy.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/PublicKeyProxy.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; public class PublicKeyProxy { private byte[] content; diff --git a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/PublicKeySubstitution.java b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/PublicKeySubstitution.java index 87f8dea71dc38..b1d4fcecb8cc3 100644 --- a/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/PublicKeySubstitution.java +++ b/extensions/smallrye-jwt/runtime/src/main/java/org/jboss/shamrock/smallrye/jwt/runtime/auth/PublicKeySubstitution.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.jwt.runtime.auth; +package io.quarkus.smallrye.jwt.runtime.auth; import java.security.KeyFactory; import java.security.NoSuchAlgorithmException; @@ -6,7 +6,7 @@ import java.security.spec.InvalidKeySpecException; import java.security.spec.X509EncodedKeySpec; -import org.jboss.shamrock.runtime.ObjectSubstitution; +import io.quarkus.runtime.ObjectSubstitution; public class PublicKeySubstitution implements ObjectSubstitution { @Override diff --git a/extensions/smallrye-metrics/deployment/pom.xml b/extensions/smallrye-metrics/deployment/pom.xml index 52ac3d5b0908d..3bcd882f30e7d 100644 --- a/extensions/smallrye-metrics/deployment/pom.xml +++ b/extensions/smallrye-metrics/deployment/pom.xml @@ -19,32 +19,32 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-metrics - org.jboss.shamrock + quarkus-smallrye-metrics + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-metrics-deployment - Shamrock - SmallRye Metrics - Deployment + quarkus-smallrye-metrics-deployment + Quarkus - SmallRye Metrics - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-undertow-deployment + io.quarkus + quarkus-undertow-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-smallrye-metrics-runtime + io.quarkus + quarkus-smallrye-metrics-runtime @@ -55,8 +55,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-metrics/deployment/src/main/java/org/jboss/shamrock/smallrye/metrics/SmallRyeMetricsProcessor.java b/extensions/smallrye-metrics/deployment/src/main/java/org/jboss/shamrock/smallrye/metrics/SmallRyeMetricsProcessor.java index 37f66be81fb32..71548e3645f00 100644 --- a/extensions/smallrye-metrics/deployment/src/main/java/org/jboss/shamrock/smallrye/metrics/SmallRyeMetricsProcessor.java +++ b/extensions/smallrye-metrics/deployment/src/main/java/org/jboss/shamrock/smallrye/metrics/SmallRyeMetricsProcessor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.metrics; +package io.quarkus.smallrye.metrics; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.RUNTIME_INIT; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.STATIC_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; import java.util.Collection; @@ -31,20 +31,20 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; import org.jboss.jandex.MethodInfo; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.arc.deployment.BeanArchiveIndexBuildItem; -import org.jboss.shamrock.arc.deployment.BeanContainerBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.ShutdownContextBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; -import org.jboss.shamrock.smallrye.metrics.runtime.SmallRyeMetricsTemplate; -import org.jboss.shamrock.smallrye.metrics.runtime.SmallRyeMetricsServlet; -import org.jboss.shamrock.undertow.ServletBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem; +import io.quarkus.arc.deployment.BeanContainerBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.ShutdownContextBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigRoot; +import io.quarkus.smallrye.metrics.runtime.SmallRyeMetricsTemplate; +import io.quarkus.smallrye.metrics.runtime.SmallRyeMetricsServlet; +import io.quarkus.undertow.ServletBuildItem; import io.smallrye.metrics.MetricProducer; import io.smallrye.metrics.MetricRegistries; diff --git a/extensions/smallrye-metrics/pom.xml b/extensions/smallrye-metrics/pom.xml index 2ed37cdd4bd97..15d7daa01332c 100644 --- a/extensions/smallrye-metrics/pom.xml +++ b/extensions/smallrye-metrics/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-smallrye-metrics - Shamrock - SmallRye Metrics + quarkus-smallrye-metrics + Quarkus - SmallRye Metrics pom deployment diff --git a/extensions/smallrye-metrics/runtime/pom.xml b/extensions/smallrye-metrics/runtime/pom.xml index 6d651319b3b8b..51c037cb98a4c 100644 --- a/extensions/smallrye-metrics/runtime/pom.xml +++ b/extensions/smallrye-metrics/runtime/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-metrics - org.jboss.shamrock + quarkus-smallrye-metrics + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-metrics-runtime - Shamrock - SmallRye Metrics - Runtime + quarkus-smallrye-metrics-runtime + Quarkus - SmallRye Metrics - Runtime @@ -36,16 +36,16 @@ smallrye-metrics - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-undertow-runtime + io.quarkus + quarkus-undertow-runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime org.glassfish @@ -67,8 +67,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/LambdaCounter.java b/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/LambdaCounter.java index e8d6775dbb2e1..55b32582dace8 100644 --- a/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/LambdaCounter.java +++ b/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/LambdaCounter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.metrics.runtime; +package io.quarkus.smallrye.metrics.runtime; import java.util.concurrent.Callable; diff --git a/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/LambdaGauge.java b/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/LambdaGauge.java index 54e8da330f7ce..8a8b11c1f7ee3 100644 --- a/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/LambdaGauge.java +++ b/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/LambdaGauge.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.metrics.runtime; +package io.quarkus.smallrye.metrics.runtime; import java.util.concurrent.Callable; diff --git a/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/SmallRyeMetricsServlet.java b/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/SmallRyeMetricsServlet.java index 576caae24fb6d..3deed19d7a3bb 100644 --- a/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/SmallRyeMetricsServlet.java +++ b/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/SmallRyeMetricsServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.metrics.runtime; +package io.quarkus.smallrye.metrics.runtime; import java.io.IOException; import java.util.Collections; diff --git a/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/SmallRyeMetricsTemplate.java b/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/SmallRyeMetricsTemplate.java index c55beb5669975..7c267c57f795d 100644 --- a/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/SmallRyeMetricsTemplate.java +++ b/extensions/smallrye-metrics/runtime/src/main/java/org/jboss/shamrock/smallrye/metrics/runtime/SmallRyeMetricsTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.metrics.runtime; +package io.quarkus.smallrye.metrics.runtime; import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; @@ -27,9 +27,9 @@ import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.MetricType; import org.jboss.logging.Logger; -import org.jboss.shamrock.arc.runtime.BeanContainer; -import org.jboss.shamrock.runtime.ShutdownContext; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.runtime.ShutdownContext; +import io.quarkus.runtime.annotations.Template; import io.smallrye.metrics.MetricRegistries; import io.smallrye.metrics.app.CounterImpl; @@ -37,7 +37,7 @@ @Template public class SmallRyeMetricsTemplate { - private static final Logger log = Logger.getLogger("org.jboss.shamrock.metrics"); + private static final Logger log = Logger.getLogger("io.quarkus.metrics"); private static final String MEMORY_HEAP_USAGE = "memory.heap.usage"; private static final String MEMORY_NON_HEAP_USAGE = "memory.nonHeap.usage"; private static final String THREAD_COUNT = "thread.count"; diff --git a/extensions/smallrye-openapi/deployment/pom.xml b/extensions/smallrye-openapi/deployment/pom.xml index 0b6de96b18048..4cef14d2d08fd 100644 --- a/extensions/smallrye-openapi/deployment/pom.xml +++ b/extensions/smallrye-openapi/deployment/pom.xml @@ -19,36 +19,36 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-openapi - org.jboss.shamrock + quarkus-smallrye-openapi + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-openapi-deployment - Shamrock - SmallRye OpenAPI - Deployment + quarkus-smallrye-openapi-deployment + Quarkus - SmallRye OpenAPI - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-undertow-deployment + io.quarkus + quarkus-undertow-deployment - org.jboss.shamrock - shamrock-resteasy-deployment + io.quarkus + quarkus-resteasy-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-smallrye-openapi-runtime + io.quarkus + quarkus-smallrye-openapi-runtime @@ -59,8 +59,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-openapi/deployment/src/main/java/org/jboss/shamrock/smallrye/openapi/RESTEasyExtension.java b/extensions/smallrye-openapi/deployment/src/main/java/org/jboss/shamrock/smallrye/openapi/RESTEasyExtension.java index e8bbc901d1dfb..0f7e1310a48e4 100644 --- a/extensions/smallrye-openapi/deployment/src/main/java/org/jboss/shamrock/smallrye/openapi/RESTEasyExtension.java +++ b/extensions/smallrye-openapi/deployment/src/main/java/org/jboss/shamrock/smallrye/openapi/RESTEasyExtension.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.openapi; +package io.quarkus.smallrye.openapi; import java.io.IOException; import java.util.ArrayList; @@ -14,8 +14,8 @@ import org.jboss.jandex.MethodParameterInfo; import org.jboss.jandex.ParameterizedType; import org.jboss.jandex.Type; -import org.jboss.shamrock.deployment.util.ServiceUtil; -import org.jboss.shamrock.resteasy.ResteasyJaxrsConfig; +import io.quarkus.deployment.util.ServiceUtil; +import io.quarkus.resteasy.ResteasyJaxrsConfig; import io.smallrye.openapi.api.OpenApiConstants; import io.smallrye.openapi.runtime.scanner.DefaultAnnotationScannerExtension; diff --git a/extensions/smallrye-openapi/deployment/src/main/java/org/jboss/shamrock/smallrye/openapi/SmallRyeOpenApiProcessor.java b/extensions/smallrye-openapi/deployment/src/main/java/org/jboss/shamrock/smallrye/openapi/SmallRyeOpenApiProcessor.java index c40944fb4ffb9..65e4986c647ec 100644 --- a/extensions/smallrye-openapi/deployment/src/main/java/org/jboss/shamrock/smallrye/openapi/SmallRyeOpenApiProcessor.java +++ b/extensions/smallrye-openapi/deployment/src/main/java/org/jboss/shamrock/smallrye/openapi/SmallRyeOpenApiProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.openapi; +package io.quarkus.smallrye.openapi; import java.io.IOException; import java.io.InputStream; @@ -35,24 +35,24 @@ import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.openapi.models.OpenAPI; import org.jboss.jandex.IndexView; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.arc.deployment.BeanContainerListenerBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.ApplicationArchivesBuildItem; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.HotDeploymentConfigFileBuildItem; -import org.jboss.shamrock.resteasy.ResteasyJaxrsConfig; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.runtime.annotations.ConfigRoot; -import org.jboss.shamrock.smallrye.openapi.runtime.OpenApiDocumentProducer; -import org.jboss.shamrock.smallrye.openapi.runtime.OpenApiServlet; -import org.jboss.shamrock.smallrye.openapi.runtime.SmallRyeOpenApiTemplate; -import org.jboss.shamrock.undertow.ServletBuildItem; - -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.STATIC_INIT; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.BeanContainerListenerBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.HotDeploymentConfigFileBuildItem; +import io.quarkus.resteasy.ResteasyJaxrsConfig; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigRoot; +import io.quarkus.smallrye.openapi.runtime.OpenApiDocumentProducer; +import io.quarkus.smallrye.openapi.runtime.OpenApiServlet; +import io.quarkus.smallrye.openapi.runtime.SmallRyeOpenApiTemplate; +import io.quarkus.undertow.ServletBuildItem; + +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; /** * @author Ken Finnigan diff --git a/extensions/smallrye-openapi/pom.xml b/extensions/smallrye-openapi/pom.xml index 418dcb7a24930..81191d1649f49 100644 --- a/extensions/smallrye-openapi/pom.xml +++ b/extensions/smallrye-openapi/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-smallrye-openapi - Shamrock - SmallRye OpenAPI + quarkus-smallrye-openapi + Quarkus - SmallRye OpenAPI pom deployment diff --git a/extensions/smallrye-openapi/runtime/pom.xml b/extensions/smallrye-openapi/runtime/pom.xml index b415b8decde06..41b157c814c21 100644 --- a/extensions/smallrye-openapi/runtime/pom.xml +++ b/extensions/smallrye-openapi/runtime/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-openapi - org.jboss.shamrock + quarkus-smallrye-openapi + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-openapi-runtime - Shamrock - SmallRye OpenAPI - Runtime + quarkus-smallrye-openapi-runtime + Quarkus - SmallRye OpenAPI - Runtime @@ -45,16 +45,16 @@ - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-undertow-runtime + io.quarkus + quarkus-undertow-runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime @@ -74,8 +74,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/OpenApiDocumentProducer.java b/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/OpenApiDocumentProducer.java index f73d262556526..616acf7070ca2 100644 --- a/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/OpenApiDocumentProducer.java +++ b/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/OpenApiDocumentProducer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.openapi.runtime; +package io.quarkus.smallrye.openapi.runtime; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.Dependent; diff --git a/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/OpenApiServlet.java b/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/OpenApiServlet.java index ce1829683ed93..8624ce3c2f85f 100644 --- a/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/OpenApiServlet.java +++ b/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/OpenApiServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.openapi.runtime; +package io.quarkus.smallrye.openapi.runtime; import java.io.IOException; import java.util.Map; diff --git a/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/SmallRyeOpenApiTemplate.java b/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/SmallRyeOpenApiTemplate.java index f377a5e1fe2fd..b943c66f1c977 100644 --- a/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/SmallRyeOpenApiTemplate.java +++ b/extensions/smallrye-openapi/runtime/src/main/java/org/jboss/shamrock/smallrye/openapi/runtime/SmallRyeOpenApiTemplate.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.openapi.runtime; +package io.quarkus.smallrye.openapi.runtime; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.openapi.OASFilter; import org.eclipse.microprofile.openapi.models.OpenAPI; -import org.jboss.shamrock.arc.runtime.BeanContainer; -import org.jboss.shamrock.arc.runtime.BeanContainerListener; -import org.jboss.shamrock.runtime.Shamrock; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.arc.runtime.BeanContainerListener; +import io.quarkus.runtime.Quarkus; +import io.quarkus.runtime.annotations.Template; import io.smallrye.openapi.api.OpenApiConfig; import io.smallrye.openapi.api.OpenApiConfigImpl; @@ -43,7 +43,7 @@ public void created(BeanContainer container) { Config config = ConfigProvider.getConfig(); OpenApiConfig openApiConfig = new OpenApiConfigImpl(config); - OpenAPI readerModel = OpenApiProcessor.modelFromReader(openApiConfig, Shamrock.class.getClassLoader()); + OpenAPI readerModel = OpenApiProcessor.modelFromReader(openApiConfig, Quarkus.class.getClassLoader()); OpenApiDocument document = createDocument(openApiConfig); document.modelFromAnnotations(annotationModel); @@ -64,6 +64,6 @@ private OpenApiDocument createDocument(OpenApiConfig openApiConfig) { } private OASFilter filter(OpenApiConfig openApiConfig) { - return OpenApiProcessor.getFilter(openApiConfig, Shamrock.class.getClassLoader()); + return OpenApiProcessor.getFilter(openApiConfig, Quarkus.class.getClassLoader()); } } diff --git a/extensions/smallrye-opentracing/deployment/pom.xml b/extensions/smallrye-opentracing/deployment/pom.xml index 52732195e8154..d41d89439f8ad 100644 --- a/extensions/smallrye-opentracing/deployment/pom.xml +++ b/extensions/smallrye-opentracing/deployment/pom.xml @@ -19,40 +19,40 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-opentracing - org.jboss.shamrock + quarkus-smallrye-opentracing + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-opentracing-deployment - Shamrock - SmallRye OpenTracing - Deployment + quarkus-smallrye-opentracing-deployment + Quarkus - SmallRye OpenTracing - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-resteasy-deployment + io.quarkus + quarkus-resteasy-deployment - org.jboss.shamrock - shamrock-undertow-deployment + io.quarkus + quarkus-undertow-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-smallrye-opentracing-runtime + io.quarkus + quarkus-smallrye-opentracing-runtime - org.jboss.shamrock - shamrock-jaeger-deployment + io.quarkus + quarkus-jaeger-deployment io.smallrye @@ -71,8 +71,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-opentracing/deployment/src/main/java/org/jboss/shamrock/smallrye/opentracing/SmallRyeOpenTracingProcessor.java b/extensions/smallrye-opentracing/deployment/src/main/java/org/jboss/shamrock/smallrye/opentracing/SmallRyeOpenTracingProcessor.java index 893b5283644ac..f523af0fa9843 100644 --- a/extensions/smallrye-opentracing/deployment/src/main/java/org/jboss/shamrock/smallrye/opentracing/SmallRyeOpenTracingProcessor.java +++ b/extensions/smallrye-opentracing/deployment/src/main/java/org/jboss/shamrock/smallrye/opentracing/SmallRyeOpenTracingProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.opentracing; +package io.quarkus.smallrye.opentracing; import java.lang.reflect.Method; import java.util.Arrays; @@ -23,15 +23,15 @@ import javax.enterprise.inject.spi.ObserverMethod; import javax.servlet.DispatcherType; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveMethodBuildItem; -import org.jboss.shamrock.resteasy.ResteasyJaxrsProviderBuildItem; -import org.jboss.shamrock.smallrye.opentracing.runtime.ShamrockSmallRyeTracingDynamicFeature; -import org.jboss.shamrock.smallrye.opentracing.runtime.TracerProducer; -import org.jboss.shamrock.undertow.FilterBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveMethodBuildItem; +import io.quarkus.resteasy.ResteasyJaxrsProviderBuildItem; +import io.quarkus.smallrye.opentracing.runtime.QuarkusSmallRyeTracingDynamicFeature; +import io.quarkus.smallrye.opentracing.runtime.TracerProducer; +import io.quarkus.undertow.FilterBuildItem; import io.opentracing.contrib.interceptors.OpenTracingInterceptor; import io.opentracing.contrib.jaxrs2.server.SpanFinishingFilter; @@ -56,7 +56,7 @@ void setupFilter(BuildProducer providers, feature.produce(new FeatureBuildItem(FeatureBuildItem.SMALLRYE_OPENTRACING)); - providers.produce(new ResteasyJaxrsProviderBuildItem(ShamrockSmallRyeTracingDynamicFeature.class.getName())); + providers.produce(new ResteasyJaxrsProviderBuildItem(QuarkusSmallRyeTracingDynamicFeature.class.getName())); FilterBuildItem filterInfo = new FilterBuildItem("tracingFilter", SpanFinishingFilter.class.getName()); filterInfo.setAsyncSupported(true); diff --git a/extensions/smallrye-opentracing/pom.xml b/extensions/smallrye-opentracing/pom.xml index 754e188dae77d..011d96552e49a 100644 --- a/extensions/smallrye-opentracing/pom.xml +++ b/extensions/smallrye-opentracing/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-smallrye-opentracing - Shamrock - SmallRye OpenTracing + quarkus-smallrye-opentracing + Quarkus - SmallRye OpenTracing pom deployment diff --git a/extensions/smallrye-opentracing/runtime/pom.xml b/extensions/smallrye-opentracing/runtime/pom.xml index 3b6ed3bd113d5..3bb1f0f093c25 100644 --- a/extensions/smallrye-opentracing/runtime/pom.xml +++ b/extensions/smallrye-opentracing/runtime/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-opentracing - org.jboss.shamrock + quarkus-smallrye-opentracing + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-opentracing-runtime - Shamrock - SmallRye OpenTracing - Runtime + quarkus-smallrye-opentracing-runtime + Quarkus - SmallRye OpenTracing - Runtime @@ -44,12 +44,12 @@ smallrye-opentracing - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-undertow-runtime + io.quarkus + quarkus-undertow-runtime org.glassfish @@ -89,8 +89,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/org/jboss/shamrock/smallrye/opentracing/runtime/ShamrockSmallRyeTracingDynamicFeature.java b/extensions/smallrye-opentracing/runtime/src/main/java/org/jboss/shamrock/smallrye/opentracing/runtime/ShamrockSmallRyeTracingDynamicFeature.java index b4e4c9512c41f..5bd7665674551 100644 --- a/extensions/smallrye-opentracing/runtime/src/main/java/org/jboss/shamrock/smallrye/opentracing/runtime/ShamrockSmallRyeTracingDynamicFeature.java +++ b/extensions/smallrye-opentracing/runtime/src/main/java/org/jboss/shamrock/smallrye/opentracing/runtime/ShamrockSmallRyeTracingDynamicFeature.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.opentracing.runtime; +package io.quarkus.smallrye.opentracing.runtime; import java.util.Optional; @@ -33,13 +33,13 @@ import org.eclipse.microprofile.config.ConfigProvider; @Provider -public class ShamrockSmallRyeTracingDynamicFeature implements DynamicFeature { +public class QuarkusSmallRyeTracingDynamicFeature implements DynamicFeature { private static final Logger logger = Logger.getLogger(io.smallrye.opentracing.SmallRyeTracingDynamicFeature.class.getName()); private final ServerTracingDynamicFeature delegate; - public ShamrockSmallRyeTracingDynamicFeature() { + public QuarkusSmallRyeTracingDynamicFeature() { Config config = ConfigProvider.getConfig(); Optional skipPattern = config.getOptionalValue("mp.opentracing.server.skip-pattern", String.class); Optional operationNameProvider = config.getOptionalValue("mp.opentracing.server.operation-name-provider", String.class); diff --git a/extensions/smallrye-opentracing/runtime/src/main/java/org/jboss/shamrock/smallrye/opentracing/runtime/TracerProducer.java b/extensions/smallrye-opentracing/runtime/src/main/java/org/jboss/shamrock/smallrye/opentracing/runtime/TracerProducer.java index 69105bbcb1c03..3e21e8effbb40 100644 --- a/extensions/smallrye-opentracing/runtime/src/main/java/org/jboss/shamrock/smallrye/opentracing/runtime/TracerProducer.java +++ b/extensions/smallrye-opentracing/runtime/src/main/java/org/jboss/shamrock/smallrye/opentracing/runtime/TracerProducer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.smallrye.opentracing.runtime; +package io.quarkus.smallrye.opentracing.runtime; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Produces; diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml b/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml index 74275b4b017cc..f349a3052bcda 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml @@ -5,38 +5,38 @@ 4.0.0 - org.jboss.shamrock - shamrock-smallrye-reactive-messaging-kafka + io.quarkus + quarkus-smallrye-reactive-messaging-kafka 1.0.0.Alpha1-SNAPSHOT - shamrock-smallrye-reactive-messaging-kafka-deployment + quarkus-smallrye-reactive-messaging-kafka-deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-kafka-client-deployment + io.quarkus + quarkus-kafka-client-deployment - org.jboss.shamrock - shamrock-smallrye-reactive-messaging-kafka-runtime + io.quarkus + quarkus-smallrye-reactive-messaging-kafka-runtime - org.jboss.shamrock - shamrock-vertx-deployment + io.quarkus + quarkus-vertx-deployment - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal @@ -47,8 +47,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/KafkaCodecProcessor.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/KafkaCodecProcessor.java index 8add59c3a33a6..226d2bcb0c480 100644 --- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/KafkaCodecProcessor.java +++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/KafkaCodecProcessor.java @@ -1,9 +1,9 @@ -package org.jboss.shamrock.reactivemessaging; +package io.quarkus.reactivemessaging; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; import io.vertx.kafka.client.serialization.BufferDeserializer; import io.vertx.kafka.client.serialization.BufferSerializer; diff --git a/extensions/smallrye-reactive-messaging-kafka/pom.xml b/extensions/smallrye-reactive-messaging-kafka/pom.xml index 711717e1c549c..7afa24213ed90 100644 --- a/extensions/smallrye-reactive-messaging-kafka/pom.xml +++ b/extensions/smallrye-reactive-messaging-kafka/pom.xml @@ -3,15 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-smallrye-reactive-messaging-kafka - Shamrock - SmallRye Reactive Messaging - Kafka + quarkus-smallrye-reactive-messaging-kafka + Quarkus - SmallRye Reactive Messaging - Kafka pom diff --git a/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml b/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml index 7d59ea8cc8f44..995b5399ddced 100644 --- a/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging-kafka/runtime/pom.xml @@ -5,17 +5,17 @@ 4.0.0 - org.jboss.shamrock - shamrock-smallrye-reactive-messaging-kafka + io.quarkus + quarkus-smallrye-reactive-messaging-kafka 1.0.0.Alpha1-SNAPSHOT - shamrock-smallrye-reactive-messaging-kafka-runtime + quarkus-smallrye-reactive-messaging-kafka-runtime - org.jboss.shamrock - shamrock-kafka-client-runtime + io.quarkus + quarkus-kafka-client-runtime io.smallrye.reactive @@ -78,8 +78,8 @@ - org.jboss.shamrock - shamrock-smallrye-reactive-streams-operators-runtime + io.quarkus + quarkus-smallrye-reactive-streams-operators-runtime io.smallrye.reactive @@ -108,8 +108,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-reactive-messaging/deployment/pom.xml b/extensions/smallrye-reactive-messaging/deployment/pom.xml index dc0a73d7c4dcf..a0a901aeb441f 100644 --- a/extensions/smallrye-reactive-messaging/deployment/pom.xml +++ b/extensions/smallrye-reactive-messaging/deployment/pom.xml @@ -3,35 +3,35 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-reactive-messaging - org.jboss.shamrock + quarkus-smallrye-reactive-messaging + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-reactive-messaging-deployment - Shamrock - SmallRye Reactive Messaging - Deployment + quarkus-smallrye-reactive-messaging-deployment + Quarkus - SmallRye Reactive Messaging - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-smallrye-reactive-messaging-runtime + io.quarkus + quarkus-smallrye-reactive-messaging-runtime - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal @@ -43,8 +43,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/smallrye/deployment/MediatorBuildItem.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/smallrye/deployment/MediatorBuildItem.java index 3a7a193c07bfd..2ef9b709993fc 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/smallrye/deployment/MediatorBuildItem.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/smallrye/deployment/MediatorBuildItem.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.reactivemessaging.smallrye.deployment; +package io.quarkus.reactivemessaging.smallrye.deployment; import org.jboss.builder.item.MultiBuildItem; import org.jboss.jandex.MethodInfo; -import org.jboss.protean.arc.processor.BeanInfo; +import org.jboss.quarkus.arc.processor.BeanInfo; public final class MediatorBuildItem extends MultiBuildItem { diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/smallrye/deployment/SmallRyeReactiveMessagingProcessor.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/smallrye/deployment/SmallRyeReactiveMessagingProcessor.java index 7f28176ddbcd8..9477d0a918f7a 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/smallrye/deployment/SmallRyeReactiveMessagingProcessor.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/org/jboss/shamrock/reactivemessaging/smallrye/deployment/SmallRyeReactiveMessagingProcessor.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.shamrock.reactivemessaging.smallrye.deployment; +package io.quarkus.reactivemessaging.smallrye.deployment; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.STATIC_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; import java.util.ArrayList; import java.util.Arrays; @@ -28,21 +28,21 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.MethodInfo; import org.jboss.logging.Logger; -import org.jboss.protean.arc.processor.AnnotationStore; -import org.jboss.protean.arc.processor.BeanDeploymentValidator; -import org.jboss.protean.arc.processor.BeanInfo; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.arc.deployment.BeanContainerBuildItem; -import org.jboss.shamrock.arc.deployment.BeanDeploymentValidatorBuildItem; -import org.jboss.shamrock.arc.deployment.UnremovableBeanBuildItem.BeanClassAnnotationExclusion; -import org.jboss.shamrock.arc.deployment.UnremovableBeanBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle; -import org.jboss.shamrock.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingTemplate; +import org.jboss.quarkus.arc.processor.AnnotationStore; +import org.jboss.quarkus.arc.processor.BeanDeploymentValidator; +import org.jboss.quarkus.arc.processor.BeanInfo; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.BeanContainerBuildItem; +import io.quarkus.arc.deployment.BeanDeploymentValidatorBuildItem; +import io.quarkus.arc.deployment.UnremovableBeanBuildItem.BeanClassAnnotationExclusion; +import io.quarkus.arc.deployment.UnremovableBeanBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingLifecycle; +import io.quarkus.smallrye.reactivemessaging.runtime.SmallRyeReactiveMessagingTemplate; /** * @@ -50,7 +50,7 @@ */ public class SmallRyeReactiveMessagingProcessor { - private static final Logger LOGGER = Logger.getLogger("org.jboss.shamrock.scheduler.deployment.processor"); + private static final Logger LOGGER = Logger.getLogger("io.quarkus.scheduler.deployment.processor"); static final DotName NAME_INCOMING = DotName.createSimple(Incoming.class.getName()); static final DotName NAME_OUTGOING = DotName.createSimple(Outgoing.class.getName()); diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/SimpleBean.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/SimpleBean.java index 7d8243951060a..a9022e043cc91 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/SimpleBean.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/SimpleBean.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.reactivemessaging; +package io.quarkus.smallrye.reactivemessaging; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/SimpleTest.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/SimpleTest.java index 5221d6e6475a7..5b88beb70e415 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/SimpleTest.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/SimpleTest.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.reactivemessaging; +package io.quarkus.smallrye.reactivemessaging; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -7,7 +7,7 @@ import javax.inject.Inject; -import org.jboss.shamrock.test.ShamrockUnitTest; +import io.quarkus.test.QuarkusUnitTest; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ public class SimpleTest { @RegisterExtension - static final ShamrockUnitTest config = new ShamrockUnitTest() + static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(SimpleBean.class, StreamConsumer.class)); diff --git a/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/StreamConsumer.java b/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/StreamConsumer.java index 7384c5203b085..9b8c6c43114bf 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/StreamConsumer.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/test/java/org/jboss/shamrock/smallrye/reactivemessaging/StreamConsumer.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.reactivemessaging; +package io.quarkus.smallrye.reactivemessaging; import java.util.List; diff --git a/extensions/smallrye-reactive-messaging/pom.xml b/extensions/smallrye-reactive-messaging/pom.xml index 8331e2ecb9c5a..651b413dfa76b 100644 --- a/extensions/smallrye-reactive-messaging/pom.xml +++ b/extensions/smallrye-reactive-messaging/pom.xml @@ -3,15 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-smallrye-reactive-messaging - Shamrock - SmallRye Reactive Messaging + quarkus-smallrye-reactive-messaging + Quarkus - SmallRye Reactive Messaging pom diff --git a/extensions/smallrye-reactive-messaging/runtime/pom.xml b/extensions/smallrye-reactive-messaging/runtime/pom.xml index bfb31b50e2ee3..98f449ac12d20 100644 --- a/extensions/smallrye-reactive-messaging/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging/runtime/pom.xml @@ -3,24 +3,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-reactive-messaging - org.jboss.shamrock + quarkus-smallrye-reactive-messaging + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-reactive-messaging-runtime - Shamrock - SmallRye Reactive Messaging - Runtime + quarkus-smallrye-reactive-messaging-runtime + Quarkus - SmallRye Reactive Messaging - Runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime - org.jboss.shamrock - shamrock-smallrye-reactive-streams-operators-runtime + io.quarkus + quarkus-smallrye-reactive-streams-operators-runtime io.smallrye.reactive @@ -44,8 +44,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/org/jboss/shamrock/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/org/jboss/shamrock/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java index c6a567e2a0d48..e053719fd2af5 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/org/jboss/shamrock/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/org/jboss/shamrock/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.smallrye.reactivemessaging.runtime; +package io.quarkus.smallrye.reactivemessaging.runtime; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -7,7 +7,7 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.shamrock.runtime.StartupEvent; +import io.quarkus.runtime.StartupEvent; import io.smallrye.reactive.messaging.extension.MediatorManager; diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/org/jboss/shamrock/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingTemplate.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/org/jboss/shamrock/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingTemplate.java index 2074c82668745..ba7f8908d6840 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/org/jboss/shamrock/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingTemplate.java +++ b/extensions/smallrye-reactive-messaging/runtime/src/main/java/org/jboss/shamrock/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingTemplate.java @@ -1,11 +1,11 @@ -package org.jboss.shamrock.smallrye.reactivemessaging.runtime; +package io.quarkus.smallrye.reactivemessaging.runtime; import java.util.Map; import java.util.Map.Entry; -import org.jboss.protean.arc.Arc; -import org.jboss.shamrock.arc.runtime.BeanContainer; -import org.jboss.shamrock.runtime.annotations.Template; +import org.jboss.quarkus.arc.Arc; +import io.quarkus.arc.runtime.BeanContainer; +import io.quarkus.runtime.annotations.Template; import io.smallrye.reactive.messaging.extension.MediatorManager; diff --git a/extensions/smallrye-rest-client/deployment/pom.xml b/extensions/smallrye-rest-client/deployment/pom.xml index e33feb4455f73..bd0aeb666a839 100644 --- a/extensions/smallrye-rest-client/deployment/pom.xml +++ b/extensions/smallrye-rest-client/deployment/pom.xml @@ -19,32 +19,32 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-rest-client - org.jboss.shamrock + quarkus-smallrye-rest-client + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-rest-client-deployment - Shamrock - SmallRye REST client - Deployment + quarkus-smallrye-rest-client-deployment + Quarkus - SmallRye REST client - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-resteasy-common-deployment + io.quarkus + quarkus-resteasy-common-deployment - org.jboss.shamrock - shamrock-smallrye-rest-client-runtime + io.quarkus + quarkus-smallrye-rest-client-runtime @@ -55,8 +55,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-rest-client/deployment/src/main/java/org/jboss/shamrock/smallrye/restclient/SmallRyeRestClientProcessor.java b/extensions/smallrye-rest-client/deployment/src/main/java/org/jboss/shamrock/smallrye/restclient/SmallRyeRestClientProcessor.java index 60b77db9489d7..3500ba7a6cf0c 100644 --- a/extensions/smallrye-rest-client/deployment/src/main/java/org/jboss/shamrock/smallrye/restclient/SmallRyeRestClientProcessor.java +++ b/extensions/smallrye-rest-client/deployment/src/main/java/org/jboss/shamrock/smallrye/restclient/SmallRyeRestClientProcessor.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.jboss.shamrock.smallrye.restclient; +package io.quarkus.smallrye.restclient; import io.smallrye.restclient.DefaultResponseExceptionMapper; import io.smallrye.restclient.RestClientProxy; @@ -26,32 +26,32 @@ import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; -import org.jboss.protean.arc.processor.BeanConfigurator; -import org.jboss.protean.arc.processor.BeanRegistrar; -import org.jboss.protean.arc.processor.ScopeInfo; +import org.jboss.quarkus.arc.processor.BeanConfigurator; +import org.jboss.quarkus.arc.processor.BeanRegistrar; +import org.jboss.quarkus.arc.processor.ScopeInfo; import org.jboss.protean.gizmo.MethodDescriptor; import org.jboss.protean.gizmo.ResultHandle; import org.jboss.resteasy.client.jaxrs.internal.proxy.ProxyBuilderImpl; import org.jboss.resteasy.client.jaxrs.internal.proxy.ResteasyClientProxy; import org.jboss.resteasy.core.ResteasyProviderFactoryImpl; import org.jboss.resteasy.spi.ResteasyConfiguration; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.arc.deployment.BeanRegistrarBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.ExtensionSslNativeSupportBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.SslNativeConfigBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateResourceBuildItem; -import org.jboss.shamrock.deployment.util.ServiceUtil; -import org.jboss.shamrock.smallrye.restclient.runtime.RestClientBase; -import org.jboss.shamrock.smallrye.restclient.runtime.RestClientBuilderImpl; -import org.jboss.shamrock.smallrye.restclient.runtime.SmallRyeRestClientTemplate; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.BeanRegistrarBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.SslNativeConfigBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem; +import io.quarkus.deployment.util.ServiceUtil; +import io.quarkus.smallrye.restclient.runtime.RestClientBase; +import io.quarkus.smallrye.restclient.runtime.RestClientBuilderImpl; +import io.quarkus.smallrye.restclient.runtime.SmallRyeRestClientTemplate; import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.client.ClientResponseFilter; diff --git a/extensions/smallrye-rest-client/pom.xml b/extensions/smallrye-rest-client/pom.xml index 6c3a880127f1c..70d7b0aecc04e 100644 --- a/extensions/smallrye-rest-client/pom.xml +++ b/extensions/smallrye-rest-client/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-smallrye-rest-client - Shamrock - SmallRye REST client + quarkus-smallrye-rest-client + Quarkus - SmallRye REST client pom deployment diff --git a/extensions/smallrye-rest-client/runtime/pom.xml b/extensions/smallrye-rest-client/runtime/pom.xml index c890dee0ef9c3..e2127c6c62824 100644 --- a/extensions/smallrye-rest-client/runtime/pom.xml +++ b/extensions/smallrye-rest-client/runtime/pom.xml @@ -19,28 +19,28 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-smallrye-rest-client - org.jboss.shamrock + quarkus-smallrye-rest-client + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-smallrye-rest-client-runtime - Shamrock - SmallRye REST client - Runtime + quarkus-smallrye-rest-client-runtime + Quarkus - SmallRye REST client - Runtime - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-arc-runtime + io.quarkus + quarkus-arc-runtime - org.jboss.shamrock - shamrock-resteasy-common-runtime + io.quarkus + quarkus-resteasy-common-runtime io.smallrye @@ -66,8 +66,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/BuilderResolver.java b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/BuilderResolver.java index 832c71ade63b0..688a08ce2b010 100644 --- a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/BuilderResolver.java +++ b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/BuilderResolver.java @@ -13,7 +13,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.jboss.shamrock.smallrye.restclient.runtime; +package io.quarkus.smallrye.restclient.runtime; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.spi.RestClientBuilderResolver; diff --git a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/ClientHeadersRequestFilter.java b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/ClientHeadersRequestFilter.java index 878d99487296b..8280424ac12b7 100644 --- a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/ClientHeadersRequestFilter.java +++ b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/ClientHeadersRequestFilter.java @@ -13,7 +13,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.jboss.shamrock.smallrye.restclient.runtime; +package io.quarkus.smallrye.restclient.runtime; import io.smallrye.restclient.header.ClientHeaderProvider; import io.smallrye.restclient.header.ClientHeaderProviders; diff --git a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/ProxyInvocationHandler.java b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/ProxyInvocationHandler.java index f35551b4a3d05..f73d7a8597581 100644 --- a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/ProxyInvocationHandler.java +++ b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/ProxyInvocationHandler.java @@ -13,7 +13,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.jboss.shamrock.smallrye.restclient.runtime; +package io.quarkus.smallrye.restclient.runtime; import io.smallrye.restclient.InvocationContextImpl; import io.smallrye.restclient.RestClientProxy; diff --git a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/RestClientBase.java b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/RestClientBase.java index 19ee9151f12ed..b0fc9d7c2f61d 100644 --- a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/RestClientBase.java +++ b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/RestClientBase.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.jboss.shamrock.smallrye.restclient.runtime; +package io.quarkus.smallrye.restclient.runtime; import java.net.MalformedURLException; import java.net.URL; @@ -45,7 +45,7 @@ public Object create() { throw new IllegalArgumentException("The value of URL was invalid " + baseUrl); } catch (Exception e) { if ("com.oracle.svm.core.jdk.UnsupportedFeatureError".equals(e.getClass().getCanonicalName())) { - throw new IllegalArgumentException(baseUrl + " requires SSL support but it is disabled. You probably have set shamrock.ssl.native to false."); + throw new IllegalArgumentException(baseUrl + " requires SSL support but it is disabled. You probably have set quarkus.ssl.native to false."); } throw e; } diff --git a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/RestClientBuilderImpl.java b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/RestClientBuilderImpl.java index e5ef3b87de0d5..bb52730f6a5f6 100644 --- a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/RestClientBuilderImpl.java +++ b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/RestClientBuilderImpl.java @@ -13,7 +13,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.jboss.shamrock.smallrye.restclient.runtime; +package io.quarkus.smallrye.restclient.runtime; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; diff --git a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/SmallRyeRestClientTemplate.java b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/SmallRyeRestClientTemplate.java index 9aca2a059f787..a986189bfa0ea 100644 --- a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/SmallRyeRestClientTemplate.java +++ b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/SmallRyeRestClientTemplate.java @@ -14,10 +14,10 @@ * permissions and limitations under the License. */ -package org.jboss.shamrock.smallrye.restclient.runtime; +package io.quarkus.smallrye.restclient.runtime; import org.eclipse.microprofile.rest.client.spi.RestClientBuilderResolver; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.runtime.annotations.Template; /** * @author Ken Finnigan diff --git a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/graal/ClientBuilderReplacement.java b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/graal/ClientBuilderReplacement.java index c2c55d6af6293..8793799758294 100644 --- a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/graal/ClientBuilderReplacement.java +++ b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/graal/ClientBuilderReplacement.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.jboss.shamrock.smallrye.restclient.runtime.graal; +package io.quarkus.smallrye.restclient.runtime.graal; import javax.ws.rs.client.ClientBuilder; diff --git a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/graal/ComputedHeaderValueFillerReplacement.java b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/graal/ComputedHeaderValueFillerReplacement.java index 4e60783899463..3c0905ada0dcf 100644 --- a/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/graal/ComputedHeaderValueFillerReplacement.java +++ b/extensions/smallrye-rest-client/runtime/src/main/java/org/jboss/shamrock/smallrye/restclient/runtime/graal/ComputedHeaderValueFillerReplacement.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.jboss.shamrock.smallrye.restclient.runtime.graal; +package io.quarkus.smallrye.restclient.runtime.graal; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; diff --git a/extensions/spring-di/deployment/pom.xml b/extensions/spring-di/deployment/pom.xml index efd74c945660e..ee020c59f0d1c 100644 --- a/extensions/spring-di/deployment/pom.xml +++ b/extensions/spring-di/deployment/pom.xml @@ -18,30 +18,30 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-spring-di - org.jboss.shamrock + quarkus-spring-di + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-spring-di-deployment - Shamrock - Spring - DI - Deployment + quarkus-spring-di-deployment + Quarkus - Spring - DI - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal @@ -53,8 +53,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/spring-di/deployment/src/main/java/org/jboss/shamrock/spring/deployment/SpringDIProcessor.java b/extensions/spring-di/deployment/src/main/java/org/jboss/shamrock/spring/deployment/SpringDIProcessor.java index 4ada1e610d89d..b1ed988ecc0db 100644 --- a/extensions/spring-di/deployment/src/main/java/org/jboss/shamrock/spring/deployment/SpringDIProcessor.java +++ b/extensions/spring-di/deployment/src/main/java/org/jboss/shamrock/spring/deployment/SpringDIProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.spring.deployment; +package io.quarkus.spring.deployment; import static org.jboss.jandex.AnnotationInstance.create; @@ -31,13 +31,13 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.FieldInfo; import org.jboss.jandex.MethodInfo; -import org.jboss.protean.arc.processor.AnnotationsTransformer; -import org.jboss.protean.arc.processor.DotNames; -import org.jboss.protean.arc.processor.ScopeInfo; -import org.jboss.protean.arc.processor.Transformation; -import org.jboss.shamrock.arc.deployment.AnnotationsTransformerBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; +import org.jboss.quarkus.arc.processor.AnnotationsTransformer; +import org.jboss.quarkus.arc.processor.DotNames; +import org.jboss.quarkus.arc.processor.ScopeInfo; +import org.jboss.quarkus.arc.processor.Transformation; +import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; /* * A simple processor that maps annotations Spring DI annotation to CDI annotation diff --git a/extensions/spring-di/pom.xml b/extensions/spring-di/pom.xml index aec6b975b7f7b..c79883f7b7206 100644 --- a/extensions/spring-di/pom.xml +++ b/extensions/spring-di/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-spring-di - Shamrock - Spring - DI + quarkus-spring-di + Quarkus - Spring - DI pom deployment diff --git a/extensions/undertow-websockets/deployment/pom.xml b/extensions/undertow-websockets/deployment/pom.xml index ddb2ae4ddcd85..56218ed8326ac 100644 --- a/extensions/undertow-websockets/deployment/pom.xml +++ b/extensions/undertow-websockets/deployment/pom.xml @@ -19,28 +19,28 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-undertow-websockets - org.jboss.shamrock + quarkus-undertow-websockets + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-undertow-websockets-deployment - Shamrock - Undertow - WebSockets - Deployment + quarkus-undertow-websockets-deployment + Quarkus - Undertow - WebSockets - Deployment - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-undertow-deployment + io.quarkus + quarkus-undertow-deployment - org.jboss.shamrock - shamrock-undertow-websockets-runtime + io.quarkus + quarkus-undertow-websockets-runtime @@ -51,8 +51,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/undertow-websockets/deployment/src/main/java/org/jboss/shamrock/undertow/websockets/UndertowWebsocketProcessor.java b/extensions/undertow-websockets/deployment/src/main/java/org/jboss/shamrock/undertow/websockets/UndertowWebsocketProcessor.java index 04e60752e219e..29f745bf6c2f9 100644 --- a/extensions/undertow-websockets/deployment/src/main/java/org/jboss/shamrock/undertow/websockets/UndertowWebsocketProcessor.java +++ b/extensions/undertow-websockets/deployment/src/main/java/org/jboss/shamrock/undertow/websockets/UndertowWebsocketProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow.websockets; +package io.quarkus.undertow.websockets; import java.lang.reflect.Modifier; import java.util.Collection; @@ -30,17 +30,17 @@ import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.FeatureBuildItem; -import org.jboss.shamrock.deployment.builditem.ServiceStartBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.undertow.ServletContextAttributeBuildItem; -import org.jboss.shamrock.undertow.UndertowBuildItem; -import org.jboss.shamrock.undertow.websockets.runtime.UndertowWebsocketTemplate; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.ServiceStartBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.undertow.ServletContextAttributeBuildItem; +import io.quarkus.undertow.UndertowBuildItem; +import io.quarkus.undertow.websockets.runtime.UndertowWebsocketTemplate; import io.undertow.websockets.jsr.JsrWebSocketFilter; import io.undertow.websockets.jsr.WebSocketDeploymentInfo; diff --git a/extensions/undertow-websockets/pom.xml b/extensions/undertow-websockets/pom.xml index 55fb20fc9e090..aa8c5e0cc9183 100644 --- a/extensions/undertow-websockets/pom.xml +++ b/extensions/undertow-websockets/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-build-parent - org.jboss.shamrock + quarkus-build-parent + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../../build-parent/pom.xml 4.0.0 - shamrock-undertow-websockets - Shamrock - Undertow - WebSockets + quarkus-undertow-websockets + Quarkus - Undertow - WebSockets pom deployment diff --git a/extensions/undertow-websockets/runtime/pom.xml b/extensions/undertow-websockets/runtime/pom.xml index 5ff4f03370a26..235c2d3871136 100644 --- a/extensions/undertow-websockets/runtime/pom.xml +++ b/extensions/undertow-websockets/runtime/pom.xml @@ -19,15 +19,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-undertow-websockets - org.jboss.shamrock + quarkus-undertow-websockets + io.quarkus 1.0.0.Alpha1-SNAPSHOT ../ 4.0.0 - shamrock-undertow-websockets-runtime - Shamrock - Undertow - WebSockets - Runtime + quarkus-undertow-websockets-runtime + Quarkus - Undertow - WebSockets - Runtime @@ -35,12 +35,12 @@ svm - org.jboss.shamrock - shamrock-core-runtime + io.quarkus + quarkus-core-runtime - org.jboss.shamrock - shamrock-undertow-runtime + io.quarkus + quarkus-undertow-runtime io.undertow @@ -58,8 +58,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/undertow-websockets/runtime/src/main/java/org/jboss/shamrock/undertow/websockets/runtime/UndertowWebsocketTemplate.java b/extensions/undertow-websockets/runtime/src/main/java/org/jboss/shamrock/undertow/websockets/runtime/UndertowWebsocketTemplate.java index 662df1ba9c7fe..37a1ab3f80e95 100644 --- a/extensions/undertow-websockets/runtime/src/main/java/org/jboss/shamrock/undertow/websockets/runtime/UndertowWebsocketTemplate.java +++ b/extensions/undertow-websockets/runtime/src/main/java/org/jboss/shamrock/undertow/websockets/runtime/UndertowWebsocketTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow.websockets.runtime; +package io.quarkus.undertow.websockets.runtime; import java.util.HashSet; import java.util.Set; @@ -24,8 +24,8 @@ import javax.websocket.server.ServerEndpointConfig; import org.jboss.logging.Logger; -import org.jboss.shamrock.runtime.RuntimeValue; -import org.jboss.shamrock.runtime.annotations.Template; +import io.quarkus.runtime.RuntimeValue; +import io.quarkus.runtime.annotations.Template; import io.undertow.Undertow; import io.undertow.websockets.jsr.WebSocketDeploymentInfo; diff --git a/extensions/undertow-websockets/runtime/src/main/java/org/jboss/shamrock/undertow/websockets/runtime/WorkerSupplier.java b/extensions/undertow-websockets/runtime/src/main/java/org/jboss/shamrock/undertow/websockets/runtime/WorkerSupplier.java index 9dc7f6b820d02..9aa8455dec307 100644 --- a/extensions/undertow-websockets/runtime/src/main/java/org/jboss/shamrock/undertow/websockets/runtime/WorkerSupplier.java +++ b/extensions/undertow-websockets/runtime/src/main/java/org/jboss/shamrock/undertow/websockets/runtime/WorkerSupplier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow.websockets.runtime; +package io.quarkus.undertow.websockets.runtime; import java.util.function.Supplier; diff --git a/extensions/undertow/deployment/pom.xml b/extensions/undertow/deployment/pom.xml index b2f0768f758a6..7b997b1686b8c 100644 --- a/extensions/undertow/deployment/pom.xml +++ b/extensions/undertow/deployment/pom.xml @@ -19,14 +19,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - shamrock-undertow - org.jboss.shamrock + quarkus-undertow + io.quarkus 1.0.0.Alpha1-SNAPSHOT 4.0.0 - shamrock-undertow-deployment - Shamrock - Undertow - Deployment + quarkus-undertow-deployment + Quarkus - Undertow - Deployment @@ -34,16 +34,16 @@ undertow-servlet - org.jboss.shamrock - shamrock-core-deployment + io.quarkus + quarkus-core-deployment - org.jboss.shamrock - shamrock-arc-deployment + io.quarkus + quarkus-arc-deployment - org.jboss.shamrock - shamrock-undertow-runtime + io.quarkus + quarkus-undertow-runtime org.jboss.metadata @@ -52,8 +52,8 @@ - org.jboss.shamrock - shamrock-junit5-internal + io.quarkus + quarkus-junit5-internal test @@ -70,8 +70,8 @@ - org.jboss.shamrock - shamrock-extension-processor + io.quarkus + quarkus-extension-processor ${project.version} diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/FilterBuildItem.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/FilterBuildItem.java index 6de7f076f70b7..54f3888735ec8 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/FilterBuildItem.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/FilterBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow; +package io.quarkus.undertow; import java.util.ArrayList; import java.util.List; diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/HttpHandlerWrapperBuildItem.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/HttpHandlerWrapperBuildItem.java index d494bd7034bb9..e17cd4c3d25ce 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/HttpHandlerWrapperBuildItem.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/HttpHandlerWrapperBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow; +package io.quarkus.undertow; import org.jboss.builder.item.MultiBuildItem; diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletBuildItem.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletBuildItem.java index b955cde1a327a..92b310d15d4d5 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletBuildItem.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow; +package io.quarkus.undertow; import java.util.ArrayList; import java.util.List; diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletContextAttributeBuildItem.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletContextAttributeBuildItem.java index ee2e7484d0806..2f96cec4a15d9 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletContextAttributeBuildItem.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletContextAttributeBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow; +package io.quarkus.undertow; import org.jboss.builder.item.MultiBuildItem; diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletDeploymentManagerBuildItem.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletDeploymentManagerBuildItem.java index 5104cfd34c9af..e3dedd4bcb238 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletDeploymentManagerBuildItem.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletDeploymentManagerBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow; +package io.quarkus.undertow; import org.jboss.builder.item.SimpleBuildItem; diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletExtensionBuildItem.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletExtensionBuildItem.java index b678a46495136..8eedf97b986a6 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletExtensionBuildItem.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletExtensionBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow; +package io.quarkus.undertow; import org.jboss.builder.item.MultiBuildItem; diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletInitParamBuildItem.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletInitParamBuildItem.java index 731a99eace9a5..071e5921f17cf 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletInitParamBuildItem.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/ServletInitParamBuildItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow; +package io.quarkus.undertow; import org.jboss.builder.item.MultiBuildItem; diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowArcIntegrationBuildStep.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowArcIntegrationBuildStep.java index b94b5270a205c..52f1d8519cae1 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowArcIntegrationBuildStep.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowArcIntegrationBuildStep.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow; +package io.quarkus.undertow; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.ExecutionTime; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.arc.deployment.BeanContainerBuildItem; -import org.jboss.shamrock.arc.deployment.BeanDefiningAnnotationBuildItem; -import org.jboss.shamrock.undertow.runtime.UndertowDeploymentTemplate; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.arc.deployment.BeanContainerBuildItem; +import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem; +import io.quarkus.undertow.runtime.UndertowDeploymentTemplate; public class UndertowArcIntegrationBuildStep { diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowBuildItem.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowBuildItem.java index d8b3bd7056d27..59be5ade737ed 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowBuildItem.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowBuildItem.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow; +package io.quarkus.undertow; import org.jboss.builder.item.SimpleBuildItem; -import org.jboss.shamrock.runtime.RuntimeValue; +import io.quarkus.runtime.RuntimeValue; import io.undertow.Undertow; diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowBuildStep.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowBuildStep.java index 1be2b1a94a1a1..7961b05929ec4 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowBuildStep.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowBuildStep.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow; +package io.quarkus.undertow; import static io.undertow.servlet.api.SecurityInfo.EmptyRoleSemantic.DENY; import static io.undertow.servlet.api.SecurityInfo.EmptyRoleSemantic.PERMIT; import static javax.servlet.DispatcherType.REQUEST; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.RUNTIME_INIT; -import static org.jboss.shamrock.deployment.annotations.ExecutionTime.STATIC_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT; +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; import java.io.FileInputStream; import java.io.IOException; @@ -87,35 +87,35 @@ import org.jboss.metadata.web.spec.ServletsMetaData; import org.jboss.metadata.web.spec.TransportGuaranteeType; import org.jboss.metadata.web.spec.WebMetaData; -import org.jboss.shamrock.arc.deployment.AdditionalBeanBuildItem; -import org.jboss.shamrock.arc.deployment.BeanContainerBuildItem; -import org.jboss.shamrock.deployment.annotations.BuildProducer; -import org.jboss.shamrock.deployment.annotations.BuildStep; -import org.jboss.shamrock.deployment.annotations.Record; -import org.jboss.shamrock.deployment.ApplicationArchive; -import org.jboss.shamrock.deployment.builditem.ApplicationArchivesBuildItem; -import org.jboss.shamrock.deployment.builditem.ArchiveRootBuildItem; -import org.jboss.shamrock.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.shamrock.deployment.builditem.HotDeploymentConfigFileBuildItem; -import org.jboss.shamrock.deployment.builditem.HttpServerBuildItem; -import org.jboss.shamrock.deployment.builditem.LaunchModeBuildItem; -import org.jboss.shamrock.deployment.builditem.ObjectSubstitutionBuildItem; -import org.jboss.shamrock.deployment.builditem.ServiceStartBuildItem; -import org.jboss.shamrock.deployment.builditem.ShutdownContextBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateConfigBuildItem; -import org.jboss.shamrock.deployment.builditem.substrate.SubstrateResourceBuildItem; -import org.jboss.shamrock.deployment.logging.LogCleanupFilterBuildItem; -import org.jboss.shamrock.deployment.recording.RecorderContext; -import org.jboss.shamrock.runtime.LaunchMode; -import org.jboss.shamrock.runtime.RuntimeValue; -import org.jboss.shamrock.runtime.ShutdownContext; -import org.jboss.shamrock.runtime.annotations.ConfigItem; -import org.jboss.shamrock.undertow.runtime.HttpConfig; -import org.jboss.shamrock.undertow.runtime.ServletProducer; -import org.jboss.shamrock.undertow.runtime.ServletSecurityInfoProxy; -import org.jboss.shamrock.undertow.runtime.ServletSecurityInfoSubstitution; -import org.jboss.shamrock.undertow.runtime.UndertowDeploymentTemplate; +import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.BeanContainerBuildItem; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.ApplicationArchive; +import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem; +import io.quarkus.deployment.builditem.ArchiveRootBuildItem; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.HotDeploymentConfigFileBuildItem; +import io.quarkus.deployment.builditem.HttpServerBuildItem; +import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.builditem.ObjectSubstitutionBuildItem; +import io.quarkus.deployment.builditem.ServiceStartBuildItem; +import io.quarkus.deployment.builditem.ShutdownContextBuildItem; +import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateConfigBuildItem; +import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem; +import io.quarkus.deployment.logging.LogCleanupFilterBuildItem; +import io.quarkus.deployment.recording.RecorderContext; +import io.quarkus.runtime.LaunchMode; +import io.quarkus.runtime.RuntimeValue; +import io.quarkus.runtime.ShutdownContext; +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.undertow.runtime.HttpConfig; +import io.quarkus.undertow.runtime.ServletProducer; +import io.quarkus.undertow.runtime.ServletSecurityInfoProxy; +import io.quarkus.undertow.runtime.ServletSecurityInfoSubstitution; +import io.quarkus.undertow.runtime.UndertowDeploymentTemplate; import io.undertow.Undertow; import io.undertow.servlet.api.DeploymentInfo; diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/WebMetadataBuildItem.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/WebMetadataBuildItem.java index 0fe2e84fbec2c..c25b5f540f2ec 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/WebMetadataBuildItem.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/WebMetadataBuildItem.java @@ -1,4 +1,4 @@ -package org.jboss.shamrock.undertow; +package io.quarkus.undertow; import org.jboss.builder.item.SimpleBuildItem; import org.jboss.metadata.web.spec.WebMetaData; diff --git a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/devmode/ReplacementDebugPage.java b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/devmode/ReplacementDebugPage.java index 8717e3fe223cb..4a9758e4b8c34 100644 --- a/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/devmode/ReplacementDebugPage.java +++ b/extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/devmode/ReplacementDebugPage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jboss.shamrock.undertow.devmode; +package io.quarkus.undertow.devmode; import java.io.IOException; import java.io.PrintWriter; @@ -98,7 +98,7 @@ public static void handleRequest(HttpServerExchange exchange, final Throwable ex //todo: make this good sb.append("ERROR"); sb.append(ERROR_CSS); - sb.append("
Error Restarting Shamrock
"); + sb.append("
Error Restarting Quarkus
"); writeLabel(sb, "Stack Trace", ""); sb.append("