diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml index 83370f2a9c..56e3487a40 100644 --- a/.github/workflows/quickstart_ci.yml +++ b/.github/workflows/quickstart_ci.yml @@ -1,3 +1,6 @@ +# Abstract CI for a specific quickstart +# If you are updating this please note that there are exceptions not using this: ejb-txn-remote-call + name: WildFly Quickstart CI on: @@ -37,11 +40,6 @@ on: required: false default: '"ubuntu-latest", "windows-latest"' type: string - SERVER_PROVISIONING_SERVER_HOST: - description: 'the server.host arg to be used when testing server provisioning with the mvn verify command' - required: false - default: 'http://localhost:8080' - type: string EXTRA_RUN_ARGS: description: 'optional args to be passed when running the quickstart' required: false @@ -122,7 +120,7 @@ jobs: echo "Starting provisioned server..." mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -DjbossHome=${{ inputs.DEPLOYMENT_DIR }}/target/server -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} echo "Testing provisioned server..." - mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing + mvn -fae verify -Pintegration-testing echo "Shutting down provisioned server..." mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown shell: bash @@ -136,7 +134,7 @@ jobs: echo "Starting bootable jar..." mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} echo "Testing bootable jar..." - mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing + mvn -fae verify -Pintegration-testing echo "Shutting down bootable jar..." mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown shell: bash @@ -145,7 +143,7 @@ jobs: run: | cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} - mvn -fae clean package -Popenshift + mvn -fae clean ${{ inputs.MVN_COMMAND }} -Popenshift shell: bash - name: Run after script env: @@ -229,7 +227,7 @@ jobs: echo "Starting provisioned server..." mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -DjbossHome=${{ inputs.DEPLOYMENT_DIR }}/target/server -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} echo "Testing provisioned server..." - mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae verify -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} echo "Shutting down provisioned server..." mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} shell: bash @@ -243,7 +241,7 @@ jobs: echo "Starting bootable jar..." mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} echo "Testing bootable jar..." - mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae verify -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} echo "Shutting down bootable jar..." mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} shell: bash @@ -252,7 +250,7 @@ jobs: run: | cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} - mvn -fae clean package -Popenshift -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean ${{ inputs.MVN_COMMAND }} -Popenshift -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} shell: bash - name: Run after script env: diff --git a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml index 647383eabf..203a113502 100644 --- a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml +++ b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml @@ -91,10 +91,10 @@ jobs: mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server3 -Dwildfly.port=10190 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} echo "Testing provisioned server..." cd ../client - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8080/client -Pintegration-testing + mvn -fae verify -Pintegration-testing cd ../server - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180/server -Pintegration-testing - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280/server -Pintegration-testing + mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180 -Pintegration-testing + mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280 -Pintegration-testing echo "Shutting down provisioned server..." cd ../client mvn wildfly:shutdown @@ -200,10 +200,10 @@ jobs: mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server3 -Dwildfly.port=10190 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} echo "Testing provisioned server..." cd ../client - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8080/client -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae verify -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} cd ../server - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180/server -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280/server -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180 -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280 -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} echo "Shutting down provisioned server..." cd ../client mvn wildfly:shutdown -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} diff --git a/.github/workflows/quickstart_helloworld-mutual-ssl-secured_ci.yml b/.github/workflows/quickstart_helloworld-mutual-ssl-secured_ci.yml index c04c4f947c..bf0c1a6769 100644 --- a/.github/workflows/quickstart_helloworld-mutual-ssl-secured_ci.yml +++ b/.github/workflows/quickstart_helloworld-mutual-ssl-secured_ci.yml @@ -12,6 +12,5 @@ jobs: uses: ./.github/workflows/quickstart_ci.yml with: QUICKSTART_PATH: helloworld-mutual-ssl-secured - SERVER_PROVISIONING_SERVER_HOST: https://localhost:8443/ TEST_PROVISIONED_SERVER: true TEST_OPENSHIFT: false \ No newline at end of file diff --git a/.github/workflows/quickstart_helloworld-mutual-ssl_ci.yml b/.github/workflows/quickstart_helloworld-mutual-ssl_ci.yml index b8bbca1994..e801b228d2 100644 --- a/.github/workflows/quickstart_helloworld-mutual-ssl_ci.yml +++ b/.github/workflows/quickstart_helloworld-mutual-ssl_ci.yml @@ -12,6 +12,5 @@ jobs: uses: ./.github/workflows/quickstart_ci.yml with: QUICKSTART_PATH: helloworld-mutual-ssl - SERVER_PROVISIONING_SERVER_HOST: https://localhost:8443/ TEST_PROVISIONED_SERVER: true TEST_OPENSHIFT: false \ No newline at end of file diff --git a/batch-processing/charts/helm.yaml b/batch-processing/charts/helm.yaml index 8923ae15b1..76725f9799 100644 --- a/batch-processing/charts/helm.yaml +++ b/batch-processing/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: batch-processing deploy: replicas: 1 \ No newline at end of file diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml index 18a179f0d8..7045419b84 100644 --- a/batch-processing/pom.xml +++ b/batch-processing/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -180,6 +180,8 @@ + + ${project.artifactId} @@ -206,11 +208,6 @@ h2-database:default - - ROOT.war @@ -238,11 +235,6 @@ h2-database:default - - ROOT.war @@ -252,6 +244,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/batch-processing/src/test/java/org/wildfly/quickstarts/batch/BasicRuntimeIT.java b/batch-processing/src/test/java/org/wildfly/quickstarts/batch/BasicRuntimeIT.java index d0c5928f70..6f2bdfaea8 100644 --- a/batch-processing/src/test/java/org/wildfly/quickstarts/batch/BasicRuntimeIT.java +++ b/batch-processing/src/test/java/org/wildfly/quickstarts/batch/BasicRuntimeIT.java @@ -33,7 +33,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/batch-processing"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -45,7 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/batch-processing")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/bmt/charts/helm.yaml b/bmt/charts/helm.yaml index 33f310cf75..de7dd19e21 100644 --- a/bmt/charts/helm.yaml +++ b/bmt/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: bmt deploy: replicas: 1 \ No newline at end of file diff --git a/bmt/pom.xml b/bmt/pom.xml index 5e469423ec..dcfc41d772 100644 --- a/bmt/pom.xml +++ b/bmt/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -121,6 +121,8 @@ + + ${project.artifactId} @@ -148,11 +150,6 @@ h2-database:default - - ROOT.war @@ -181,11 +178,6 @@ h2-database:default - - ROOT.war @@ -195,6 +187,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/bmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java b/bmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java index f6947bf0ea..e3c5e382bd 100644 --- a/bmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java +++ b/bmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java @@ -33,7 +33,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/bmt"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -45,7 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/BMT")) + .uri(new URI(serverHost+"/bmt/BMT")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/cmt/charts/helm.yaml b/cmt/charts/helm.yaml index a868c5f6c8..672ba19145 100644 --- a/cmt/charts/helm.yaml +++ b/cmt/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: cmt deploy: replicas: 1 \ No newline at end of file diff --git a/cmt/pom.xml b/cmt/pom.xml index ae2f7ceded..d60fd96bf6 100644 --- a/cmt/pom.xml +++ b/cmt/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 cmt @@ -125,6 +125,8 @@ + + ${project.artifactId} @@ -152,11 +154,6 @@ h2-database:default - - ROOT.war @@ -185,11 +182,6 @@ h2-database:default - - ROOT.war @@ -199,6 +191,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/cmt/src/test/java/org/jboss/as/quickstarts/cmt/CustomerIT.java b/cmt/src/test/java/org/jboss/as/quickstarts/cmt/CustomerIT.java index 9e1e11068c..9c07287120 100644 --- a/cmt/src/test/java/org/jboss/as/quickstarts/cmt/CustomerIT.java +++ b/cmt/src/test/java/org/jboss/as/quickstarts/cmt/CustomerIT.java @@ -42,8 +42,9 @@ public class CustomerIT { protected URI getHTTPEndpoint(String path) { String host = getServerHost(); if (host == null) { - host = "http://localhost:8080/cmt"; + host = "http://localhost:8080"; } + host += "/cmt"; try { return new URI(host + path); } catch (URISyntaxException ex) { diff --git a/cmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java b/cmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java index 6ca356e7b8..2f7accc448 100644 --- a/cmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java +++ b/cmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java @@ -33,7 +33,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/cmt"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -45,7 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/cmt")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/ee-security/charts/helm.yaml b/ee-security/charts/helm.yaml index 05a1427d84..4c393c54d9 100644 --- a/ee-security/charts/helm.yaml +++ b/ee-security/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: ee-security deploy: replicas: 1 \ No newline at end of file diff --git a/ee-security/pom.xml b/ee-security/pom.xml index 3887a051cc..b3efef60fa 100644 --- a/ee-security/pom.xml +++ b/ee-security/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -105,6 +105,8 @@ + + ${project.artifactId} @@ -128,11 +130,6 @@ ${version.server} - - ROOT.war @@ -166,11 +163,6 @@ ${version.server} cloud - - ROOT.war @@ -189,6 +181,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java b/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java index 9935a7b71c..ce0a7558bb 100644 --- a/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java +++ b/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java @@ -36,7 +36,7 @@ * @author Emmanuel Hugonnet (c) 2022 Red Hat, Inc. */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/ee-security"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; protected URI getHTTPEndpoint() { String host = getServerHost(); @@ -44,7 +44,7 @@ protected URI getHTTPEndpoint() { host = DEFAULT_SERVER_HOST; } try { - return new URI(host + "/secured"); + return new URI(host + "/ee-security/secured"); } catch (URISyntaxException ex) { throw new RuntimeException(ex); } diff --git a/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/BasicRuntimeIT.java b/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/BasicRuntimeIT.java index 486ccc7672..209de8839a 100644 --- a/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/BasicRuntimeIT.java +++ b/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/BasicRuntimeIT.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertEquals; public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/ejb-multi-server-app-main-web/"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -22,7 +22,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/ejb-multi-server-app-main-web")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/ejb-multi-server/pom.xml b/ejb-multi-server/pom.xml index 1e4a1bbd8f..1debdbd163 100644 --- a/ejb-multi-server/pom.xml +++ b/ejb-multi-server/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 ejb-multi-server diff --git a/ejb-remote/charts/helm.yaml b/ejb-remote/charts/helm.yaml index 3a5786ed65..d0e5fcb7e9 100644 --- a/ejb-remote/charts/helm.yaml +++ b/ejb-remote/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: ejb-remote deploy: replicas: 1 \ No newline at end of file diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml index 6e2964422f..870416839a 100644 --- a/ejb-remote/pom.xml +++ b/ejb-remote/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 ejb-remote @@ -94,6 +94,8 @@ + + ${project.artifactId} @@ -120,11 +122,6 @@ wildfly-cli - - ROOT.war @@ -152,11 +149,6 @@ cloud - - ROOT.war @@ -166,6 +158,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/BasicRuntimeIT.java b/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/BasicRuntimeIT.java index 905127a7b0..a3206e8f88 100644 --- a/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/BasicRuntimeIT.java +++ b/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/BasicRuntimeIT.java @@ -32,7 +32,7 @@ * @author emartins */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/ejb-remote"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -41,7 +41,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/ejb-remote")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/EJBRemoteIT.java b/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/EJBRemoteIT.java index bf122d607c..10b1a35702 100644 --- a/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/EJBRemoteIT.java +++ b/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/EJBRemoteIT.java @@ -40,8 +40,7 @@ private String getProviderURl() { } private String getEJBBaseJndiName() { - // the base jndi name of the EJBs depends on the deployment name, which differs for standard dist and server provisioning - return "ejb:/" + (System.getProperty("server.host") == null ? "ejb-remote" : "ROOT"); + return "ejb:/ejb-remote"; } @Test diff --git a/ejb-security-context-propagation/pom.xml b/ejb-security-context-propagation/pom.xml index a9004ac0d1..8d5d527e16 100644 --- a/ejb-security-context-propagation/pom.xml +++ b/ejb-security-context-propagation/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 ejb-security-context-propagation @@ -157,11 +157,6 @@ false - - ROOT.war diff --git a/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/BasicRuntimeIT.java b/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/BasicRuntimeIT.java index 1f87cdac82..a3f896f551 100644 --- a/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/BasicRuntimeIT.java +++ b/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/BasicRuntimeIT.java @@ -33,7 +33,7 @@ * @author emartins */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/ejb-security-context-propagation"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -45,7 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/ejb-security-context-propagation")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/SecurityContextPropagationIT.java b/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/SecurityContextPropagationIT.java index 8e6ca12bd2..9f746aa823 100644 --- a/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/SecurityContextPropagationIT.java +++ b/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/SecurityContextPropagationIT.java @@ -36,26 +36,23 @@ public class SecurityContextPropagationIT { @Test public void testSecurityContextPropagation() throws NamingException { - // we assume standard dist, where EJBs are at ejb:/ejb-security-context-propagation/, if no SERVER_HOST or server.host in env/system props - final boolean standardDist = System.getenv("SERVER_HOST") == null && System.getProperty("server.host") == null; - System.out.println("standardDist: "+standardDist); // invoke the intermediate bean using the identity configured in wildfly-config.xml - invokeIntermediateBean(standardDist); + invokeIntermediateBean(); // now lets programmatically setup an authentication context to switch users before invoking the intermediate bean AuthenticationConfiguration superUser = AuthenticationConfiguration.empty().setSaslMechanismSelector(SaslMechanismSelector.NONE.addMechanism("PLAIN")). useName("quickstartAdmin").usePassword("adminPwd1!"); final AuthenticationContext authCtx = AuthenticationContext.empty().with(MatchRule.ALL, superUser); AuthenticationContext.getContextManager().setThreadDefault(authCtx); - invokeIntermediateBean(standardDist); + invokeIntermediateBean(); } - private static void invokeIntermediateBean(boolean standardDist) throws NamingException { + private static void invokeIntermediateBean() throws NamingException { final Hashtable jndiProperties = new Hashtable<>(); jndiProperties.put(Context.INITIAL_CONTEXT_FACTORY, "org.wildfly.naming.client.WildFlyInitialContextFactory"); jndiProperties.put(Context.PROVIDER_URL, "remote+http://localhost:8080"); final Context context = new InitialContext(jndiProperties); - IntermediateEJBRemote intermediate = (IntermediateEJBRemote) context.lookup("ejb:/"+(standardDist?"ejb-security-context-propagation":"ROOT")+"/IntermediateEJB!" + IntermediateEJBRemote intermediate = (IntermediateEJBRemote) context.lookup("ejb:/ejb-security-context-propagation/IntermediateEJB!" + IntermediateEJBRemote.class.getName()); System.out.println("\n\n* * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n"); System.out.println(intermediate.makeRemoteCalls()); diff --git a/ejb-security-programmatic-auth/pom.xml b/ejb-security-programmatic-auth/pom.xml index ac7248a39b..f7a3ad9471 100644 --- a/ejb-security-programmatic-auth/pom.xml +++ b/ejb-security-programmatic-auth/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 ejb-security-programmatic-auth @@ -185,11 +185,6 @@ false - - ROOT.war diff --git a/ejb-security-programmatic-auth/src/test/java/org/jboss/as/quickstarts/ejb_security_programmatic_auth/BasicRuntimeIT.java b/ejb-security-programmatic-auth/src/test/java/org/jboss/as/quickstarts/ejb_security_programmatic_auth/BasicRuntimeIT.java index 7610eecbc5..436274e2d2 100644 --- a/ejb-security-programmatic-auth/src/test/java/org/jboss/as/quickstarts/ejb_security_programmatic_auth/BasicRuntimeIT.java +++ b/ejb-security-programmatic-auth/src/test/java/org/jboss/as/quickstarts/ejb_security_programmatic_auth/BasicRuntimeIT.java @@ -35,7 +35,7 @@ * @author emartins */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/ejb-security-programmatic-auth/"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -48,7 +48,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/ejb-security-programmatic-auth")) + .uri(new URI(serverHost+"/ejb-security-programmatic-auth/ejb-security-programmatic-auth")) .header("Authorization", "Basic " + auth) .GET() .build(); diff --git a/ejb-throws-exception/ear/pom.xml b/ejb-throws-exception/ear/pom.xml index ef38c148c9..03f1a90773 100644 --- a/ejb-throws-exception/ear/pom.xml +++ b/ejb-throws-exception/ear/pom.xml @@ -108,19 +108,6 @@ - - org.apache.maven.plugins - maven-ear-plugin - - - - ${project.groupId} - ejb-throws-exception-web - / - - - - diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml index 4a42eded77..c8a6a307e8 100644 --- a/ejb-throws-exception/pom.xml +++ b/ejb-throws-exception/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 ejb-throws-exception diff --git a/ejb-throws-exception/web/pom.xml b/ejb-throws-exception/web/pom.xml index 85adadb23b..1169bada79 100644 --- a/ejb-throws-exception/web/pom.xml +++ b/ejb-throws-exception/web/pom.xml @@ -82,4 +82,9 @@ test + + + + ${project.artifactId} + diff --git a/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java b/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java index cb89a9c178..e276e149d0 100644 --- a/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java +++ b/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java @@ -33,7 +33,7 @@ * @author emartins */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/ejb-throws-exception-web"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -42,7 +42,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/ejb-throws-exception-web")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/ejb-timer/charts/helm.yaml b/ejb-timer/charts/helm.yaml index f689d86485..48509a377b 100644 --- a/ejb-timer/charts/helm.yaml +++ b/ejb-timer/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: ejb-timer deploy: replicas: 1 \ No newline at end of file diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml index ffe92f76ac..b4a6e1a870 100644 --- a/ejb-timer/pom.xml +++ b/ejb-timer/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 ejb-timer @@ -107,6 +107,8 @@ + + ${project.artifactId} @@ -130,11 +132,6 @@ ${version.server} - - ROOT.war @@ -159,11 +156,6 @@ ${version.server} cloud - - ROOT.war @@ -173,6 +165,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/ejb-timer/src/test/java/org/jboss/as/quickstarts/ejb/timer/BasicRuntimeIT.java b/ejb-timer/src/test/java/org/jboss/as/quickstarts/ejb/timer/BasicRuntimeIT.java index 3eb5d41f9b..0728dbbda1 100644 --- a/ejb-timer/src/test/java/org/jboss/as/quickstarts/ejb/timer/BasicRuntimeIT.java +++ b/ejb-timer/src/test/java/org/jboss/as/quickstarts/ejb/timer/BasicRuntimeIT.java @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/ejb-timer"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -37,7 +37,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/ejb-timer")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/ejb-txn-remote-call/charts/client.yaml b/ejb-txn-remote-call/charts/client.yaml index bbd2c27404..7d2a2ddeae 100644 --- a/ejb-txn-remote-call/charts/client.yaml +++ b/ejb-txn-remote-call/charts/client.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: ejb-txn-remote-call/client env: - name: MAVEN_ARGS_APPEND diff --git a/ejb-txn-remote-call/charts/server.yaml b/ejb-txn-remote-call/charts/server.yaml index 323bfc9a48..3873e45900 100644 --- a/ejb-txn-remote-call/charts/server.yaml +++ b/ejb-txn-remote-call/charts/server.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: ejb-txn-remote-call/server deploy: enabled: false diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml index e48d335c40..2b222f8555 100644 --- a/ejb-txn-remote-call/client/pom.xml +++ b/ejb-txn-remote-call/client/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -322,6 +322,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java b/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java index c812c147a6..f35c427310 100644 --- a/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java +++ b/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/client"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -45,6 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti if (serverHost == null) { serverHost = DEFAULT_SERVER_HOST; } + serverHost += "/client"; testEndpoint(serverHost, "/remote-outbound-stateless",200); testEndpoint(serverHost, "/remote-outbound-notx-stateless",200); testEndpoint(serverHost, "/direct-stateless",200); diff --git a/ejb-txn-remote-call/pom.xml b/ejb-txn-remote-call/pom.xml index 320f71d130..e9810dbc58 100644 --- a/ejb-txn-remote-call/pom.xml +++ b/ejb-txn-remote-call/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 ejb-txn-remote-call diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml index 0920ff3215..f09b63b30e 100644 --- a/ejb-txn-remote-call/server/pom.xml +++ b/ejb-txn-remote-call/server/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -269,6 +269,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java b/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java index a89b0f713f..616087da18 100644 --- a/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java +++ b/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8180/server"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8180"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -45,6 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti if (serverHost == null) { serverHost = DEFAULT_SERVER_HOST; } + serverHost += "/server"; testEndpoint(serverHost, "/commits",200); } diff --git a/ha-singleton-deployment/pom.xml b/ha-singleton-deployment/pom.xml index 841b5f0700..67f5975edd 100644 --- a/ha-singleton-deployment/pom.xml +++ b/ha-singleton-deployment/pom.xml @@ -31,7 +31,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -100,6 +100,8 @@ + + ${project.artifactId} diff --git a/ha-singleton-deployment/src/test/java/org/wildfly/quickstarts/ha/singleton/BasicRuntimeIT.java b/ha-singleton-deployment/src/test/java/org/wildfly/quickstarts/ha/singleton/BasicRuntimeIT.java index 6f85854dbb..18fec093b9 100644 --- a/ha-singleton-deployment/src/test/java/org/wildfly/quickstarts/ha/singleton/BasicRuntimeIT.java +++ b/ha-singleton-deployment/src/test/java/org/wildfly/quickstarts/ha/singleton/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/ha-singleton-deployment"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -46,7 +46,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost)) + .uri(new URI(serverHost+"/ha-singleton-deployment")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/ha-singleton-service/pom.xml b/ha-singleton-service/pom.xml index bd796eb178..795c542273 100644 --- a/ha-singleton-service/pom.xml +++ b/ha-singleton-service/pom.xml @@ -26,7 +26,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -100,6 +100,8 @@ + + ${project.artifactId} diff --git a/ha-singleton-service/src/test/java/org/jboss/as/quickstarts/ha/singleton/service/BasicRuntimeIT.java b/ha-singleton-service/src/test/java/org/jboss/as/quickstarts/ha/singleton/service/BasicRuntimeIT.java index f3602b6702..f585deacae 100644 --- a/ha-singleton-service/src/test/java/org/jboss/as/quickstarts/ha/singleton/service/BasicRuntimeIT.java +++ b/ha-singleton-service/src/test/java/org/jboss/as/quickstarts/ha/singleton/service/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/ha-singleton-service"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -46,7 +46,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost)) + .uri(new URI(serverHost+"/ha-singleton-service")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml index 7ed29da5e6..76ee9599fc 100644 --- a/helloworld-jms/pom.xml +++ b/helloworld-jms/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 helloworld-jms diff --git a/helloworld-mdb/charts/helm.yaml b/helloworld-mdb/charts/helm.yaml index 329c640787..ac3cf2bd19 100644 --- a/helloworld-mdb/charts/helm.yaml +++ b/helloworld-mdb/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: helloworld-mdb deploy: replicas: 2 \ No newline at end of file diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml index ed1d8fbc62..affcabac11 100644 --- a/helloworld-mdb/pom.xml +++ b/helloworld-mdb/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -110,6 +110,8 @@ + + ${project.artifactId} @@ -136,11 +138,6 @@ embedded-activemq - - ROOT.war @@ -168,11 +165,6 @@ embedded-activemq - - ROOT.war @@ -182,6 +174,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/helloworld-mdb/src/test/java/org/wildfly/quickstarts/mdb/BasicRuntimeIT.java b/helloworld-mdb/src/test/java/org/wildfly/quickstarts/mdb/BasicRuntimeIT.java index ae0a2cc82c..7d05041075 100644 --- a/helloworld-mdb/src/test/java/org/wildfly/quickstarts/mdb/BasicRuntimeIT.java +++ b/helloworld-mdb/src/test/java/org/wildfly/quickstarts/mdb/BasicRuntimeIT.java @@ -36,7 +36,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/helloworld-mdb"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPQueueEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -48,7 +48,7 @@ public void testHTTPQueueEndpointIsAvailable() throws IOException, InterruptedEx serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost + "/HelloWorldMDBServletClient")) + .uri(new URI(serverHost + "/helloworld-mdb/HelloWorldMDBServletClient")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() @@ -72,7 +72,7 @@ public void testHTTPTopicEndpointIsAvailable() throws IOException, InterruptedEx serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost + "/HelloWorldMDBServletClient?topic=true")) + .uri(new URI(serverHost + "/helloworld-mdb/HelloWorldMDBServletClient?topic=true")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/helloworld-mutual-ssl-secured/README-source.adoc b/helloworld-mutual-ssl-secured/README-source.adoc index 9ae0189e6c..947f98de08 100644 --- a/helloworld-mutual-ssl-secured/README-source.adoc +++ b/helloworld-mutual-ssl-secured/README-source.adoc @@ -294,7 +294,6 @@ After you are done with this quickstart, remember to remove the certificate that // Build and run sections for other environments/builds ifndef::ProductRelease,EAPXPRelease[] -:server_provisioning_server_host: https://localhost:8443 include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1] endif::[] diff --git a/helloworld-mutual-ssl-secured/pom.xml b/helloworld-mutual-ssl-secured/pom.xml index 6cd5dac07b..2aebddb13b 100644 --- a/helloworld-mutual-ssl-secured/pom.xml +++ b/helloworld-mutual-ssl-secured/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -113,6 +113,8 @@ + + ${project.artifactId} @@ -153,8 +155,6 @@ false - - ROOT.war diff --git a/helloworld-mutual-ssl-secured/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java b/helloworld-mutual-ssl-secured/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java index 693061a98d..00ecc65634 100644 --- a/helloworld-mutual-ssl-secured/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java +++ b/helloworld-mutual-ssl-secured/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java @@ -52,7 +52,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "https://localhost:8443/helloworld-mutual-ssl-secured"; + private static final String DEFAULT_SERVER_HOST = "https://localhost:8443"; private static final String DEFAULT_SERVER_DIR = System.getProperty("user.dir") + "/target/server"; @Test @@ -64,6 +64,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, URISyntaxException if (serverHost == null) { serverHost = DEFAULT_SERVER_HOST; } + serverHost += "/helloworld-mutual-ssl-secured"; String serverDir = System.getProperty("server.dir"); if (serverDir == null) { serverDir = DEFAULT_SERVER_DIR; diff --git a/helloworld-mutual-ssl/README-source.adoc b/helloworld-mutual-ssl/README-source.adoc index 4b945e0f19..0c79e73d8b 100644 --- a/helloworld-mutual-ssl/README-source.adoc +++ b/helloworld-mutual-ssl/README-source.adoc @@ -233,7 +233,6 @@ After you are done with this quickstart, remember to remove the certificate that //************************************************* // Build and run sections for other environments/builds ifndef::ProductRelease,EAPXPRelease[] -:server_provisioning_server_host: https://localhost:8443 include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1] endif::[] diff --git a/helloworld-mutual-ssl/pom.xml b/helloworld-mutual-ssl/pom.xml index 90ec2a0ed3..d031df4eb4 100644 --- a/helloworld-mutual-ssl/pom.xml +++ b/helloworld-mutual-ssl/pom.xml @@ -26,7 +26,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -114,15 +114,17 @@ - - - - org.wildfly.plugins - wildfly-maven-plugin - ${version.plugin.wildfly} - - - + + ${project.artifactId} + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.plugin.wildfly} + + + @@ -155,8 +157,6 @@ false - - ROOT.war diff --git a/helloworld-mutual-ssl/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java b/helloworld-mutual-ssl/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java index 799e7da3e2..b61c397d70 100644 --- a/helloworld-mutual-ssl/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java +++ b/helloworld-mutual-ssl/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java @@ -51,7 +51,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "https://localhost:8443/helloworld-mutual-ssl"; + private static final String DEFAULT_SERVER_HOST = "https://localhost:8443"; private static final String DEFAULT_SERVER_DIR = System.getProperty("user.dir") + "/target/server"; @Test @@ -63,6 +63,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti if (serverHost == null) { serverHost = DEFAULT_SERVER_HOST; } + serverHost += "/helloworld-mutual-ssl"; String serverDir = System.getProperty("server.dir"); if (serverDir == null) { serverDir = DEFAULT_SERVER_DIR; diff --git a/helloworld-singleton/charts/helm.yaml b/helloworld-singleton/charts/helm.yaml index 16ff7fb8c1..c3dda38fcd 100644 --- a/helloworld-singleton/charts/helm.yaml +++ b/helloworld-singleton/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: helloworld-singleton deploy: replicas: 1 \ No newline at end of file diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml index 9bed01f0db..783d950718 100644 --- a/helloworld-singleton/pom.xml +++ b/helloworld-singleton/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -93,6 +93,8 @@ + + ${project.artifactId} @@ -116,7 +118,6 @@ ${version.server} - ROOT.war @@ -141,7 +142,6 @@ ${version.server} cloud - ROOT.war @@ -151,6 +151,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/helloworld-singleton/src/test/java/org/jboss/as/quickstarts/singleton/BasicRuntimeIT.java b/helloworld-singleton/src/test/java/org/jboss/as/quickstarts/singleton/BasicRuntimeIT.java index e62d19a170..8bf0e45e43 100644 --- a/helloworld-singleton/src/test/java/org/jboss/as/quickstarts/singleton/BasicRuntimeIT.java +++ b/helloworld-singleton/src/test/java/org/jboss/as/quickstarts/singleton/BasicRuntimeIT.java @@ -32,7 +32,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/helloworld-singleton"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -44,7 +44,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/helloworld-singleton")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/helloworld-ws/charts/helm.yaml b/helloworld-ws/charts/helm.yaml index b587fd4787..86e1ccf577 100644 --- a/helloworld-ws/charts/helm.yaml +++ b/helloworld-ws/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: helloworld-ws deploy: replicas: 1 \ No newline at end of file diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml index 54dd65b0b5..c2e0919a72 100644 --- a/helloworld-ws/pom.xml +++ b/helloworld-ws/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 helloworld-ws @@ -112,6 +112,8 @@ + + ${project.artifactId} @@ -135,11 +137,6 @@ ${version.server} - - ROOT.war @@ -159,17 +156,11 @@ org.wildfly.plugins wildfly-maven-plugin - ${version.plugin.wildfly} ${version.server} cloud - - ROOT.war @@ -179,6 +170,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/helloworld/charts/helm.yaml b/helloworld/charts/helm.yaml index ce3cb0a5c2..cf70083673 100644 --- a/helloworld/charts/helm.yaml +++ b/helloworld/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: helloworld deploy: replicas: 1 \ No newline at end of file diff --git a/helloworld/pom.xml b/helloworld/pom.xml index dd68c60dba..73c003bf44 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 helloworld @@ -82,6 +82,8 @@ + + ${project.artifactId} @@ -105,11 +107,6 @@ ${version.server} - - ROOT.war @@ -134,11 +131,6 @@ ${version.server} cloud - - ROOT.war @@ -148,6 +140,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/helloworld/src/test/java/org/wildfly/quickstarts/helloworld/BasicRuntimeIT.java b/helloworld/src/test/java/org/wildfly/quickstarts/helloworld/BasicRuntimeIT.java index ba36bb0b0b..57870b6228 100644 --- a/helloworld/src/test/java/org/wildfly/quickstarts/helloworld/BasicRuntimeIT.java +++ b/helloworld/src/test/java/org/wildfly/quickstarts/helloworld/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/helloworld"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -46,7 +46,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/HelloWorld")) + .uri(new URI(serverHost+"/helloworld/HelloWorld")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/hibernate/charts/helm.yaml b/hibernate/charts/helm.yaml index 8ea3d29b40..fa78d17df7 100644 --- a/hibernate/charts/helm.yaml +++ b/hibernate/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: hibernate deploy: replicas: 1 \ No newline at end of file diff --git a/hibernate/pom.xml b/hibernate/pom.xml index 2a9273d3d6..2d413d9662 100644 --- a/hibernate/pom.xml +++ b/hibernate/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -146,6 +146,8 @@ + + ${project.artifactId} @@ -174,11 +176,6 @@ h2-database - - ROOT.war @@ -217,11 +214,6 @@ h2-database - - ROOT.war @@ -240,6 +232,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/hibernate/src/test/java/org/jboss/as/quickstart/hibernate/BasicRuntimeIT.java b/hibernate/src/test/java/org/jboss/as/quickstart/hibernate/BasicRuntimeIT.java index ead8874d7a..e28a932517 100644 --- a/hibernate/src/test/java/org/jboss/as/quickstart/hibernate/BasicRuntimeIT.java +++ b/hibernate/src/test/java/org/jboss/as/quickstart/hibernate/BasicRuntimeIT.java @@ -32,7 +32,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/hibernate"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -44,7 +44,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/hibernate")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/http-custom-mechanism/pom.xml b/http-custom-mechanism/pom.xml index ad67e46a38..7709bed401 100644 --- a/http-custom-mechanism/pom.xml +++ b/http-custom-mechanism/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 diff --git a/http-custom-mechanism/webapp/pom.xml b/http-custom-mechanism/webapp/pom.xml index 367d831d83..09830c7a4a 100644 --- a/http-custom-mechanism/webapp/pom.xml +++ b/http-custom-mechanism/webapp/pom.xml @@ -62,6 +62,11 @@ + + + ${project.artifactId} + + provisioned-server @@ -77,11 +82,6 @@ wildfly-cli - - ROOT.war diff --git a/http-custom-mechanism/webapp/src/test/java/org/jboss/as/quickstart/http_custom_mechanism/BasicRuntimeIT.java b/http-custom-mechanism/webapp/src/test/java/org/jboss/as/quickstart/http_custom_mechanism/BasicRuntimeIT.java index 4ccc6d5882..c4837f4c02 100644 --- a/http-custom-mechanism/webapp/src/test/java/org/jboss/as/quickstart/http_custom_mechanism/BasicRuntimeIT.java +++ b/http-custom-mechanism/webapp/src/test/java/org/jboss/as/quickstart/http_custom_mechanism/BasicRuntimeIT.java @@ -35,7 +35,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/http-custom-mechanism-webapp"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -47,7 +47,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/secured")) + .uri(new URI(serverHost+"/http-custom-mechanism-webapp/secured")) .header("X-USERNAME", "quickstartUser") .header("X-PASSWORD", "quickstartPwd1") .GET() diff --git a/jaxrs-client/charts/helm.yaml b/jaxrs-client/charts/helm.yaml index 4a37c4646e..3e17b4ab5f 100644 --- a/jaxrs-client/charts/helm.yaml +++ b/jaxrs-client/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: jaxrs-client deploy: replicas: 1 \ No newline at end of file diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 9fa04835db..1a2b96de72 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -26,7 +26,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 jaxrs-client @@ -137,6 +137,8 @@ + + ${project.artifactId} @@ -166,11 +168,6 @@ org.wildfly.plugins wildfly-maven-plugin - - ROOT.war ${version.server} @@ -194,11 +191,6 @@ org.wildfly.plugins wildfly-maven-plugin - - ROOT.war ${version.server} cloud @@ -212,6 +204,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/jaxrs-client/src/test/java/org/jboss/as/quickstarts/jaxrsclient/test/AbstractContactsRestClientIT.java b/jaxrs-client/src/test/java/org/jboss/as/quickstarts/jaxrsclient/test/AbstractContactsRestClientIT.java index e537bb0c31..1cf638c149 100644 --- a/jaxrs-client/src/test/java/org/jboss/as/quickstarts/jaxrsclient/test/AbstractContactsRestClientIT.java +++ b/jaxrs-client/src/test/java/org/jboss/as/quickstarts/jaxrsclient/test/AbstractContactsRestClientIT.java @@ -37,7 +37,7 @@ @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public abstract class AbstractContactsRestClientIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/jaxrs-client"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; private static final String CONTACT_NAME = "New Contact"; private static final String CONTACT_PHONE = "+55-61-5555-1234"; @@ -147,7 +147,7 @@ final Contact createContact() { static UriBuilder resolveBaseUrl() { final String baseUrl = resolveServerHost(); - return UriBuilder.fromUri(baseUrl).path("rest/contacts"); + return UriBuilder.fromUri(baseUrl).path("/jaxrs-client/rest/contacts"); } static String resolveServerHost() { diff --git a/jaxrs-jwt/charts/helm.yaml b/jaxrs-jwt/charts/helm.yaml index a1f84fb24a..d9c4d656db 100644 --- a/jaxrs-jwt/charts/helm.yaml +++ b/jaxrs-jwt/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: jaxrs-jwt deploy: replicas: 1 \ No newline at end of file diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml index bd8f878b32..c67c4a273b 100644 --- a/jaxrs-jwt/pom.xml +++ b/jaxrs-jwt/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 jaxrs-jwt @@ -138,7 +138,8 @@ - + + ${project.artifactId} @@ -166,11 +167,6 @@ org.wildfly.plugins wildfly-maven-plugin - - ROOT.war ${version.server} @@ -204,11 +200,6 @@ org.wildfly.plugins wildfly-maven-plugin - - ROOT.war ${version.server} cloud @@ -232,6 +223,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/jaxrs-jwt/src/test/java/org/jboss/quickstart/jaxrsjwt/JwtAuthIT.java b/jaxrs-jwt/src/test/java/org/jboss/quickstart/jaxrsjwt/JwtAuthIT.java index 7a712103d0..9f5f5ad328 100644 --- a/jaxrs-jwt/src/test/java/org/jboss/quickstart/jaxrsjwt/JwtAuthIT.java +++ b/jaxrs-jwt/src/test/java/org/jboss/quickstart/jaxrsjwt/JwtAuthIT.java @@ -43,7 +43,7 @@ */ public class JwtAuthIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/jaxrs-jwt"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; private static Client adminClient; private static Client customerClient; @@ -163,7 +163,7 @@ private static JsonObject get(final Client client, final Response.Status expecte private static UriBuilder resolveBaseUrl() { final String baseUrl = resolveServerHost(); - return UriBuilder.fromUri(baseUrl).path("rest"); + return UriBuilder.fromUri(baseUrl).path("/jaxrs-jwt/rest"); } private static String resolveServerHost() { diff --git a/jaxws-ejb/charts/helm.yaml b/jaxws-ejb/charts/helm.yaml index 366986104e..fb4da91070 100644 --- a/jaxws-ejb/charts/helm.yaml +++ b/jaxws-ejb/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: jaxws-ejb deploy: replicas: 1 \ No newline at end of file diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml index 611e36badb..1d478d8372 100644 --- a/jaxws-ejb/pom.xml +++ b/jaxws-ejb/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 jaxws-ejb @@ -121,6 +121,8 @@ + + ${project.artifactId} @@ -144,11 +146,6 @@ ${version.server} - - ROOT.war @@ -168,17 +165,11 @@ org.wildfly.plugins wildfly-maven-plugin - ${version.plugin.wildfly} ${version.server} cloud - - ROOT.war @@ -188,6 +179,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/jaxws-retail/charts/helm.yaml b/jaxws-retail/charts/helm.yaml index 41b934add0..110f339a2d 100644 --- a/jaxws-retail/charts/helm.yaml +++ b/jaxws-retail/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: jaxws-retail deploy: replicas: 1 \ No newline at end of file diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml index 7f2ce9a4cf..1d6302447a 100644 --- a/jaxws-retail/pom.xml +++ b/jaxws-retail/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 jaxws-retail @@ -124,6 +124,8 @@ + + ${project.artifactId} @@ -172,11 +174,6 @@ ${version.server} - - ROOT.war @@ -196,17 +193,11 @@ org.wildfly.plugins wildfly-maven-plugin - ${version.plugin.wildfly} ${version.server} cloud - - ROOT.war @@ -216,6 +207,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/jsonp/charts/helm.yaml b/jsonp/charts/helm.yaml index baf55edcf8..ff181f49c8 100644 --- a/jsonp/charts/helm.yaml +++ b/jsonp/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: jsonp deploy: replicas: 1 \ No newline at end of file diff --git a/jsonp/pom.xml b/jsonp/pom.xml index 4393264dc9..78a1b0ef0b 100644 --- a/jsonp/pom.xml +++ b/jsonp/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 jsonp @@ -134,6 +134,8 @@ + + ${project.artifactId} @@ -157,11 +159,6 @@ ${version.server} - - ROOT.war @@ -186,11 +183,6 @@ ${version.server} cloud - - ROOT.war @@ -200,6 +192,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/jsonp/src/test/java/org/wildfly/quickstarts/jsonp/BasicRuntimeIT.java b/jsonp/src/test/java/org/wildfly/quickstarts/jsonp/BasicRuntimeIT.java index dc146c0294..a5f02e413f 100644 --- a/jsonp/src/test/java/org/wildfly/quickstarts/jsonp/BasicRuntimeIT.java +++ b/jsonp/src/test/java/org/wildfly/quickstarts/jsonp/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/jsonp"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -46,7 +46,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/jsonp")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/jta-crash-rec/pom.xml b/jta-crash-rec/pom.xml index aee1860280..f792c032d8 100644 --- a/jta-crash-rec/pom.xml +++ b/jta-crash-rec/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 jta-crash-rec @@ -125,6 +125,11 @@ + + + ${project.artifactId} + + integration-testing diff --git a/jta-crash-rec/src/test/java/org/jboss/as/quickstarts/xa/BasicRuntimeIT.java b/jta-crash-rec/src/test/java/org/jboss/as/quickstarts/xa/BasicRuntimeIT.java index 99aea79c0c..54d32b9303 100644 --- a/jta-crash-rec/src/test/java/org/jboss/as/quickstarts/xa/BasicRuntimeIT.java +++ b/jta-crash-rec/src/test/java/org/jboss/as/quickstarts/xa/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/jta-crash-rec"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -46,7 +46,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/jta-crash-rec")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/jts/application-component-1/pom.xml b/jts/application-component-1/pom.xml index 6b5e576d48..ecd930f779 100644 --- a/jts/application-component-1/pom.xml +++ b/jts/application-component-1/pom.xml @@ -81,4 +81,8 @@ + + + ${project.artifactId} + diff --git a/jts/pom.xml b/jts/pom.xml index 4f9eb7e27a..29dd091494 100644 --- a/jts/pom.xml +++ b/jts/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 diff --git a/kitchensink/charts/helm.yaml b/kitchensink/charts/helm.yaml index 23c8ff8034..07593d4f85 100644 --- a/kitchensink/charts/helm.yaml +++ b/kitchensink/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: kitchensink deploy: replicas: 1 \ No newline at end of file diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml index d0308417db..486256cc5b 100644 --- a/kitchensink/pom.xml +++ b/kitchensink/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 kitchensink @@ -200,6 +200,8 @@ + + ${project.artifactId} @@ -223,11 +225,6 @@ ${version.server} - - ROOT.war @@ -252,11 +249,6 @@ ${version.server} cloud - - ROOT.war @@ -266,6 +258,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/BasicRuntimeIT.java b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/BasicRuntimeIT.java index ce6731ffab..bc264ccfbd 100644 --- a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/BasicRuntimeIT.java +++ b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/BasicRuntimeIT.java @@ -33,7 +33,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/kitchensink"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -45,7 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/kitchensink")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java index e9583d69c2..f6cec844c0 100644 --- a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java +++ b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java @@ -29,7 +29,7 @@ public class MemberRegistrationIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/kitchensink"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testRegister() throws Exception { @@ -48,7 +48,7 @@ public void testRegister() throws Exception { .add("name", "Jane Doe") .add("email", "jane@mailinator.com") .add("phoneNumber", "2125551234").build(); - HttpRequest request = HttpRequest.newBuilder(new URI(serverHost + "/rest/members")) + HttpRequest request = HttpRequest.newBuilder(new URI(serverHost + "/kitchensink/rest/members")) .header("Content-Type", "application/json") .POST(HttpRequest.BodyPublishers.ofString(json.toString())) .build(); diff --git a/logging/pom.xml b/logging/pom.xml index 7a44eee3d6..cbb8792d66 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 jboss-logging @@ -142,20 +142,24 @@ - - - org.wildfly.plugins - wildfly-maven-plugin - ${version.plugin.wildfly} - - ${jboss.home} - false - - - - - - + + ${project.artifactId} + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.plugin.wildfly} + + ${jboss.home} + false + + + + + + + @@ -166,13 +170,7 @@ org.wildfly.plugins wildfly-maven-plugin - ${version.plugin.wildfly} - - ROOT.war ${version.server} @@ -189,8 +187,6 @@ true - - ROOT.war @@ -210,13 +206,7 @@ org.wildfly.plugins wildfly-maven-plugin - ${version.plugin.wildfly} - - ROOT.war ${version.server} cloud @@ -233,7 +223,6 @@ true - ROOT.war @@ -243,6 +232,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/logging/src/charts/helm.yaml b/logging/src/charts/helm.yaml index 4c59489761..80efbd5db8 100644 --- a/logging/src/charts/helm.yaml +++ b/logging/src/charts/helm.yaml @@ -3,7 +3,7 @@ build: <<<<<<< HEAD ref: 31.x-glow-preview ======= - ref: 34.x + ref: main >>>>>>> upstream/main contextDir: logging deploy: diff --git a/logging/src/test/java/org/jboss/as/quickstarts/logging/LogIT.java b/logging/src/test/java/org/jboss/as/quickstarts/logging/LogIT.java index fbc03d1b86..178e638084 100644 --- a/logging/src/test/java/org/jboss/as/quickstarts/logging/LogIT.java +++ b/logging/src/test/java/org/jboss/as/quickstarts/logging/LogIT.java @@ -39,7 +39,7 @@ @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class LogIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/jboss-logging"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; private static Client client; @@ -160,7 +160,7 @@ private static void doLog(final String level) { private static UriBuilder resolveBaseUrl() { final String baseUrl = resolveServerHost(); - return UriBuilder.fromUri(baseUrl).path("api/logs"); + return UriBuilder.fromUri(baseUrl).path("/jboss-logging/api/logs"); } private static String resolveServerHost() { diff --git a/mail/pom.xml b/mail/pom.xml index 1200ae6d64..3d1f9884d3 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -115,6 +115,8 @@ + + ${project.artifactId} @@ -151,11 +153,6 @@ ${version.server} - - ROOT.war diff --git a/mail/src/test/java/org/jboss/as/quickstarts/mail/BasicRuntimeIT.java b/mail/src/test/java/org/jboss/as/quickstarts/mail/BasicRuntimeIT.java index 7a0f2ce380..fc6fdde77c 100644 --- a/mail/src/test/java/org/jboss/as/quickstarts/mail/BasicRuntimeIT.java +++ b/mail/src/test/java/org/jboss/as/quickstarts/mail/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/mail"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -46,7 +46,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost)) + .uri(new URI(serverHost+"/mail")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/mail/src/test/java/org/jboss/as/quickstarts/mail/MailTestCaseIT.java b/mail/src/test/java/org/jboss/as/quickstarts/mail/MailTestCaseIT.java index fde3fd784e..158439242f 100644 --- a/mail/src/test/java/org/jboss/as/quickstarts/mail/MailTestCaseIT.java +++ b/mail/src/test/java/org/jboss/as/quickstarts/mail/MailTestCaseIT.java @@ -21,7 +21,7 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class MailTestCaseIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/mail"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; private WebDriver driver; @@ -45,7 +45,7 @@ public void testSetup() { serverHost = DEFAULT_SERVER_HOST; } - driver.get(serverHost); + driver.get(serverHost+"/mail"); driver.manage().timeouts().implicitlyWait(Duration.ofMillis(500)); } diff --git a/messaging-clustering-singleton/pom.xml b/messaging-clustering-singleton/pom.xml index 4162d84283..f218a0f779 100644 --- a/messaging-clustering-singleton/pom.xml +++ b/messaging-clustering-singleton/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -109,6 +109,8 @@ + + ${project.artifactId} @@ -150,7 +152,6 @@ false - ROOT.war diff --git a/messaging-clustering-singleton/src/test/java/org/jboss/as/quickstarts/mdb/BasicRuntimeIT.java b/messaging-clustering-singleton/src/test/java/org/jboss/as/quickstarts/mdb/BasicRuntimeIT.java index 857636105a..fb3fa26c4d 100644 --- a/messaging-clustering-singleton/src/test/java/org/jboss/as/quickstarts/mdb/BasicRuntimeIT.java +++ b/messaging-clustering-singleton/src/test/java/org/jboss/as/quickstarts/mdb/BasicRuntimeIT.java @@ -36,7 +36,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/messaging-clustering-singleton"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPQueueEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -48,7 +48,7 @@ public void testHTTPQueueEndpointIsAvailable() throws IOException, InterruptedEx serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost + "/HelloWorldMDBServletClient")) + .uri(new URI(serverHost + "/messaging-clustering-singleton/HelloWorldMDBServletClient")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() @@ -72,7 +72,7 @@ public void testHTTPTopicEndpointIsAvailable() throws IOException, InterruptedEx serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost + "/HelloWorldMDBServletClient?topic=true")) + .uri(new URI(serverHost + "/messaging-clustering-singleton/HelloWorldMDBServletClient?topic=true")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/micrometer/charts/helm.yaml b/micrometer/charts/helm.yaml index a10492a557..c0bbbce795 100644 --- a/micrometer/charts/helm.yaml +++ b/micrometer/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: micrometer deploy: replicas: 1 diff --git a/micrometer/pom.xml b/micrometer/pom.xml index 4e2fb16d70..f0f925b2de 100644 --- a/micrometer/pom.xml +++ b/micrometer/pom.xml @@ -10,7 +10,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -144,9 +144,6 @@ false - - - ROOT.war @@ -176,8 +173,6 @@ true - - ROOT.war @@ -214,11 +209,6 @@ micrometer - - ROOT.war @@ -236,6 +226,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/BasicRuntimeIT.java b/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/BasicRuntimeIT.java index 7a08a62fb5..27a18f9c79 100644 --- a/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/BasicRuntimeIT.java +++ b/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/BasicRuntimeIT.java @@ -28,7 +28,7 @@ import org.junit.Test; public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/micrometer"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -51,7 +51,7 @@ static String getApplicationUrl() { if (serverHost == null) { serverHost = DEFAULT_SERVER_HOST; } - return serverHost; + return serverHost+"/micrometer"; } static HttpClient getHttpClient() { diff --git a/microprofile-config/charts/helm.yaml b/microprofile-config/charts/helm.yaml index 28550c561a..c32c42525c 100644 --- a/microprofile-config/charts/helm.yaml +++ b/microprofile-config/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: microprofile-config deploy: replicas: 1 \ No newline at end of file diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml index b7f2dfbad9..8115877045 100644 --- a/microprofile-config/pom.xml +++ b/microprofile-config/pom.xml @@ -8,7 +8,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -128,11 +128,6 @@ ${version.server} true - - ROOT.war @@ -157,11 +152,6 @@ ${version.server} cloud - - ROOT.war @@ -171,6 +161,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/microprofile-config/src/test/java/org/wildfly/quickstarts/microprofile/config/BasicRuntimeIT.java b/microprofile-config/src/test/java/org/wildfly/quickstarts/microprofile/config/BasicRuntimeIT.java index c2ba671b4a..052109d568 100644 --- a/microprofile-config/src/test/java/org/wildfly/quickstarts/microprofile/config/BasicRuntimeIT.java +++ b/microprofile-config/src/test/java/org/wildfly/quickstarts/microprofile/config/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/microprofile-config"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -46,7 +46,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost)) + .uri(new URI(serverHost+"/microprofile-config")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/microprofile-fault-tolerance/charts/helm.yaml b/microprofile-fault-tolerance/charts/helm.yaml index 422eb6fae3..88695c5b84 100644 --- a/microprofile-fault-tolerance/charts/helm.yaml +++ b/microprofile-fault-tolerance/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: microprofile-fault-tolerance deploy: replicas: 1 diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml index b44fb7ece2..f9f13f553f 100644 --- a/microprofile-fault-tolerance/pom.xml +++ b/microprofile-fault-tolerance/pom.xml @@ -26,7 +26,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 microprofile-fault-tolerance @@ -172,11 +172,6 @@ ${version.server} true - - ROOT.war @@ -201,11 +196,6 @@ ${version.server} cloud - - ROOT.war @@ -215,6 +205,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/microprofile-fault-tolerance/src/test/java/org/wildfly/quickstarts/microprofile/faulttolerance/TestUtils.java b/microprofile-fault-tolerance/src/test/java/org/wildfly/quickstarts/microprofile/faulttolerance/TestUtils.java index a6c65f0515..2475cac50c 100644 --- a/microprofile-fault-tolerance/src/test/java/org/wildfly/quickstarts/microprofile/faulttolerance/TestUtils.java +++ b/microprofile-fault-tolerance/src/test/java/org/wildfly/quickstarts/microprofile/faulttolerance/TestUtils.java @@ -18,7 +18,7 @@ public class TestUtils { - static final String DEFAULT_SERVER_HOST = "http://localhost:8080/microprofile-fault-tolerance"; + static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; static String getServerHost() { String serverHost = System.getenv("SERVER_HOST"); @@ -28,6 +28,6 @@ static String getServerHost() { if (serverHost == null) { serverHost = DEFAULT_SERVER_HOST; } - return serverHost; + return serverHost+"/microprofile-fault-tolerance"; } } diff --git a/microprofile-health/charts/helm.yaml b/microprofile-health/charts/helm.yaml index b9b5cbe83c..a925c5de44 100644 --- a/microprofile-health/charts/helm.yaml +++ b/microprofile-health/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: microprofile-health deploy: replicas: 1 \ No newline at end of file diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml index 6a9232af2d..cb9d4d6b76 100644 --- a/microprofile-health/pom.xml +++ b/microprofile-health/pom.xml @@ -8,7 +8,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -132,11 +132,6 @@ ${version.server} true - - ROOT.war @@ -161,11 +156,6 @@ ${version.server} cloud - - ROOT.war @@ -175,6 +165,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/BasicRuntimeIT.java b/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/BasicRuntimeIT.java index 0d27f99036..1a4ce6074c 100644 --- a/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/BasicRuntimeIT.java +++ b/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/BasicRuntimeIT.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertEquals; public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/microprofile-health/"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -25,7 +25,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost)) + .uri(new URI(serverHost+"/microprofile-health")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/microprofile-jwt/charts/helm.yaml b/microprofile-jwt/charts/helm.yaml index a2add07a84..515e907085 100644 --- a/microprofile-jwt/charts/helm.yaml +++ b/microprofile-jwt/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: microprofile-jwt deploy: replicas: 1 \ No newline at end of file diff --git a/microprofile-jwt/pom.xml b/microprofile-jwt/pom.xml index 037f7d8f3a..5452f12c50 100644 --- a/microprofile-jwt/pom.xml +++ b/microprofile-jwt/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -148,6 +148,7 @@ + ${project.artifactId} @@ -188,11 +189,6 @@ ${version.server} true - - ROOT.war @@ -218,11 +214,6 @@ ${version.server} cloud - - ROOT.war @@ -232,6 +223,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/TestUtils.java b/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/TestUtils.java index 0ed8873053..5836e4673e 100644 --- a/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/TestUtils.java +++ b/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/TestUtils.java @@ -1,9 +1,9 @@ package org.wildfly.quickstarts.mpjwt; public class TestUtils { - static final String DEFAULT_SERVER_HOST = "http://localhost:8080/microprofile-jwt"; + static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; - static final String ROOT_PATH = "/Sample/"; + static final String ROOT_PATH = "/microprofile-jwt/Sample/"; static final String HELLO_WORLD = "helloworld"; diff --git a/microprofile-lra/charts/helm.yaml b/microprofile-lra/charts/helm.yaml index 3e312dc272..67598c049f 100644 --- a/microprofile-lra/charts/helm.yaml +++ b/microprofile-lra/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: microprofile-lra deploy: replicas: 1 diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml index 6c517fe00c..4a6f4dc39b 100644 --- a/microprofile-lra/pom.xml +++ b/microprofile-lra/pom.xml @@ -8,7 +8,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -141,11 +141,6 @@ true - - ROOT.war @@ -173,11 +168,6 @@ lra-coordinator - - ROOT.war @@ -187,6 +177,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/TestUtils.java b/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/TestUtils.java index a20614b286..c7b6469f1b 100644 --- a/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/TestUtils.java +++ b/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/TestUtils.java @@ -1,7 +1,7 @@ package org.wildfly.quickstarts.microprofile.lra; public class TestUtils { - static final String DEFAULT_SERVER_HOST = "http://localhost:8080/microprofile-lra"; + static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; static String getServerHost() { String serverHost = System.getenv("SERVER_HOST"); @@ -11,6 +11,6 @@ static String getServerHost() { if (serverHost == null) { serverHost = DEFAULT_SERVER_HOST; } - return serverHost; + return serverHost+"/microprofile-lra"; } } diff --git a/microprofile-openapi/charts/helm.yaml b/microprofile-openapi/charts/helm.yaml index 02c4c58c5c..e539344a2f 100644 --- a/microprofile-openapi/charts/helm.yaml +++ b/microprofile-openapi/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: microprofile-openapi deploy: replicas: 1 \ No newline at end of file diff --git a/microprofile-openapi/pom.xml b/microprofile-openapi/pom.xml index 25f204b274..cada69ab33 100644 --- a/microprofile-openapi/pom.xml +++ b/microprofile-openapi/pom.xml @@ -9,7 +9,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -99,11 +99,6 @@ true - - ROOT.war @@ -131,11 +126,6 @@ openapi - - ROOT.war @@ -145,6 +135,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/microprofile-openapi/src/test/java/org/wildfly/quickstarts/microprofile/openapi/BasicRuntimeIT.java b/microprofile-openapi/src/test/java/org/wildfly/quickstarts/microprofile/openapi/BasicRuntimeIT.java index 81609cf2a2..b84b7ef148 100644 --- a/microprofile-openapi/src/test/java/org/wildfly/quickstarts/microprofile/openapi/BasicRuntimeIT.java +++ b/microprofile-openapi/src/test/java/org/wildfly/quickstarts/microprofile/openapi/BasicRuntimeIT.java @@ -33,7 +33,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/microprofile-openapi"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -45,7 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost)) + .uri(new URI(serverHost+"/microprofile-openapi")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/microprofile-reactive-messaging-kafka/charts/helm.yaml b/microprofile-reactive-messaging-kafka/charts/helm.yaml index 927f8bf5ed..cdb2ecd76e 100644 --- a/microprofile-reactive-messaging-kafka/charts/helm.yaml +++ b/microprofile-reactive-messaging-kafka/charts/helm.yaml @@ -2,7 +2,7 @@ # Will need a diff commit in the upstream-to-product repository build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: microprofile-reactive-messaging-kafka deploy: replicas: 1 diff --git a/microprofile-reactive-messaging-kafka/pom.xml b/microprofile-reactive-messaging-kafka/pom.xml index 61e3a6be29..e6f7afe254 100644 --- a/microprofile-reactive-messaging-kafka/pom.xml +++ b/microprofile-reactive-messaging-kafka/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 microprofile-reactive-messaging-kafka @@ -187,6 +187,8 @@ + + ${project.artifactId} @@ -224,11 +226,6 @@ ${version.server} true - - ROOT.war @@ -254,11 +251,6 @@ ${version.server} cloud - - ROOT.war @@ -268,6 +260,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/TestUtils.java b/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/TestUtils.java index 483a7cda51..f37fc35245 100644 --- a/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/TestUtils.java +++ b/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/TestUtils.java @@ -1,7 +1,7 @@ package org.wildfly.quickstarts.microprofile.reactive.messaging.test; public class TestUtils { - static final String DEFAULT_SERVER_HOST = "http://localhost:8080/microprofile-reactive-messaging-kafka"; + static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; static String getServerHost() { String serverHost = System.getenv("SERVER_HOST"); @@ -11,6 +11,6 @@ static String getServerHost() { if (serverHost == null) { serverHost = DEFAULT_SERVER_HOST; } - return serverHost; + return serverHost+"/microprofile-reactive-messaging-kafka"; } } diff --git a/microprofile-rest-client/charts/helm.yaml b/microprofile-rest-client/charts/helm.yaml index bdd64bbff1..16a15af18f 100644 --- a/microprofile-rest-client/charts/helm.yaml +++ b/microprofile-rest-client/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: microprofile-rest-client deploy: replicas: 1 \ No newline at end of file diff --git a/microprofile-rest-client/pom.xml b/microprofile-rest-client/pom.xml index fc5807306c..7ec632425e 100644 --- a/microprofile-rest-client/pom.xml +++ b/microprofile-rest-client/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 microprofile-rest-client @@ -54,7 +54,7 @@ 5.10.1 ${project.build.directory}/server - http://localhost:8080/microprofile-rest-client + http://localhost:8080 @@ -175,6 +175,8 @@ + + ${project.artifactId} @@ -202,11 +204,6 @@ ${version.server} true - - ROOT.war @@ -232,11 +229,6 @@ ${version.server} cloud - - ROOT.war @@ -246,6 +238,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/microprofile-rest-client/src/test/java/org/wildfly/quickstarts/microprofile/rest/client/CountriesServiceClient.java b/microprofile-rest-client/src/test/java/org/wildfly/quickstarts/microprofile/rest/client/CountriesServiceClient.java index fc26928f9b..7ebf00c127 100644 --- a/microprofile-rest-client/src/test/java/org/wildfly/quickstarts/microprofile/rest/client/CountriesServiceClient.java +++ b/microprofile-rest-client/src/test/java/org/wildfly/quickstarts/microprofile/rest/client/CountriesServiceClient.java @@ -30,7 +30,7 @@ import java.util.concurrent.CompletionStage; -@Path("/") +@Path("/microprofile-rest-client") @RegisterRestClient @RegisterProvider(NotFoundResponseExceptionMapper.class) public interface CountriesServiceClient { diff --git a/numberguess/charts/helm.yaml b/numberguess/charts/helm.yaml index d7ad0c4460..716217e700 100644 --- a/numberguess/charts/helm.yaml +++ b/numberguess/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: numberguess deploy: replicas: 1 \ No newline at end of file diff --git a/numberguess/pom.xml b/numberguess/pom.xml index 810689fcc5..7a0c271e29 100644 --- a/numberguess/pom.xml +++ b/numberguess/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 numberguess @@ -98,6 +98,8 @@ + + ${project.artifactId} @@ -121,11 +123,6 @@ ${version.server} - - ROOT.war @@ -150,11 +147,6 @@ ${version.server} cloud - - ROOT.war @@ -164,6 +156,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/BasicRuntimeIT.java b/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/BasicRuntimeIT.java index 05c1e8429d..86933051ee 100644 --- a/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/BasicRuntimeIT.java +++ b/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/numberguess"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; public static String getServerHost() { String serverHost = System.getenv("SERVER_HOST"); @@ -49,7 +49,7 @@ public static String getServerHost() { @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(getServerHost()+"/")) + .uri(new URI(getServerHost()+"/numberguess")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/NumberguessIT.java b/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/NumberguessIT.java index 739179a06d..78fd078fc1 100644 --- a/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/NumberguessIT.java +++ b/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/NumberguessIT.java @@ -50,7 +50,7 @@ public void guessNumber() throws IOException, InterruptedException, URISyntaxExc .followRedirects(HttpClient.Redirect.ALWAYS) .cookieHandler(new CookieManager(null, CookiePolicy.ACCEPT_ALL)) .build(); - HttpRequest request = HttpRequest.newBuilder().uri(new URI(BasicRuntimeIT.getServerHost()+"/home.jsf")) + HttpRequest request = HttpRequest.newBuilder().uri(new URI(BasicRuntimeIT.getServerHost()+"/numberguess/home.jsf")) .POST(ofFormData(Map.of("numberGuess:inputGuess", (Object) getNumber()))) .build(); HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); diff --git a/opentelemetry-tracing/charts/helm.yaml b/opentelemetry-tracing/charts/helm.yaml index 174573c762..489caf0c20 100644 --- a/opentelemetry-tracing/charts/helm.yaml +++ b/opentelemetry-tracing/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: opentelemetry-tracing deploy: replicas: 1 diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml index 95505df516..8e396935b7 100644 --- a/opentelemetry-tracing/pom.xml +++ b/opentelemetry-tracing/pom.xml @@ -8,7 +8,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -91,7 +91,7 @@ - + ${project.artifactId} @@ -138,8 +138,6 @@ - - ROOT.war @@ -165,8 +163,6 @@ ${version.server} true - - ROOT.war @@ -207,11 +203,6 @@ false - - ROOT.war @@ -221,6 +212,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/BasicRuntimeIT.java b/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/BasicRuntimeIT.java index d7e78f4901..241de33aef 100644 --- a/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/BasicRuntimeIT.java +++ b/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/BasicRuntimeIT.java @@ -28,12 +28,11 @@ import org.junit.Test; public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/opentelemetry-tracing"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { String applicationUrl = getApplicationUrl(); - final HttpRequest request = HttpRequest.newBuilder() .uri(new URI(applicationUrl)) .GET() @@ -51,7 +50,7 @@ static String getApplicationUrl() { if (serverHost == null) { serverHost = DEFAULT_SERVER_HOST; } - return serverHost; + return serverHost+"/opentelemetry-tracing"; } static HttpClient getHttpClient() { diff --git a/pom.xml b/pom.xml index bbea90bdc8..c26cdb81e8 100644 --- a/pom.xml +++ b/pom.xml @@ -67,8 +67,6 @@ - - ${project.artifactId} com.mycila diff --git a/remote-helloworld-mdb/charts/helm.yaml b/remote-helloworld-mdb/charts/helm.yaml index 76d6eec9e7..ee322eddb0 100644 --- a/remote-helloworld-mdb/charts/helm.yaml +++ b/remote-helloworld-mdb/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: remote-helloworld-mdb deploy: replicas: 1 diff --git a/remote-helloworld-mdb/pom.xml b/remote-helloworld-mdb/pom.xml index b987dd60c9..9874d24e86 100644 --- a/remote-helloworld-mdb/pom.xml +++ b/remote-helloworld-mdb/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -111,6 +111,8 @@ + + ${project.artifactId} @@ -137,11 +139,6 @@ remote-activemq - - ROOT.war @@ -169,11 +166,6 @@ remote-activemq - - ROOT.war @@ -183,6 +175,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + @@ -193,7 +196,6 @@ org.apache.maven.plugins maven-failsafe-plugin - ${version.failsafe.plugin} diff --git a/remote-helloworld-mdb/src/test/java/org/jboss/as/quickstarts/mdb/BasicRuntimeIT.java b/remote-helloworld-mdb/src/test/java/org/jboss/as/quickstarts/mdb/BasicRuntimeIT.java index 501196f2c6..006a5bef40 100644 --- a/remote-helloworld-mdb/src/test/java/org/jboss/as/quickstarts/mdb/BasicRuntimeIT.java +++ b/remote-helloworld-mdb/src/test/java/org/jboss/as/quickstarts/mdb/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/remote-helloworld-mdb"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testSendToQueue() throws IOException, InterruptedException { @@ -106,7 +106,7 @@ private String getServerHost() { protected URI getHTTPEndpoint() { try { - return new URI(getServerHost() + "/HelloWorldMDBServletClient"); + return new URI(getServerHost() + "/remote-helloworld-mdb/HelloWorldMDBServletClient"); } catch (URISyntaxException ex) { throw new RuntimeException(ex); } diff --git a/security-domain-to-domain/ear/pom.xml b/security-domain-to-domain/ear/pom.xml index 381fe3a891..0c2df86243 100644 --- a/security-domain-to-domain/ear/pom.xml +++ b/security-domain-to-domain/ear/pom.xml @@ -123,8 +123,6 @@ false - - ROOT.ear @@ -134,19 +132,6 @@ - - org.apache.maven.plugins - maven-ear-plugin - - - - ${project.groupId} - security-domain-to-domain-web - / - - - - diff --git a/security-domain-to-domain/pom.xml b/security-domain-to-domain/pom.xml index 9b1b5973fd..aed492a9f1 100644 --- a/security-domain-to-domain/pom.xml +++ b/security-domain-to-domain/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 diff --git a/security-domain-to-domain/test/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java b/security-domain-to-domain/test/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java index a991d8b539..002d809ce0 100644 --- a/security-domain-to-domain/test/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java +++ b/security-domain-to-domain/test/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java @@ -36,7 +36,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/security-domain-to-domain"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; protected URI getHTTPEndpoint() { String host = getServerHost(); @@ -44,7 +44,7 @@ protected URI getHTTPEndpoint() { host = DEFAULT_SERVER_HOST; } try { - return new URI(host + "/SecuredServlet"); + return new URI(host + "/security-domain-to-domain/SecuredServlet"); } catch (URISyntaxException ex) { throw new RuntimeException(ex); } diff --git a/security-domain-to-domain/web/pom.xml b/security-domain-to-domain/web/pom.xml index 612f1b99ea..b1ef742750 100644 --- a/security-domain-to-domain/web/pom.xml +++ b/security-domain-to-domain/web/pom.xml @@ -90,4 +90,9 @@ provided + + + + ${project.artifactId} + diff --git a/servlet-async/charts/helm.yaml b/servlet-async/charts/helm.yaml index b653c33708..7aac2f622d 100644 --- a/servlet-async/charts/helm.yaml +++ b/servlet-async/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: servlet-async deploy: replicas: 2 \ No newline at end of file diff --git a/servlet-async/pom.xml b/servlet-async/pom.xml index 964a721cbb..c58cd32006 100644 --- a/servlet-async/pom.xml +++ b/servlet-async/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -109,6 +109,8 @@ + + ${project.artifactId} @@ -132,11 +134,6 @@ ${version.server} - - ROOT.war @@ -161,11 +158,6 @@ ${version.server} cloud - - ROOT.war @@ -175,6 +167,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/servlet-async/src/test/java/org/jboss/as/quickstarts/servlet/async/BasicRuntimeIT.java b/servlet-async/src/test/java/org/jboss/as/quickstarts/servlet/async/BasicRuntimeIT.java index 48c9bbc0e2..634f7f305d 100644 --- a/servlet-async/src/test/java/org/jboss/as/quickstarts/servlet/async/BasicRuntimeIT.java +++ b/servlet-async/src/test/java/org/jboss/as/quickstarts/servlet/async/BasicRuntimeIT.java @@ -32,7 +32,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/servlet-async"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -44,7 +44,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/servlet-async")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/servlet-filterlistener/charts/helm.yaml b/servlet-filterlistener/charts/helm.yaml index e88ea90ec6..dca2e1b81e 100644 --- a/servlet-filterlistener/charts/helm.yaml +++ b/servlet-filterlistener/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: servlet-filterlistener deploy: replicas: 2 \ No newline at end of file diff --git a/servlet-filterlistener/pom.xml b/servlet-filterlistener/pom.xml index d67cc6aae0..a78b18d28b 100644 --- a/servlet-filterlistener/pom.xml +++ b/servlet-filterlistener/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -109,6 +109,8 @@ + + ${project.artifactId} @@ -132,11 +134,6 @@ ${version.server} - - ROOT.war @@ -161,11 +158,6 @@ ${version.server} cloud - - ROOT.war @@ -175,6 +167,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/servlet-filterlistener/src/test/java/org/jboss/as/quickstarts/servlet/filterlistener/BasicRuntimeIT.java b/servlet-filterlistener/src/test/java/org/jboss/as/quickstarts/servlet/filterlistener/BasicRuntimeIT.java index a775448ced..af5dcbe35b 100644 --- a/servlet-filterlistener/src/test/java/org/jboss/as/quickstarts/servlet/filterlistener/BasicRuntimeIT.java +++ b/servlet-filterlistener/src/test/java/org/jboss/as/quickstarts/servlet/filterlistener/BasicRuntimeIT.java @@ -32,7 +32,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/servlet-filterlistener"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -44,7 +44,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/servlet-filterlistener")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/servlet-filterlistener/src/test/java/org/jboss/as/quickstarts/servlet/filterlistener/FilterServletIT.java b/servlet-filterlistener/src/test/java/org/jboss/as/quickstarts/servlet/filterlistener/FilterServletIT.java index deb964efef..7257da2c57 100644 --- a/servlet-filterlistener/src/test/java/org/jboss/as/quickstarts/servlet/filterlistener/FilterServletIT.java +++ b/servlet-filterlistener/src/test/java/org/jboss/as/quickstarts/servlet/filterlistener/FilterServletIT.java @@ -35,7 +35,7 @@ */ public class FilterServletIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/servlet-filterlistener"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testVowelRemoverFilter() throws IOException, InterruptedException, URISyntaxException { @@ -47,7 +47,7 @@ public void testVowelRemoverFilter() throws IOException, InterruptedException, U serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost + "/FilterExample?" + .uri(new URI(serverHost + "/servlet-filterlistener/FilterExample?" + ofFormData(Map.of("userInput", "This is only a test!")))) .GET() .build(); diff --git a/servlet-security/charts/helm.yaml b/servlet-security/charts/helm.yaml index 9884ef1736..6d710d083a 100644 --- a/servlet-security/charts/helm.yaml +++ b/servlet-security/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: servlet-security deploy: replicas: 1 diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml index 012f43e7c7..5ffddd30c8 100644 --- a/servlet-security/pom.xml +++ b/servlet-security/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -108,6 +108,8 @@ + + ${project.artifactId} @@ -136,11 +138,6 @@ h2-database - - ROOT.war @@ -179,11 +176,6 @@ cloud - - ROOT.war @@ -202,6 +194,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/servlet-security/src/test/java/org/jboss/as/quickstarts/servlet_security/BasicRuntimeIT.java b/servlet-security/src/test/java/org/jboss/as/quickstarts/servlet_security/BasicRuntimeIT.java index 8519cb78d2..43dce09b2c 100644 --- a/servlet-security/src/test/java/org/jboss/as/quickstarts/servlet_security/BasicRuntimeIT.java +++ b/servlet-security/src/test/java/org/jboss/as/quickstarts/servlet_security/BasicRuntimeIT.java @@ -39,7 +39,7 @@ */ public class BasicRuntimeIT { - protected static final String DEFAULT_SERVER_HOST = "http://localhost:8080/servlet-security"; + protected static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; protected URI getHTTPEndpoint() { String host = System.getenv("SERVER_HOST"); @@ -50,7 +50,7 @@ protected URI getHTTPEndpoint() { host = DEFAULT_SERVER_HOST; } try { - return new URI(host + "/SecuredServlet"); + return new URI(host + "/servlet-security/SecuredServlet"); } catch (URISyntaxException ex) { throw new RuntimeException(ex); } diff --git a/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc b/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc index 1ac1fc6c5d..628775223e 100644 --- a/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc +++ b/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc @@ -19,11 +19,6 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic ${version.server} true - - ROOT.war ... @@ -71,10 +66,5 @@ endif::uses-jaeger[] . You can now interact with the quickstart application. -[NOTE] -==== -After the quickstart application is deployed, the bootable JAR includes the application in the root context. Therefore, any URLs related to the application should not have the `/{artifactId}` path segment after `HOST:PORT`. -==== - // Bootable Jar Testing include::../shared-doc/run-integration-tests-with-bootable-jar.adoc[leveloffset=+1] \ No newline at end of file diff --git a/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc b/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc index e629caea08..3a9bee8141 100644 --- a/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc +++ b/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc @@ -66,11 +66,6 @@ The server provisioning functionality is provided by the WildFly Maven Plugin, a ${version.server} - - ROOT.war ... @@ -95,10 +90,5 @@ If you get an error or the server is missing some functionality which cannot be wildfly-glow show-add-ons ---- -[NOTE] -==== -Since the plugin configuration above deploys quickstart on root web context of the provisioned server, the URL to access the application should not have the `/{artifactId}` path segment after `HOST:PORT`. -==== - // Server Provisioning Testing include::../shared-doc/run-integration-tests-with-provisioned-server.adoc[leveloffset=+1] diff --git a/shared-doc/build-the-quickstart-for-cloud-platform-internal.adoc b/shared-doc/build-the-quickstart-for-cloud-platform-internal.adoc index 7a469d1d44..eb0e5dc924 100644 --- a/shared-doc/build-the-quickstart-for-cloud-platform-internal.adoc +++ b/shared-doc/build-the-quickstart-for-cloud-platform-internal.adoc @@ -21,11 +21,6 @@ ifndef::ProductRelease,EAPXPRelease[] ${version.server} cloud - - ROOT.war ... @@ -73,7 +68,6 @@ ifdef::ProductRelease,EAPXPRelease[] ... - ROOT.war diff --git a/shared-doc/helm-deploy-project.adoc b/shared-doc/helm-deploy-project.adoc index f04d1035ab..779a117fe1 100644 --- a/shared-doc/helm-deploy-project.adoc +++ b/shared-doc/helm-deploy-project.adoc @@ -135,10 +135,6 @@ kubectl port-forward service/{helm-app-name} 8080:8080 The server can now be accessed via `http://localhost:8080` from outside Kubernetes. Note that the command to create the port-forward will not return, so it is easiest to run this in a separate terminal. endif::[] -[NOTE] -==== -The Maven profile named `openshift` is used by the Helm chart to provision the server with the quickstart deployed on the root web context, and thus the application should be accessed with the URL without the `/{artifactId}` path segment after `HOST:PORT`. -==== ifdef::openshift+post-helm-install-actions-openshift[] include::{post-helm-install-actions-openshift}[leveloffset=+1] diff --git a/shared-doc/run-integration-tests-with-bootable-jar.adoc b/shared-doc/run-integration-tests-with-bootable-jar.adoc index 7342e728a3..818b3bd289 100644 --- a/shared-doc/run-integration-tests-with-bootable-jar.adoc +++ b/shared-doc/run-integration-tests-with-bootable-jar.adoc @@ -2,7 +2,6 @@ = Run the Integration Tests with a bootable jar include::define-standalone-server-attributes.adoc[] -ifndef::server_provisioning_server_host[:server_provisioning_server_host: http://localhost:8080] The integration tests included with this quickstart, which verify that the quickstart runs correctly, may also be run with a bootable jar. @@ -22,11 +21,11 @@ $ mvn clean package -Pbootable-jar $ mvn wildfly:start-jar ---- -. Type the following command to run the `verify` goal with the `integration-testing` profile activated, and specifying the quickstart's URL using the `server.host` system property, which for a bootable jar by default is `{server_provisioning_server_host}`. +. Type the following command to run the `verify` goal with the `integration-testing` profile activated. + [source,subs="attributes+",options="nowrap"] ---- -$ mvn verify -Pintegration-testing -Dserver.host={server_provisioning_server_host} +$ mvn verify -Pintegration-testing ---- . Shutdown the {productName} bootable jar, this time using the {productName} Maven Jar Plugin too. diff --git a/shared-doc/run-integration-tests-with-provisioned-server.adoc b/shared-doc/run-integration-tests-with-provisioned-server.adoc index fd14f89aca..d82278745f 100644 --- a/shared-doc/run-integration-tests-with-provisioned-server.adoc +++ b/shared-doc/run-integration-tests-with-provisioned-server.adoc @@ -20,10 +20,6 @@ ifndef::deploymentDir[:deploymentTargetDir: target] ifdef::deploymentDir[:deploymentTargetDir: {deploymentDir}/target] endif::deploymentTargetDir[] -ifndef::server_provisioning_server_host[] -:server_provisioning_server_host: http://localhost:8080 -endif::server_provisioning_server_host[] - ifndef::extraStartParams[:extraStartParams: ] ifndef::extraProvisioningTestParams[:extraProvisioningTestParams: ] @@ -60,12 +56,12 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script. ==== endif::[] -. Start the {productName} provisioned server, this time using the {productName} Maven Plugin, which is recommended for testing due to simpler automation. The path to the provisioned server should be specified using the `jbossHome` system property. +. Start the {productName} provisioned server, this time using the {productName} Maven Plugin, which is recommended for testing due to simpler automation. + ifndef::deploymentDir[] [source,subs="attributes+",options="nowrap"] ---- -$ mvn wildfly:start -DjbossHome=target/server {extraStartParams} +$ mvn wildfly:start {extraStartParams} ---- endif::[] ifdef::deploymentDir[] @@ -75,11 +71,11 @@ $ mvn -f {deploymentDir}/pom.xml wildfly:start -DjbossHome={deploymentDir}/targe ---- endif::[] -. Type the following command to run the `verify` goal with the `integration-testing` profile activated, and specifying the quickstart's URL using the `server.host` system property, which for a provisioned server by default is `{server_provisioning_server_host}`. +. Type the following command to run the `verify` goal with the `integration-testing` profile activated. + [source,subs="attributes+",options="nowrap"] ---- -$ mvn verify -Pintegration-testing -Dserver.host={server_provisioning_server_host} {extraProvisioningTestParams} +$ mvn verify -Pintegration-testing {extraProvisioningTestParams} ---- . Shutdown the {productName} provisioned server, this time using the {productName} Maven Plugin too. diff --git a/spring-resteasy/charts/helm.yaml b/spring-resteasy/charts/helm.yaml index b5ee967d47..4d1d940e24 100644 --- a/spring-resteasy/charts/helm.yaml +++ b/spring-resteasy/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: spring-resteasy deploy: replicas: 1 \ No newline at end of file diff --git a/spring-resteasy/pom.xml b/spring-resteasy/pom.xml index b8ed4d8aba..a1968e1d6e 100644 --- a/spring-resteasy/pom.xml +++ b/spring-resteasy/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -121,6 +121,8 @@ + + ${project.artifactId} @@ -148,11 +150,6 @@ * - - ROOT.war @@ -181,11 +178,6 @@ * - - ROOT.war @@ -195,6 +187,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/BasicRuntimeIT.java b/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/BasicRuntimeIT.java index 4b96e7d33c..d28e5616db 100644 --- a/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/BasicRuntimeIT.java +++ b/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/spring-resteasy"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -46,7 +46,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/spring-resteasy")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/ResteasySpringIT.java b/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/ResteasySpringIT.java index 422518a8e7..955bc44f03 100644 --- a/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/ResteasySpringIT.java +++ b/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/ResteasySpringIT.java @@ -42,7 +42,7 @@ public class ResteasySpringIT { static URL url; - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/spring-resteasy"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @BeforeClass public static void setupUrl() throws MalformedURLException { @@ -64,7 +64,7 @@ public void testHelloSpringResource() throws Exception { .setScheme("http") .setHost(url.getHost()) .setPort(url.getPort()) - .setPath(url.getPath() + "/hello") + .setPath("/spring-resteasy/hello") .setParameter("name", "JBoss Developer") .build(); HttpGet method = new HttpGet(uri); @@ -76,7 +76,7 @@ public void testHelloSpringResource() throws Exception { } } { - HttpGet method = new HttpGet(url.toString() + "/basic"); + HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/basic"); try (CloseableHttpResponse response = client.execute(method)) { Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); Assert.assertTrue(EntityUtils.toString(response.getEntity()).contains("basic")); @@ -85,7 +85,7 @@ public void testHelloSpringResource() throws Exception { } } { - HttpPut method = new HttpPut(url.toString() + "/basic"); + HttpPut method = new HttpPut(url.toString() + "/spring-resteasy/basic"); method.setEntity(new StringEntity("basic", ContentType.TEXT_PLAIN)); try (CloseableHttpResponse response = client.execute(method)) { Assert.assertEquals(HttpStatus.SC_NO_CONTENT, response.getStatusLine().getStatusCode()); @@ -98,7 +98,7 @@ public void testHelloSpringResource() throws Exception { .setScheme("http") .setHost(url.getHost()) .setPort(url.getPort()) - .setPath(url.getPath() + "/queryParam") + .setPath("/spring-resteasy/queryParam") .setParameter("param", "hello world") .build(); HttpGet method = new HttpGet(uri); @@ -110,7 +110,7 @@ public void testHelloSpringResource() throws Exception { } } { - HttpGet method = new HttpGet(url.toString() + "/matrixParam;param=matrix"); + HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/matrixParam;param=matrix"); try (CloseableHttpResponse response = client.execute(method)) { Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); Assert.assertEquals("matrix", EntityUtils.toString(response.getEntity())); @@ -119,7 +119,7 @@ public void testHelloSpringResource() throws Exception { } } { - HttpGet method = new HttpGet(url.toString() + "/uriParam/1234"); + HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/uriParam/1234"); try (CloseableHttpResponse response = client.execute(method)) { Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); Assert.assertEquals("1234", EntityUtils.toString(response.getEntity())); @@ -138,7 +138,7 @@ public void testLocatingResource() throws Exception { .setScheme("http") .setHost(url.getHost()) .setPort(url.getPort()) - .setPath(url.getPath() + "/locating/hello") + .setPath("/spring-resteasy/locating/hello") .setParameter("name", "JBoss Developer") .build(); HttpGet method = new HttpGet(uri); @@ -150,7 +150,7 @@ public void testLocatingResource() throws Exception { } } { - HttpGet method = new HttpGet(url.toString() + "/locating/basic"); + HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/locating/basic"); try (CloseableHttpResponse response = client.execute(method)) { Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); Assert.assertTrue(EntityUtils.toString(response.getEntity()).contains("basic")); @@ -159,7 +159,7 @@ public void testLocatingResource() throws Exception { } } { - HttpPut method = new HttpPut(url.toString() + "/locating/basic"); + HttpPut method = new HttpPut(url.toString() + "/spring-resteasy/locating/basic"); method.setEntity(new StringEntity("basic", ContentType.TEXT_PLAIN)); try (CloseableHttpResponse response = client.execute(method)) { Assert.assertEquals(HttpStatus.SC_NO_CONTENT, response.getStatusLine().getStatusCode()); @@ -172,7 +172,7 @@ public void testLocatingResource() throws Exception { .setScheme("http") .setHost(url.getHost()) .setPort(url.getPort()) - .setPath(url.getPath() + "/locating/queryParam") + .setPath("/spring-resteasy/locating/queryParam") .setParameter("param", "hello world") .build(); HttpGet method = new HttpGet(uri); @@ -184,7 +184,7 @@ public void testLocatingResource() throws Exception { } } { - HttpGet method = new HttpGet(url.toString() + "/locating/matrixParam;param=matrix"); + HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/locating/matrixParam;param=matrix"); try (CloseableHttpResponse response = client.execute(method)) { Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); Assert.assertEquals("matrix", EntityUtils.toString(response.getEntity())); @@ -193,7 +193,7 @@ public void testLocatingResource() throws Exception { } } { - HttpGet method = new HttpGet(url.toString() + "/locating/uriParam/1234"); + HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/locating/uriParam/1234"); try (CloseableHttpResponse response = client.execute(method)) { Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); Assert.assertEquals("1234", EntityUtils.toString(response.getEntity())); diff --git a/tasks-jsf/charts/helm.yaml b/tasks-jsf/charts/helm.yaml index 8d30799c9e..ae14e27a5c 100644 --- a/tasks-jsf/charts/helm.yaml +++ b/tasks-jsf/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: tasks-jsf deploy: replicas: 1 \ No newline at end of file diff --git a/tasks-jsf/pom.xml b/tasks-jsf/pom.xml index d522ebcf3b..40800cd4c3 100644 --- a/tasks-jsf/pom.xml +++ b/tasks-jsf/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -113,6 +113,8 @@ + + ${project.artifactId} @@ -146,7 +148,6 @@ h2-datasource jsf - ROOT.war @@ -183,7 +184,6 @@ h2-datasource jsf - ROOT.war @@ -193,6 +193,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/BasicRuntimeIT.java b/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/BasicRuntimeIT.java index 2e5b990a87..95bca3f381 100644 --- a/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/BasicRuntimeIT.java +++ b/tasks-jsf/src/test/java/org/jboss/as/quickstarts/tasksJsf/BasicRuntimeIT.java @@ -32,7 +32,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/tasks-jsf"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -44,7 +44,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/tasks-jsf")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/temperature-converter/charts/helm.yaml b/temperature-converter/charts/helm.yaml index 6cbc340fa1..629e4ca523 100644 --- a/temperature-converter/charts/helm.yaml +++ b/temperature-converter/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: temperature-converter deploy: replicas: 1 \ No newline at end of file diff --git a/temperature-converter/pom.xml b/temperature-converter/pom.xml index fdc3a4a5b1..d58598ba36 100644 --- a/temperature-converter/pom.xml +++ b/temperature-converter/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -105,6 +105,8 @@ + + ${project.artifactId} @@ -138,11 +140,6 @@ ${version.server} - - ROOT.war @@ -167,11 +164,6 @@ ${version.server} cloud - - ROOT.war @@ -181,6 +173,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/BasicRuntimeIT.java b/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/BasicRuntimeIT.java index 2c21a317b7..38d271b550 100644 --- a/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/BasicRuntimeIT.java +++ b/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/temperature-converter"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; public static String getServerHost() { String serverHost = System.getenv("SERVER_HOST"); @@ -49,7 +49,7 @@ public static String getServerHost() { @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(getServerHost()+"/")) + .uri(new URI(getServerHost()+"/temperature-converter")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/TemperatureConverterIT.java b/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/TemperatureConverterIT.java index 1d4a30dd95..69512490a6 100644 --- a/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/TemperatureConverterIT.java +++ b/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/TemperatureConverterIT.java @@ -43,14 +43,14 @@ public void testConvertTemperature() throws Exception { .cookieHandler(manager) .version(HttpClient.Version.HTTP_1_1) .build(); - HttpResponse response = client.send(HttpRequest.newBuilder(new URI(BasicRuntimeIT.getServerHost()+"/temperatureconvert.jsf")).GET().build(), HttpResponse.BodyHandlers.ofString()); + HttpResponse response = client.send(HttpRequest.newBuilder(new URI(BasicRuntimeIT.getServerHost()+"/temperature-converter/temperatureconvert.jsf")).GET().build(), HttpResponse.BodyHandlers.ofString()); String body = response.body().toString(); assertEquals(200, response.statusCode()); assertTrue(body, body.contains(" - 8 + 9 @@ -164,6 +164,8 @@ + + ${project.artifactId} @@ -191,11 +193,6 @@ h2-database:default - - ROOT.war @@ -224,11 +221,6 @@ h2-database:default - - ROOT.war @@ -238,6 +230,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/BasicRuntimeIT.java b/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/BasicRuntimeIT.java index b26b736244..9b43d30e99 100644 --- a/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/BasicRuntimeIT.java +++ b/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/BasicRuntimeIT.java @@ -34,7 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/thread-racing"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -46,7 +46,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/thread-racing")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/ThreadRacingIT.java b/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/ThreadRacingIT.java index 6d51220163..02a32b34fa 100644 --- a/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/ThreadRacingIT.java +++ b/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/ThreadRacingIT.java @@ -44,10 +44,10 @@ public class ThreadRacingIT { protected URI getWebSocketEndpoint() { String host = getServerHost(); if (host == null) { - host = "ws://localhost:8080/thread-racing"; + host = "ws://localhost:8080"; } try { - return new URI(host + "/race"); + return new URI(host + "/thread-racing/race"); } catch (URISyntaxException ex) { throw new RuntimeException(ex); } diff --git a/todo-backend/README-source.adoc b/todo-backend/README-source.adoc index 178382c2b7..7260dd998d 100644 --- a/todo-backend/README-source.adoc +++ b/todo-backend/README-source.adoc @@ -196,15 +196,15 @@ The backend is running, and we can use the HTTP API to manage a list of todos: [source,options="nowrap"] ---- # get a list of todos -$ curl http://localhost:8080 +$ curl http://localhost:8080/todo-backend [] # create a todo with the title "This is my first todo item!" -$ curl -X POST -H "Content-Type: application/json" -d '{"title": "This is my first todo item!"}' http://localhost:8080 +$ curl -X POST -H "Content-Type: application/json" -d '{"title": "This is my first todo item!"}' http://localhost:8080/todo-backend {"completed":false,"id":1,"order":0,"title":"This is my first todo item!","url":"https://localhost:8080/1"}% # get a list of todos with the one that was just created -$ curl http://localhost:8080 +$ curl http://localhost:8080/todo-backend [{"completed":false,"id":1,"order":0,"title":"This is my first todo item!","url":"https://localhost:8080/1"}] ---- diff --git a/todo-backend/additional-readme-cloud.adoc b/todo-backend/additional-readme-cloud.adoc index 86183341b1..22be9968b3 100644 --- a/todo-backend/additional-readme-cloud.adoc +++ b/todo-backend/additional-readme-cloud.adoc @@ -43,15 +43,10 @@ todo-backend-jmesnil1-dev.apps.sandbox.x8i5.p1.openshiftapps.com This value will be different for every installation of the backend. -[WARNING] -==== -Make sure to prepend the host with `https://` to be able to connect to the backend from the ToDo Backend Specs or Client. -The host must also be publicly accessible. -==== +To be able to connect to the backend from the ToDo Backend Specs or Client, then prepend the host with `https://`, and append the relative web context `/todo-backend`. For the previous example host this would be `https://todo-backend-jmesnil1-dev.apps.sandbox.x8i5.p1.openshiftapps.com/todo-backend`. We can verify that this application is properly working as a ToDo Backend by running its https://todobackend.com/specs/index.html[specs] on it. - Once all tests passed, we can use the https://todobackend.com/client/index.html[todobackend client] to have a Web application connected to the backend. [NOTE] diff --git a/todo-backend/charts/values.yaml b/todo-backend/charts/values.yaml index 6757854ac8..84b1697f16 100644 --- a/todo-backend/charts/values.yaml +++ b/todo-backend/charts/values.yaml @@ -21,7 +21,7 @@ postgresql: wildfly: build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: todo-backend deploy: replicas: 1 diff --git a/todo-backend/pom.xml b/todo-backend/pom.xml index daf89bd9e2..9617aa6e32 100644 --- a/todo-backend/pom.xml +++ b/todo-backend/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -66,6 +66,8 @@ + + ${project.artifactId} @@ -147,11 +149,6 @@ postgresql - - ROOT.war @@ -188,11 +185,6 @@ postgresql - - ROOT.war @@ -211,6 +203,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/todo-backend/src/test/java/org/wildfly/quickstarts/todos/RemoteToDoIT.java b/todo-backend/src/test/java/org/wildfly/quickstarts/todos/RemoteToDoIT.java index 617683e7d6..0caa4b7c19 100644 --- a/todo-backend/src/test/java/org/wildfly/quickstarts/todos/RemoteToDoIT.java +++ b/todo-backend/src/test/java/org/wildfly/quickstarts/todos/RemoteToDoIT.java @@ -41,7 +41,7 @@ */ public class RemoteToDoIT { - private static final String REST_TARGET_URL = "http://localhost:8080/todo-backend"; + private static final String REST_TARGET_URL = "http://localhost:8080"; private String getServerHost() { String host = System.getenv("SERVER_HOST"); @@ -57,7 +57,7 @@ URL getRequestUrl() { host = REST_TARGET_URL; } try { - return new URI(host).toURL(); + return new URI(host+"/todo-backend").toURL(); } catch (URISyntaxException | MalformedURLException ex) { throw new RuntimeException(ex); } diff --git a/websocket-endpoint/charts/helm.yaml b/websocket-endpoint/charts/helm.yaml index 6d8c942c6f..98d316c0d0 100644 --- a/websocket-endpoint/charts/helm.yaml +++ b/websocket-endpoint/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: websocket-endpoint deploy: replicas: 2 \ No newline at end of file diff --git a/websocket-endpoint/pom.xml b/websocket-endpoint/pom.xml index 335cb11f0d..2bc387169d 100644 --- a/websocket-endpoint/pom.xml +++ b/websocket-endpoint/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -135,6 +135,8 @@ + + ${project.artifactId} @@ -158,11 +160,6 @@ ${version.server} - - ROOT.war @@ -187,11 +184,6 @@ ${version.server} cloud - - ROOT.war @@ -201,6 +193,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/websocket-endpoint/src/test/java/org/jboss/quickstarts/websocket_endpoint/BasicRuntimeIT.java b/websocket-endpoint/src/test/java/org/jboss/quickstarts/websocket_endpoint/BasicRuntimeIT.java index 3df9d3bd94..000ca40311 100644 --- a/websocket-endpoint/src/test/java/org/jboss/quickstarts/websocket_endpoint/BasicRuntimeIT.java +++ b/websocket-endpoint/src/test/java/org/jboss/quickstarts/websocket_endpoint/BasicRuntimeIT.java @@ -32,8 +32,8 @@ * @author emartins */ public class BasicRuntimeIT { + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/websocket-endpoint"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -45,7 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/websocket-endpoint")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/websocket-endpoint/src/test/java/org/jboss/quickstarts/websocket_endpoint/BidWebSocketEndpointIT.java b/websocket-endpoint/src/test/java/org/jboss/quickstarts/websocket_endpoint/BidWebSocketEndpointIT.java index 910ee40b03..3be03e2484 100644 --- a/websocket-endpoint/src/test/java/org/jboss/quickstarts/websocket_endpoint/BidWebSocketEndpointIT.java +++ b/websocket-endpoint/src/test/java/org/jboss/quickstarts/websocket_endpoint/BidWebSocketEndpointIT.java @@ -46,11 +46,8 @@ public class BidWebSocketEndpointIT { protected URI getWebSocketEndpoint() { String host = getServerHost(); - if (host == null) { - host = "ws://localhost:8080/websocket-endpoint"; - } try { - return new URI(host + "/bidsocket"); + return new URI(host + "/websocket-endpoint/bidsocket"); } catch (URISyntaxException ex) { throw new RuntimeException(ex); } @@ -64,6 +61,9 @@ protected static String getServerHost() { if (host != null) { host = host.replaceFirst("http", "ws"); } + if (host == null) { + host = "ws://localhost:8080"; + } return host; } diff --git a/websocket-hello/charts/helm.yaml b/websocket-hello/charts/helm.yaml index b067d52f5d..f15b8656c7 100644 --- a/websocket-hello/charts/helm.yaml +++ b/websocket-hello/charts/helm.yaml @@ -1,6 +1,6 @@ build: uri: https://github.com/wildfly/quickstart.git - ref: 34.x + ref: main contextDir: websocket-hello deploy: replicas: 2 \ No newline at end of file diff --git a/websocket-hello/pom.xml b/websocket-hello/pom.xml index 126cfaaa1e..5354225228 100644 --- a/websocket-hello/pom.xml +++ b/websocket-hello/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 8 + 9 @@ -86,6 +86,8 @@ + + ${project.artifactId} @@ -109,11 +111,6 @@ ${version.server} - - ROOT.war @@ -138,11 +135,6 @@ ${version.server} cloud - - ROOT.war @@ -152,6 +144,17 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + none + + + diff --git a/websocket-hello/src/test/java/org/jboss/as/quickstarts/websocket_hello/BasicRuntimeIT.java b/websocket-hello/src/test/java/org/jboss/as/quickstarts/websocket_hello/BasicRuntimeIT.java index 0a6958fefb..c76eb99cee 100644 --- a/websocket-hello/src/test/java/org/jboss/as/quickstarts/websocket_hello/BasicRuntimeIT.java +++ b/websocket-hello/src/test/java/org/jboss/as/quickstarts/websocket_hello/BasicRuntimeIT.java @@ -33,7 +33,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/websocket-hello"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -45,7 +45,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti serverHost = DEFAULT_SERVER_HOST; } final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost+"/")) + .uri(new URI(serverHost+"/websocket-hello")) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/websocket-hello/src/test/java/org/jboss/as/quickstarts/websocket_hello/WebSocketHelloIT.java b/websocket-hello/src/test/java/org/jboss/as/quickstarts/websocket_hello/WebSocketHelloIT.java index 97152af5d0..65c206c6cc 100644 --- a/websocket-hello/src/test/java/org/jboss/as/quickstarts/websocket_hello/WebSocketHelloIT.java +++ b/websocket-hello/src/test/java/org/jboss/as/quickstarts/websocket_hello/WebSocketHelloIT.java @@ -35,18 +35,6 @@ */ public class WebSocketHelloIT { - protected URI getWebSocketEndpoint() { - String host = getServerHost(); - if (host == null) { - host = "ws://localhost:8080/websocket-hello"; - } - try { - return new URI(host + "/websocket/helloName"); - } catch (URISyntaxException ex) { - throw new RuntimeException(ex); - } - } - protected static String getServerHost() { String host = System.getenv("SERVER_HOST"); if (host == null) { @@ -55,9 +43,21 @@ protected static String getServerHost() { if (host != null) { host= host.replaceFirst("http", "ws"); } + if (host == null) { + host = "ws://localhost:8080"; + } return host; } + protected URI getWebSocketEndpoint() { + String host = getServerHost(); + try { + return new URI(host + "/websocket-hello/websocket/helloName"); + } catch (URISyntaxException ex) { + throw new RuntimeException(ex); + } + } + @Test public void testConnectOk() throws Exception { testWebSocket(2000);