diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml index 56e3487a40..59e164d708 100644 --- a/.github/workflows/quickstart_ci.yml +++ b/.github/workflows/quickstart_ci.yml @@ -102,15 +102,13 @@ jobs: cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} # Make sure it builds - mvn -fae clean package -Drelease + mvn -fae clean ${{ inputs.MVN_COMMAND }} -Drelease shell: bash - - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with provisioned-server profile + - name: Run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with provisioned-server profile if: ${{ inputs.TEST_PROVISIONED_SERVER }} run: | cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} - echo "Building provisioned server..." - mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pprovisioned-server if [ -f ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh ]; then echo "Add quickstartUser..." ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' @@ -118,19 +116,17 @@ jobs: ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' fi 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 }} + mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} echo "Testing provisioned server..." mvn -fae verify -Pintegration-testing echo "Shutting down provisioned server..." mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown shell: bash - - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with bootable-jar profile + - name: Run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with bootable-jar profile if: ${{ inputs.TEST_BOOTABLE_JAR }} run: | cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} - echo "Building bootable jar..." - mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pbootable-jar 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..." @@ -209,15 +205,13 @@ jobs: run: | cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} - mvn -fae clean package -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean ${{ inputs.MVN_COMMAND }} -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} shell: bash - - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with provisioned-server profile, and built Server version + - name: Run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with provisioned-server profile, and built Server version if: ${{ inputs.TEST_PROVISIONED_SERVER }} run: | cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} - echo "Building provisioned server..." - mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} if [ -f ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh ]; then echo "Add quickstartUser..." ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' @@ -225,19 +219,17 @@ jobs: ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' fi 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 }} + mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} echo "Testing provisioned server..." 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 - - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with bootable-jar profile, and built Server version + - name: Run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with bootable-jar profile, and built Server version if: ${{ inputs.TEST_BOOTABLE_JAR }} run: | cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} - echo "Building bootable jar..." - mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} 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..." diff --git a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml index 203a113502..5b5668672d 100644 --- a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml +++ b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml @@ -66,7 +66,7 @@ jobs: run: | cd quickstarts cd ${{ env.QUICKSTART_PATH }} - mvn -fae clean install -Drelease + mvn -fae clean package -Drelease shell: bash - name: Build, run & test ${{ env.QUICKSTART_PATH }} Quickstart with provisioned-server profile if: ${{ env.TEST_PROVISIONED_SERVER }} @@ -74,12 +74,12 @@ jobs: cd quickstarts cd ${{ env.QUICKSTART_PATH }}/client echo "Building 'client' provisioned server..." - mvn -fae clean package -Pprovisioned-server -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" - mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} + mvn -fae clean package -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" + mvn wildfly:start -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} cd ../server echo "Building 'server' provisioned server..." - mvn -fae clean package -Pprovisioned-server -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 - mvn -fae package -Pprovisioned-server -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 + mvn -fae clean package -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 + mvn -fae package -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 echo "Add quickstartUser to both 'server' builds..." ./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' ./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' @@ -87,8 +87,8 @@ jobs: ./target/server2/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' ./target/server3/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' echo "Starting provisioned server..." - mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server2 -Dwildfly.port=10090 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} - 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}} + mvn wildfly:start -Djboss-as.home=target/server2 -Dwildfly.port=10090 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} + mvn wildfly:start -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 -Pintegration-testing @@ -183,12 +183,12 @@ jobs: cd quickstarts cd ${{ env.QUICKSTART_PATH }}/client echo "Building 'client' provisioned server..." - mvn -fae clean package -Pprovisioned-server -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} - mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn wildfly:start -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} cd ../server echo "Building 'server' provisioned server..." - mvn -fae clean package -Pprovisioned-server -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} - mvn -fae package -Pprovisioned-server -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae package -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} echo "Add quickstartUser to both 'server' builds..." ./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' ./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' @@ -196,8 +196,8 @@ jobs: ./target/server2/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' ./target/server3/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' echo "Starting provisioned server..." - mvn wildfly:start -Pprovisioned-server -Djboss-as.home=target/server2 -Dwildfly.port=10090 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} - 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 }} + mvn wildfly:start -Djboss-as.home=target/server2 -Dwildfly.port=10090 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn wildfly:start -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 -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} diff --git a/batch-processing/README-source.adoc b/batch-processing/README-source.adoc index 1f4573932c..04c6ca8193 100644 --- a/batch-processing/README-source.adoc +++ b/batch-processing/README-source.adoc @@ -132,8 +132,6 @@ INFO [org.jboss.as.quickstarts.batch.job.listener.JobListener] (Batch Thread - . This time you will not fix the file. Just click on *Restart* button again. If you click on *Update jobs list* button, you will see that the job was marked as `ABANDONED` this time because it was restarted once. Notice that there is a new parameter: `restartedOnce=true`. This behavior was implemented in `JobListener` for demonstration purposes, to prevent a `FAILED` job from being restarted twice. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml index 7045419b84..c04088700e 100644 --- a/batch-processing/pom.xml +++ b/batch-processing/pom.xml @@ -196,6 +196,9 @@ provisioned-server + + true + diff --git a/bmt/README-source.adoc b/bmt/README-source.adoc index a884f8da42..c4c4a67e27 100644 --- a/bmt/README-source.adoc +++ b/bmt/README-source.adoc @@ -64,8 +64,6 @@ WFLYJCA0091: -ds.xml file deployments are deprecated. Support may be removed in HHH000431: Unable to determine H2 database version, certain features may not work ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] diff --git a/bmt/pom.xml b/bmt/pom.xml index dcfc41d772..cc6fadf4c5 100644 --- a/bmt/pom.xml +++ b/bmt/pom.xml @@ -137,6 +137,9 @@ provisioned-server + + true + diff --git a/cmt/README-source.adoc b/cmt/README-source.adoc index f362e0b929..d019cede34 100644 --- a/cmt/README-source.adoc +++ b/cmt/README-source.adoc @@ -78,8 +78,6 @@ If an existing customer name is provided, no JMS message is sent. Instead of the The customer name should match: letter & '-', otherwise an error is given. This is to show that a `LogMessage` entity is still stored in the database. That is because the `logCreateCustomer` method in the `LogMessageManagerEJB` EJB is decorated with the `@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)` annotation. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/cmt/pom.xml b/cmt/pom.xml index d60fd96bf6..ce779a1693 100644 --- a/cmt/pom.xml +++ b/cmt/pom.xml @@ -141,6 +141,9 @@ provisioned-server + + true + diff --git a/ee-security/README-source.adoc b/ee-security/README-source.adoc index a7c252be6f..5228518235 100644 --- a/ee-security/README-source.adoc +++ b/ee-security/README-source.adoc @@ -116,8 +116,6 @@ Identity as available from injection 'quickstartUser' The resulting output shows authentication was successful and the correct identity has been established. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] // Restore the {productName} Standalone Server Configuration diff --git a/ee-security/pom.xml b/ee-security/pom.xml index b3efef60fa..c02112b8c4 100644 --- a/ee-security/pom.xml +++ b/ee-security/pom.xml @@ -121,6 +121,9 @@ provisioned-server + + true + diff --git a/ejb-multi-server/README-source.adoc b/ejb-multi-server/README-source.adoc index b047b7606f..252479eded 100644 --- a/ejb-multi-server/README-source.adoc +++ b/ejb-multi-server/README-source.adoc @@ -115,6 +115,7 @@ IMPORTANT: Depending on your machine configuration, you might see "Exception in There are too many additions to the configuration files to list here. Feel free to compare the `domain.xml` and `host.xml` to the backup copies to see the changes made to configure the server to run this quickstart. // Build and Deploy the Quickstart +:integrationTestsDirectory: app-web/src/test/ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+1] [[access_the_remote_client_application]] @@ -174,10 +175,6 @@ An example how to access EJBs from a separate instance which only contains a web . Use a browser to access the Servlet at the following URL: http://localhost:8380/ejb-multi-server-app-web/ . The Servlet will invoke the remote EJBs directly and show the results, compare that the invocation is successful -// Server Distribution Testing -:integrationTestsDirectory: app-web/src/test/ -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] - // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] diff --git a/ejb-remote/README-source.adoc b/ejb-remote/README-source.adoc index 877c2fbaa3..80b83bd1cd 100644 --- a/ejb-remote/README-source.adoc +++ b/ejb-remote/README-source.adoc @@ -46,9 +46,6 @@ include::../shared-doc/start-the-standalone-server.adoc[leveloffset=+2] // Build and Deploy the Quickstart include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+2] -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - === Investigate the Console Output When the client application is run by the EJBRemoteIT tests, it performs the following steps: diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml index 870416839a..5fb8aa8da2 100644 --- a/ejb-remote/pom.xml +++ b/ejb-remote/pom.xml @@ -110,6 +110,9 @@ provisioned-server + + true + diff --git a/ejb-security-context-propagation/README-source.adoc b/ejb-security-context-propagation/README-source.adoc index 5c3f2376b0..d4ebfcf40f 100644 --- a/ejb-security-context-propagation/README-source.adoc +++ b/ejb-security-context-propagation/README-source.adoc @@ -198,9 +198,6 @@ Note that the `http-connector` in the `remoting` subsystem uses this `applicatio // Build and Deploy the Quickstart JAR include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+1] -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - == Investigate the Console Output When you run the integration tests, you see the following output. Note there may be other log messages interspersed between these. @@ -274,8 +271,6 @@ ERROR [org.jboss.as.ejb3.invocation] (default task-57) WFLYEJB0034: EJB Invocati at java.lang.Thread.run(Thread.java:745) ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] // Restore the {productName} Standalone Server Configuration diff --git a/ejb-security-context-propagation/pom.xml b/ejb-security-context-propagation/pom.xml index 8d5d527e16..3963a312b6 100644 --- a/ejb-security-context-propagation/pom.xml +++ b/ejb-security-context-propagation/pom.xml @@ -131,6 +131,9 @@ provisioned-server + + true + diff --git a/ejb-security-programmatic-auth/README-source.adoc b/ejb-security-programmatic-auth/README-source.adoc index f85ce9729a..92668540c8 100644 --- a/ejb-security-programmatic-auth/README-source.adoc +++ b/ejb-security-programmatic-auth/README-source.adoc @@ -123,8 +123,6 @@ Principal has admin permission: true As expected, the `quickstart` user is able to call the methods available for `guest`, but does not have the `admin` permission to call administrative methods on the remote EJB. The `quickstartAdmin` on the other hand has permissions to call both methods. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] // Restore the {productName} Standalone Server Configuration diff --git a/ejb-security-programmatic-auth/pom.xml b/ejb-security-programmatic-auth/pom.xml index f7a3ad9471..ed1c729459 100644 --- a/ejb-security-programmatic-auth/pom.xml +++ b/ejb-security-programmatic-auth/pom.xml @@ -155,6 +155,9 @@ provisioned-server + + true + diff --git a/ejb-throws-exception/README-source.adoc b/ejb-throws-exception/README-source.adoc index bd6a60b36c..a27516bd11 100644 --- a/ejb-throws-exception/README-source.adoc +++ b/ejb-throws-exception/README-source.adoc @@ -81,9 +81,6 @@ The *Response* output text will display the response from the EJB. If the *Name* input text box is not empty, then the *Response* output text will display *Hello * If the *Name* input text box is empty, then the *Response* output text will display the message of the exception throw back from the EJB. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] - // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] diff --git a/ejb-throws-exception/ear/pom.xml b/ejb-throws-exception/ear/pom.xml index 03f1a90773..fdd08f4724 100644 --- a/ejb-throws-exception/ear/pom.xml +++ b/ejb-throws-exception/ear/pom.xml @@ -88,6 +88,9 @@ provisioned-server + + true + diff --git a/ejb-timer/README-source.adoc b/ejb-timer/README-source.adoc index 9781df4b0b..653df0666e 100644 --- a/ejb-timer/README-source.adoc +++ b/ejb-timer/README-source.adoc @@ -83,9 +83,6 @@ INFO [stdout] (EJB default - 1) Timeout received for TimeoutExample[-1065503193 INFO [stdout] (EJB default - 2) Timeout received for TimeoutExample[-1065503193] at 2022-05-04T21:19:06.002358Z ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml index b4a6e1a870..3d68e142d1 100644 --- a/ejb-timer/pom.xml +++ b/ejb-timer/pom.xml @@ -123,6 +123,9 @@ provisioned-server + + true + diff --git a/ejb-txn-remote-call/README-source.adoc b/ejb-txn-remote-call/README-source.adoc index c9cb08b1a3..84df54d659 100644 --- a/ejb-txn-remote-call/README-source.adoc +++ b/ejb-txn-remote-call/README-source.adoc @@ -553,17 +553,17 @@ Instead of using a standard {productName} server distribution, the three {produc [source,sh,subs="+quotes,attributes+",options="nowrap"] ---- cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client; -mvn clean package -Pprovisioned-server \ +mvn clean package \ -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" \ -DpostgresqlUsername="test" -DpostgresqlPassword="test" ---- [source,sh,subs="+quotes,attributes+",options="nowrap"] ---- cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/server; -mvn clean package -Pprovisioned-server \ +mvn clean package \ -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 \ -DpostgresqlUsername="test" -DpostgresqlPassword="test"; -mvn package -Pprovisioned-server \ +mvn package \ -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 \ -DpostgresqlUsername="test" -DpostgresqlPassword="test" ---- @@ -606,7 +606,7 @@ podman run -p 5432:5432 --rm -ePOSTGRES_DB=test -ePOSTGRES_USER=test -ePOSTGRES [source,subs="attributes+",options="nowrap"] ---- cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client; -mvn wildfly:start -Djboss-as.home=target/server \ +mvn wildfly:start \ -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" ---- + @@ -683,8 +683,6 @@ might result in no-ACID transactions. === Prerequisites -include::../shared-doc/cd-create-project.adoc[leveloffset=+3] - [#_install_operator] ==== Install {productName}'s Operator diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml index 2b222f8555..b447893d84 100644 --- a/ejb-txn-remote-call/client/pom.xml +++ b/ejb-txn-remote-call/client/pom.xml @@ -209,15 +209,15 @@ provisioned-server + + true + org.wildfly.plugins wildfly-maven-plugin - client.war - standalone.xml - test java:jboss/datasources/ejbJtaDs @@ -251,7 +251,7 @@ true - target/server + ${project.build.directory}/server @@ -276,10 +276,6 @@ org.wildfly.plugins wildfly-maven-plugin - - client.war - standalone.xml - package @@ -307,7 +303,7 @@ true - ${project.basedir}/target/server + ${project.build.directory}/server diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml index f09b63b30e..8bfe7d6f55 100644 --- a/ejb-txn-remote-call/server/pom.xml +++ b/ejb-txn-remote-call/server/pom.xml @@ -181,8 +181,6 @@ maven-war-plugin - server - false ${project.build.directory}/serverWebAppOutput @@ -193,14 +191,15 @@ provisioned-server + + true + org.wildfly.plugins wildfly-maven-plugin - server.war - standalone-ha.xml test @@ -243,9 +242,6 @@ org.wildfly.plugins wildfly-maven-plugin - - server.war - package @@ -266,7 +262,6 @@ - diff --git a/helloworld-jms/README-source.adoc b/helloworld-jms/README-source.adoc index 09a74c120e..c17274577c 100644 --- a/helloworld-jms/README-source.adoc +++ b/helloworld-jms/README-source.adoc @@ -77,11 +77,6 @@ The following `testQueue` jms-queue was configured in the default server configu ---- - -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] - - === Investigate the Console Output If the Maven command is successful, with the default configuration you will see output similar to this: diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml index 76ee9599fc..cf0c78623d 100644 --- a/helloworld-jms/pom.xml +++ b/helloworld-jms/pom.xml @@ -108,6 +108,9 @@ provisioned-server + + true + diff --git a/helloworld-mdb/README-source.adoc b/helloworld-mdb/README-source.adoc index 5a5a40c4c7..9feca4427b 100644 --- a/helloworld-mdb/README-source.adoc +++ b/helloworld-mdb/README-source.adoc @@ -79,11 +79,8 @@ INFO [class org.jboss.as.quickstarts.mdb.HelloWorldQueueMDB] (Thread-5 (ActiveM INFO [class org.jboss.as.quickstarts.mdb.HelloWorldQueueMDB] (Thread-4 (ActiveMQ-client-global-threads-1189700957)) Received Message from queue: This is message 3 ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] -endif::[] // Build and run sections for other environments/builds ifndef::ProductRelease,EAPXPRelease[] diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml index affcabac11..a9dc238397 100644 --- a/helloworld-mdb/pom.xml +++ b/helloworld-mdb/pom.xml @@ -126,6 +126,9 @@ provisioned-server + + true + diff --git a/helloworld-mutual-ssl-secured/README-source.adoc b/helloworld-mutual-ssl-secured/README-source.adoc index 947f98de08..d4e16e89ea 100644 --- a/helloworld-mutual-ssl-secured/README-source.adoc +++ b/helloworld-mutual-ssl-secured/README-source.adoc @@ -198,6 +198,7 @@ Before you access the application, you must import the _client.keystore.P12_, wh . The certificate is now installed in the Mozilla Firefox browser. // Build and Deploy the Quickstart +:extraStandardDistTestParams: -Dserver.dir=__{jbossHomeName}__ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+1] // Additional deployment information @@ -228,9 +229,6 @@ dzXZz0EjjWCPJk+LVEhEvH0GcWAp3x3irpNU4hRZLd0XomY0Z4NnUt7VMBNYDOxVxgT9qcLnEaEpIfYU ynfnMaOxI67FC2QzhfzERyKqHj47WuwN0xWbS/1gBypS2nUwvItyxaEQG2X5uQY8j8QoY9wcMzIIkP2Mk14gJGHUnA8= ---- -// Server Distribution Testing -:extraStandardDistTestParams: -Dserver.dir=__{jbossHomeName}__ -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] diff --git a/helloworld-mutual-ssl-secured/pom.xml b/helloworld-mutual-ssl-secured/pom.xml index 2aebddb13b..ae036dd9af 100644 --- a/helloworld-mutual-ssl-secured/pom.xml +++ b/helloworld-mutual-ssl-secured/pom.xml @@ -128,6 +128,9 @@ provisioned-server + + true + diff --git a/helloworld-mutual-ssl/README-source.adoc b/helloworld-mutual-ssl/README-source.adoc index 0c79e73d8b..2de95a8c9c 100644 --- a/helloworld-mutual-ssl/README-source.adoc +++ b/helloworld-mutual-ssl/README-source.adoc @@ -145,6 +145,7 @@ Before you access the application, you must import the _client.keystore.P12_, wh . The certificate is now installed in the Mozilla Firefox browser. // Build and Deploy the Quickstart +:extraStandardDistTestParams: -Dserver.dir=__{jbossHomeName}__ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+1] == Access the Application @@ -170,9 +171,6 @@ DHo1uoz5/dzXZz0EjjWCPJk+LVEhEvH0GcWAp3x3irpNU4hRZLd0XomY0Z4NnUt7VMBNYDOxVxgT9qcL aEWK4zhPVFynfnMaOxI67FC2QzhfzERyKqHj47WuwN0xWbS/1gBypS2nUwvItyxaEQG2X5uQY8j8QoY9wcMzIIkP2Mk14gJGHUnA8= ---- -// Server Distribution Testing -:extraStandardDistTestParams: -Dserver.dir=__{jbossHomeName}__ -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] // Restore the {productName} Standalone Server Configuration diff --git a/helloworld-mutual-ssl/pom.xml b/helloworld-mutual-ssl/pom.xml index d031df4eb4..b6f0014faa 100644 --- a/helloworld-mutual-ssl/pom.xml +++ b/helloworld-mutual-ssl/pom.xml @@ -130,6 +130,9 @@ provisioned-server + + true + diff --git a/helloworld-rs/README-source.adoc b/helloworld-rs/README-source.adoc index 6f3ea5de51..c5a35a505e 100644 --- a/helloworld-rs/README-source.adoc +++ b/helloworld-rs/README-source.adoc @@ -35,8 +35,6 @@ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+2] === Access the Application The application will be running at the following URL: http://localhost:8080/{artifactId}/. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/helloworld-rs/pom.xml b/helloworld-rs/pom.xml index 6d8d58a8bd..9f2e2e76c9 100644 --- a/helloworld-rs/pom.xml +++ b/helloworld-rs/pom.xml @@ -106,6 +106,9 @@ provisioned-server + + true + diff --git a/helloworld-singleton/README-source.adoc b/helloworld-singleton/README-source.adoc index e794954c51..7117a7823e 100644 --- a/helloworld-singleton/README-source.adoc +++ b/helloworld-singleton/README-source.adoc @@ -42,8 +42,6 @@ A counter is incremented when you click on the link to the variable name. If you To test the singleton bean, click on either *Increment A* or *Increment B*. The result page will give you the current value of the variable. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml index 783d950718..5646a97817 100644 --- a/helloworld-singleton/pom.xml +++ b/helloworld-singleton/pom.xml @@ -109,6 +109,9 @@ provisioned-server + + true + diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml index c2e0919a72..acad127d0d 100644 --- a/helloworld-ws/pom.xml +++ b/helloworld-ws/pom.xml @@ -128,6 +128,9 @@ provisioned-server + + true + diff --git a/helloworld/README-source.adoc b/helloworld/README-source.adoc index eba3d1109a..775872c41d 100644 --- a/helloworld/README-source.adoc +++ b/helloworld/README-source.adoc @@ -35,8 +35,6 @@ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+2] === Access the Application The application will be running at the following URL: http://localhost:8080/{artifactId}/. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/helloworld/pom.xml b/helloworld/pom.xml index 73c003bf44..04a216b705 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -98,6 +98,9 @@ provisioned-server + + true + diff --git a/hibernate/README-source.adoc b/hibernate/README-source.adoc index 1a7e60bf15..f47690b585 100644 --- a/hibernate/README-source.adoc +++ b/hibernate/README-source.adoc @@ -115,8 +115,6 @@ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+2] The application will be running at the following URL: http://localhost:8080/{artifactId}/. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/hibernate/pom.xml b/hibernate/pom.xml index 2d413d9662..a247fe5cb4 100644 --- a/hibernate/pom.xml +++ b/hibernate/pom.xml @@ -162,6 +162,9 @@ provisioned-server + + true + diff --git a/http-custom-mechanism/webapp/pom.xml b/http-custom-mechanism/webapp/pom.xml index 09830c7a4a..318a52c7cc 100644 --- a/http-custom-mechanism/webapp/pom.xml +++ b/http-custom-mechanism/webapp/pom.xml @@ -70,6 +70,9 @@ provisioned-server + + true + diff --git a/jaxrs-client/README-source.adoc b/jaxrs-client/README-source.adoc index dac6740315..3d009c9194 100644 --- a/jaxrs-client/README-source.adoc +++ b/jaxrs-client/README-source.adoc @@ -34,8 +34,6 @@ include::../shared-doc/use-of-jboss-home-name.adoc[leveloffset=+1] include::../shared-doc/start-the-standalone-server.adoc[leveloffset=+2] // Build and Deploy the Quickstart include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+2] -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 1a2b96de72..d02dad9d34 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -162,6 +162,9 @@ provisioned-server + + true + diff --git a/jaxrs-jwt/README-source.adoc b/jaxrs-jwt/README-source.adoc index 071878a163..786b2aca15 100644 --- a/jaxrs-jwt/README-source.adoc +++ b/jaxrs-jwt/README-source.adoc @@ -126,8 +126,6 @@ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+1] The `JwtAuthIT` test shows how a client can authenticate with the server. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] // Restore the {productName} Standalone Server Configuration diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml index c67c4a273b..f0a1866b79 100644 --- a/jaxrs-jwt/pom.xml +++ b/jaxrs-jwt/pom.xml @@ -161,6 +161,9 @@ provisioned-server + + true + diff --git a/jaxws-ejb/README-source.adoc b/jaxws-ejb/README-source.adoc index 30e558ac37..dc8605ee93 100644 --- a/jaxws-ejb/README-source.adoc +++ b/jaxws-ejb/README-source.adoc @@ -40,8 +40,6 @@ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+2] You can check that the Web Service is running and deployed correctly by accessing the following URL: http://localhost:8080/EJB3Bean?wsdl. This URL will display the deployed WSDL endpoint for the Web Service. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml index 1d478d8372..c5016f70b0 100644 --- a/jaxws-ejb/pom.xml +++ b/jaxws-ejb/pom.xml @@ -137,6 +137,9 @@ provisioned-server + + true + diff --git a/jaxws-retail/README-source.adoc b/jaxws-retail/README-source.adoc index a33e13d3ab..d32c367a7f 100644 --- a/jaxws-retail/README-source.adoc +++ b/jaxws-retail/README-source.adoc @@ -37,8 +37,6 @@ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+1] You can check that the Web Service is running and deployed correctly by accessing the following URL: http://localhost:8080/{artifactId}/ProfileMgmtService/ProfileMgmt?wsdl. This URL will display the deployed WSDL endpoint for the Web Service. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml index 1d6302447a..a56e3060f9 100644 --- a/jaxws-retail/pom.xml +++ b/jaxws-retail/pom.xml @@ -165,6 +165,9 @@ provisioned-server + + true + diff --git a/jsonp/README-source.adoc b/jsonp/README-source.adoc index 3c3a5110a6..2a9427edaf 100644 --- a/jsonp/README-source.adoc +++ b/jsonp/README-source.adoc @@ -42,8 +42,6 @@ Note that the JSON string contains String, number, boolean and array values. . Now, click on the *Parse JSON String using Stream* button. The text area below the button shows the events generated from the parsed JSON string. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/jsonp/pom.xml b/jsonp/pom.xml index 78a1b0ef0b..13c4e50171 100644 --- a/jsonp/pom.xml +++ b/jsonp/pom.xml @@ -150,6 +150,9 @@ provisioned-server + + true + diff --git a/kitchensink/README-source.adoc b/kitchensink/README-source.adoc index 7ee38bef58..e394dd450d 100644 --- a/kitchensink/README-source.adoc +++ b/kitchensink/README-source.adoc @@ -140,8 +140,6 @@ You will see the following warnings in the server log. You can ignore these warn WFLYJCA0091: -ds.xml file deployments are deprecated. Support may be removed in a future version. ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] // Build and run sections for other environments/builds diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml index 486256cc5b..4cb561c523 100644 --- a/kitchensink/pom.xml +++ b/kitchensink/pom.xml @@ -216,6 +216,9 @@ provisioned-server + + true + diff --git a/logging/README-source.adoc b/logging/README-source.adoc index aaf19a4627..55dd5e99c6 100644 --- a/logging/README-source.adoc +++ b/logging/README-source.adoc @@ -132,8 +132,6 @@ TRACE - Turned on in any environment where you are trying to follow an execution . To view log file differences for different logging levels, change the level for the "org.jboss.as.quickstarts.logging" logger from TRACE to DEBUG, INFO, WARN, ERROR, or FATAL, then access the application. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] // Restore the {productName} Standalone Server Configuration diff --git a/logging/pom.xml b/logging/pom.xml index cbb8792d66..5a91efd6f0 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -165,6 +165,9 @@ provisioned-server + + true + diff --git a/mail/README-source.adoc b/mail/README-source.adoc index 15d2a3a308..93fab5955a 100644 --- a/mail/README-source.adoc +++ b/mail/README-source.adoc @@ -156,9 +156,6 @@ NOTE: If you see `Error processing request` in the browser when you access the a NOTE: If you are using the Mail server shipped with this Quickstart and see `Error sending the Email. Invalid Addresses` in the browser when you attempt to send email, make sure you are sending your email to an existing account configured in the Mail Server since by default Apache James demo image is shipped with relay disabled. By default, Apache James demo image has the following accounts configured: user01@james.local, user02@james.local and user03@james.local. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] // Restore the {productName} Standalone Server Configuration diff --git a/mail/pom.xml b/mail/pom.xml index 3d1f9884d3..80d2f93725 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -144,6 +144,9 @@ provisioned-server + + true + diff --git a/messaging-clustering-singleton/README-source.adoc b/messaging-clustering-singleton/README-source.adoc index 82c812a86c..722282cd2a 100644 --- a/messaging-clustering-singleton/README-source.adoc +++ b/messaging-clustering-singleton/README-source.adoc @@ -382,10 +382,6 @@ $ __{jbossHomeName}_2__/bin/jboss-cli.sh --connect controller=localhost:10090 -- NOTE: For Windows, use the `__{jbossHomeName}_1__\bin\jboss-cli.bat` and `__{jbossHomeName}_2__\bin\jboss-cli.bat` scripts. - -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - ==== Run the Integration Tests in a Managed Domain The integration tests may also be run with the domain server by typing the following command. diff --git a/messaging-clustering-singleton/pom.xml b/messaging-clustering-singleton/pom.xml index f218a0f779..9a80033e30 100644 --- a/messaging-clustering-singleton/pom.xml +++ b/messaging-clustering-singleton/pom.xml @@ -125,6 +125,9 @@ provisioned-server + + true + diff --git a/micrometer/README-source.adoc b/micrometer/README-source.adoc index a62e018e99..eb6dd20d18 100644 --- a/micrometer/README-source.adoc +++ b/micrometer/README-source.adoc @@ -257,8 +257,6 @@ prime_timer_count{job="wildfly"} 1 Notice that all four meters registered in the `@PostConstruct` method as well as the `Timer` in our endpoint method have all been published. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] // Restore the {productName} Standalone Server Configuration diff --git a/micrometer/pom.xml b/micrometer/pom.xml index f0f925b2de..0d44969c8b 100644 --- a/micrometer/pom.xml +++ b/micrometer/pom.xml @@ -122,6 +122,9 @@ provisioned-server + + true + @@ -159,6 +162,9 @@ bootable-jar + + true + diff --git a/microprofile-config/README-source.adoc b/microprofile-config/README-source.adoc index 59a0fa7f8c..dd779e7184 100644 --- a/microprofile-config/README-source.adoc +++ b/microprofile-config/README-source.adoc @@ -47,9 +47,6 @@ also go right to the completed example which is available in this directory. // Build and Deploy the Quickstart include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+1] -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml index 8115877045..8e689f308b 100644 --- a/microprofile-config/pom.xml +++ b/microprofile-config/pom.xml @@ -118,6 +118,9 @@ bootable-jar + + true + diff --git a/microprofile-fault-tolerance/README-source.adoc b/microprofile-fault-tolerance/README-source.adoc index b5fc19052b..17740513c1 100644 --- a/microprofile-fault-tolerance/README-source.adoc +++ b/microprofile-fault-tolerance/README-source.adoc @@ -614,9 +614,6 @@ further request processing for the duration of 5 seconds. + See details in the section <>. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml index f9f13f553f..5f42f33ce3 100644 --- a/microprofile-fault-tolerance/pom.xml +++ b/microprofile-fault-tolerance/pom.xml @@ -162,6 +162,9 @@ bootable-jar + + true + diff --git a/microprofile-health/README-source.adoc b/microprofile-health/README-source.adoc index 5a64680b2b..5cd288b763 100644 --- a/microprofile-health/README-source.adoc +++ b/microprofile-health/README-source.adoc @@ -88,12 +88,6 @@ create the application step by step you can follow the subsequent sections. // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - -// Run the Quickstart in Red Hat CodeReady Studio or Eclipse -include::../shared-doc/run-the-quickstart-in-jboss-developer-studio.adoc[leveloffset=+1] - [[creating-new-project]] == Creating the Maven Project diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml index cb9d4d6b76..2be9009ac2 100644 --- a/microprofile-health/pom.xml +++ b/microprofile-health/pom.xml @@ -122,6 +122,9 @@ bootable-jar + + true + diff --git a/microprofile-jwt/README-source.adoc b/microprofile-jwt/README-source.adoc index 414fe814e3..8df47985d7 100644 --- a/microprofile-jwt/README-source.adoc +++ b/microprofile-jwt/README-source.adoc @@ -42,24 +42,10 @@ environment it would be more appropriate to make use of an identity provider to include::../shared-doc/system-requirements.adoc[leveloffset=+1] include::../shared-doc/start-the-standalone-server.adoc[leveloffset=+1] -[[configure_the_server]] -== Configure the Server +// Build and Deploy the Quickstart +include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+1] -One of the benefits of using MicroProfile JWT is that the configuration is contained entirely within the deployment, -for this reason no manual configuration of the server is required to execute the quickstart. - -== Solution - -We recommend that you follow the instructions in the next sections and create the application step by step as this will -provide a better foundation for creating your own MP-JWT secured deployment, however if you want to jump straight to -executing the quickstarts the steps here can be followed to execute the included code. - -The quickstart can be deployed to the running application server using the following command: - - -[source] ----- -mvn package wildfly:deploy ----- +== Using the application An unauthenticated call can be made to one of the deployed endpoints using the following command: - @@ -128,11 +114,6 @@ $ curl -H "Authorization: Bearer ey..XPA" http://localhost:8080/microprofile-jwt This section has been a fast run through of the commands required to deploy the quickstart, generate JWT tokens and call the various endpoints, for further information as to how this was achieved please read through the next section where the process to generate this quickstart from scratch is described step by step. -It is also possible to run each of these calls from the test case included in the quickstart. - -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - == Starting from Scratch In this section we will go through the steps to create a new JAX-RS deployment from scratch and incrementally diff --git a/microprofile-jwt/pom.xml b/microprofile-jwt/pom.xml index 5452f12c50..49d7d32da1 100644 --- a/microprofile-jwt/pom.xml +++ b/microprofile-jwt/pom.xml @@ -179,6 +179,9 @@ bootable-jar + + true + diff --git a/microprofile-lra/README-source.adoc b/microprofile-lra/README-source.adoc index 18e58c0524..54ed17cb3e 100644 --- a/microprofile-lra/README-source.adoc +++ b/microprofile-lra/README-source.adoc @@ -136,9 +136,6 @@ also go right to the completed example which is available in this directory. // Build and Deploy the Quickstart include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+1] -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml index 4a6f4dc39b..36fcd18f5f 100644 --- a/microprofile-lra/pom.xml +++ b/microprofile-lra/pom.xml @@ -128,6 +128,9 @@ bootable-jar + + true + diff --git a/microprofile-openapi/README-source.adoc b/microprofile-openapi/README-source.adoc index 45e5712145..d7c06d48bc 100644 --- a/microprofile-openapi/README-source.adoc +++ b/microprofile-openapi/README-source.adoc @@ -147,9 +147,6 @@ $ echo "mp.openapi.scan.disable=true" > src/main/webapp/META-INF/application.pro + The OpenAPI document model will now be built from the static content rather than annotation processing. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] // Bootable JAR diff --git a/microprofile-openapi/pom.xml b/microprofile-openapi/pom.xml index cada69ab33..13b23c8650 100644 --- a/microprofile-openapi/pom.xml +++ b/microprofile-openapi/pom.xml @@ -86,6 +86,9 @@ bootable-jar + + true + diff --git a/microprofile-reactive-messaging-kafka/README-source.adoc b/microprofile-reactive-messaging-kafka/README-source.adoc index 92541587f0..d917d69c3f 100644 --- a/microprofile-reactive-messaging-kafka/README-source.adoc +++ b/microprofile-reactive-messaging-kafka/README-source.adoc @@ -54,9 +54,6 @@ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+1] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - // Run the Quickstart in Red Hat CodeReady Studio or Eclipse include::../shared-doc/run-the-quickstart-in-jboss-developer-studio.adoc[leveloffset=+1] diff --git a/microprofile-reactive-messaging-kafka/pom.xml b/microprofile-reactive-messaging-kafka/pom.xml index e6f7afe254..88212bb3ab 100644 --- a/microprofile-reactive-messaging-kafka/pom.xml +++ b/microprofile-reactive-messaging-kafka/pom.xml @@ -216,6 +216,9 @@ bootable-jar + + true + diff --git a/microprofile-rest-client/README-source.adoc b/microprofile-rest-client/README-source.adoc index 117f9ab550..d29325fe6c 100644 --- a/microprofile-rest-client/README-source.adoc +++ b/microprofile-rest-client/README-source.adoc @@ -163,9 +163,6 @@ public class CountriesResource { } ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] - // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] diff --git a/microprofile-rest-client/pom.xml b/microprofile-rest-client/pom.xml index 7ec632425e..b10f1dddf8 100644 --- a/microprofile-rest-client/pom.xml +++ b/microprofile-rest-client/pom.xml @@ -194,6 +194,9 @@ bootable-jar + + true + diff --git a/numberguess/README-source.adoc b/numberguess/README-source.adoc index 3284eba714..9c3f0273fc 100644 --- a/numberguess/README-source.adoc +++ b/numberguess/README-source.adoc @@ -36,8 +36,6 @@ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+2] The application will be running at the following URL: http://localhost:8080/{artifactId}/. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/numberguess/pom.xml b/numberguess/pom.xml index 7a0c271e29..699c4fd174 100644 --- a/numberguess/pom.xml +++ b/numberguess/pom.xml @@ -114,6 +114,9 @@ provisioned-server + + true + diff --git a/opentelemetry-tracing/README-source.adoc b/opentelemetry-tracing/README-source.adoc index dcd527218c..263d2dde04 100644 --- a/opentelemetry-tracing/README-source.adoc +++ b/opentelemetry-tracing/README-source.adoc @@ -215,8 +215,6 @@ otel-collector_1 | -> net.sock.host.addr: Str(127.0.0.1) otel-collector_1 | {"kind": "exporter", "data_type": "traces", "name": "logging"} ----- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] // Restore the {productName} Standalone Server Configuration diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml index 8e396935b7..cc1420733b 100644 --- a/opentelemetry-tracing/pom.xml +++ b/opentelemetry-tracing/pom.xml @@ -122,6 +122,9 @@ provisioned-server + + true + @@ -153,6 +156,9 @@ bootable-jar + + true + diff --git a/remote-helloworld-mdb/README-source.adoc b/remote-helloworld-mdb/README-source.adoc index 5e11bf5694..8f23610094 100644 --- a/remote-helloworld-mdb/README-source.adoc +++ b/remote-helloworld-mdb/README-source.adoc @@ -122,9 +122,6 @@ INFO [class org.jboss.as.quickstarts.mdb.HelloWorldQueueMDB] (Thread-5 (ActiveM INFO [class org.jboss.as.quickstarts.mdb.HelloWorldQueueMDB] (Thread-4 (ActiveMQ-client-global-threads-1189700957)) Received Message from queue: This is message 5 ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - // Additional information about this script This script removes the remote broker connection from the `messaging-activemq` subsystem and restore the `default` internal broker. You should see the following result when you run the script: diff --git a/remote-helloworld-mdb/pom.xml b/remote-helloworld-mdb/pom.xml index 9874d24e86..8a939f7d25 100644 --- a/remote-helloworld-mdb/pom.xml +++ b/remote-helloworld-mdb/pom.xml @@ -127,6 +127,9 @@ provisioned-server + + true + diff --git a/security-domain-to-domain/README-source.adoc b/security-domain-to-domain/README-source.adoc index a6b31ef9df..4d5d9484ca 100644 --- a/security-domain-to-domain/README-source.adoc +++ b/security-domain-to-domain/README-source.adoc @@ -242,8 +242,6 @@ Caller Has Role 'Manager'=true This shows that the user `quickstartUser` calls the servlet and has role `User` but does not have the role `Manager`, as the call reaches the EJB the principal is still `quickstartUser` but now the identity does not have the role `User` and instead has the role `Manager`. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] diff --git a/security-domain-to-domain/ear/pom.xml b/security-domain-to-domain/ear/pom.xml index 0c2df86243..474d78e766 100644 --- a/security-domain-to-domain/ear/pom.xml +++ b/security-domain-to-domain/ear/pom.xml @@ -97,6 +97,9 @@ provisioned-server + + true + diff --git a/servlet-async/README-source.adoc b/servlet-async/README-source.adoc index 9ffa3e2fb9..c56a25212f 100644 --- a/servlet-async/README-source.adoc +++ b/servlet-async/README-source.adoc @@ -40,8 +40,6 @@ include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+2] The application will be running at the following URL http://localhost:8080/{artifactId}/. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/servlet-async/pom.xml b/servlet-async/pom.xml index c58cd32006..409b5f8966 100644 --- a/servlet-async/pom.xml +++ b/servlet-async/pom.xml @@ -125,6 +125,9 @@ provisioned-server + + true + diff --git a/servlet-filterlistener/README-source.adoc b/servlet-filterlistener/README-source.adoc index e80ee1183a..9e87ff5ff8 100644 --- a/servlet-filterlistener/README-source.adoc +++ b/servlet-filterlistener/README-source.adoc @@ -87,8 +87,6 @@ INFO [io.undertow.servlet] (default task-50) VowelRemoverFilter done filtering INFO [io.undertow.servlet] (default task-50) ParameterDumpingRequestListener: request has been destroyed ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/servlet-filterlistener/pom.xml b/servlet-filterlistener/pom.xml index a78b18d28b..ae81de76d7 100644 --- a/servlet-filterlistener/pom.xml +++ b/servlet-filterlistener/pom.xml @@ -125,6 +125,9 @@ provisioned-server + + true + diff --git a/servlet-security/README-source.adoc b/servlet-security/README-source.adoc index cc1929fde9..425e95da6f 100644 --- a/servlet-security/README-source.adoc +++ b/servlet-security/README-source.adoc @@ -197,8 +197,6 @@ Now close the browser. Open a new browser and log in with username `guest` and p Forbidden ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml index 5ffddd30c8..2ed9d3a40c 100644 --- a/servlet-security/pom.xml +++ b/servlet-security/pom.xml @@ -124,6 +124,9 @@ provisioned-server + + true + diff --git a/shared-doc/build-and-deploy-the-quickstart.adoc b/shared-doc/build-and-deploy-the-quickstart.adoc index 4da5018b8b..f58b0e9532 100644 --- a/shared-doc/build-and-deploy-the-quickstart.adoc +++ b/shared-doc/build-and-deploy-the-quickstart.adoc @@ -94,3 +94,15 @@ $ mvn wildfly:deploy This deploys the `{archiveDir}/{archiveFileName}` to the running instance of the server. You should see a message in the server log indicating that the archive deployed successfully. + +ifndef::integrationTestsDirectory[:integrationTestsDirectory: src/test/] +ifndef::extraStandardDistTestParams[:extraStandardDistTestParams: ] + +This quickstart includes integration tests, which are located under the `{integrationTestsDirectory}` directory. The integration tests verify that the quickstart runs correctly when deployed on the server. + +. Type the following command to run the `verify` goal with the `integration-testing` profile activated. ++ +[source,subs="attributes+",options="nowrap"] +---- +$ mvn verify -Pintegration-testing {extraStandardDistTestParams} +---- \ No newline at end of file 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 628775223e..e5cb371d59 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 @@ -1,14 +1,31 @@ [[build_and_run_the_quickstart_with_bootable_jar]] -= Building and running the quickstart application in a bootable JAR += Building and Running the quickstart application in a bootable JAR -You can use the WildFly JAR Maven plug-in to build a {productName} bootable JAR to run this quickstart. +include::define-standalone-server-attributes.adoc[] -The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* which configures the bootable JAR building: +ifndef::mavenServerProvisioningCommand[] +ifeval::["{archiveType}"=="ear"] +:mavenServerProvisioningCommand: clean install +endif::[] +ifeval::["{archiveType}"=="war"] +:mavenServerProvisioningCommand: clean package +endif::[] +ifeval::["{archiveType}"=="jar"] +:mavenServerProvisioningCommand: clean install +endif::[] +endif::mavenServerProvisioningCommand[] + +You can use the WildFly Maven Plugin to build a {productName} bootable JAR to run this quickstart. + +The quickstart `pom.xml` file contains a Maven profile named *bootable-jar*, which configures the bootable JAR building: [source,xml,subs="attributes+"] ---- bootable-jar + + true + @@ -34,37 +51,35 @@ The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* whic ---- -The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers. - -If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available: -[source,shell] ----- -wildfly-glow show-add-ons ----- +The *bootable-jar* profile is activate by default, and when built the {productName} bootable jar may be found at `target/{artifactId}-bootable.jar` .Procedure -. Build the quickstart bootable JAR with the following command: +. Ensure the bootable jar is built. + [source,subs="attributes+",options="nowrap"] ---- -$ mvn clean package -Pbootable-jar +$ mvn clean {mavenServerProvisioningCommand} ---- -. Run the quickstart application contained in the bootable JAR: +. Start the {productName} bootable jar use the WildFly Maven Plugin `start-jar` goal. + [source,subs="attributes+",options="nowrap"] ---- -ifdef::uses-jaeger[] -$ JAEGER_REPORTER_LOG_SPANS=true JAEGER_SAMPLER_TYPE=const JAEGER_SAMPLER_PARAM=1 java -jar target/{artifactId}-bootable.jar -endif::uses-jaeger[] -ifndef::uses-jaeger[] -$ java -jar target/{artifactId}-bootable.jar -endif::uses-jaeger[] +$ mvn wildfly:start-jar ---- -. You can now interact with the quickstart application. +. Run the integration tests use the `verify` goal, with the `integration-testing` profile activated. ++ +[source,subs="attributes+",options="nowrap"] +---- +$ mvn verify -Pintegration-testing +---- -// Bootable Jar Testing -include::../shared-doc/run-integration-tests-with-bootable-jar.adoc[leveloffset=+1] \ No newline at end of file +. Shut down the {productName} bootable jar use the WildFly Maven Plugin `shutdown` goal. ++ +[source,options="nowrap"] +---- +$ mvn wildfly:shutdown +---- \ 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 3a9bee8141..06bb84a874 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 @@ -18,45 +18,18 @@ ifndef::deploymentDir[:deploymentTargetDir: target] ifdef::deploymentDir[:deploymentTargetDir: {deploymentDir}/target] endif::deploymentTargetDir[] -Instead of using a standard {productName} server distribution, you can alternatively provision a {productName} server to deploy and run the quickstart, by activating the Maven profile named `provisioned-server` when building the quickstart: +ifndef::extraStartParams[:extraStartParams: ] +ifndef::extraProvisioningTestParams[:extraProvisioningTestParams: ] -[source,subs="attributes+",options="nowrap"] ----- -$ mvn {mavenServerProvisioningCommand} -Pprovisioned-server ----- - -The provisioned {productName} server, with the quickstart deployed, can then be found in the `{deploymentTargetDir}/server` directory, and its usage is similar to a standard server distribution, with the simplification that there is never the need to specify the server configuration to be started. - -ifdef::addQuickstartUser[] -The quickstart user should be added before running the provisioned server: -[source,subs="+quotes,attributes+",options="nowrap"] ----- -$ {deploymentTargetDir}/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' {app-group-command} ----- -[NOTE] -==== -For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script. -==== -endif::[] - -ifdef::addQuickstartAdmin[] -The quickstart admin should be added before running the provisioned server: -[source,subs="+quotes,attributes+",options="nowrap"] ----- -$ {deploymentTargetDir}/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' {admin-group-command} ----- -[NOTE] -==== -For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script. -==== -endif::[] - -The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`: +Instead of using a standard {productName} server distribution, you can alternatively provision a {productName} server to deploy and run the quickstart. The functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`: [source,xml,subs="attributes+"] ---- provisioned-server + + true + @@ -81,14 +54,75 @@ The server provisioning functionality is provided by the WildFly Maven Plugin, a ---- -The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers. -If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available: +When built, the provisioned {productName} server can be found in the `{deploymentTargetDir}/server` directory, and its usage is similar to a standard server distribution, with the simplification that there is never the need to specify the server configuration to be started. + +Follow these steps to run the quickstart using the provisioned server. + +.Procedure + +. Make sure the server is provisioned. ++ +[source,subs="attributes+",options="nowrap"] +---- +$ mvn {mavenServerProvisioningCommand} +---- + +ifdef::addQuickstartUser[] +. Add the quickstart user: ++ +[source,subs="+quotes,attributes+",options="nowrap"] +---- +$ {deploymentTargetDir}/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' {app-group-command} +---- +endif::[] + +ifdef::addQuickstartAdmin[] +. Add the quickstart admin: ++ +[source,subs="+quotes,attributes+",options="nowrap"] +---- +$ {deploymentTargetDir}/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' {admin-group-command} +---- +[NOTE] +==== +For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script. +==== +endif::[] -[source,shell] +. Start the {productName} provisioned server, using the WildFly Maven Plugin `start` goal. ++ +ifndef::deploymentDir[] +[source,subs="attributes+",options="nowrap"] +---- +$ mvn wildfly:start {extraStartParams} +---- +endif::[] +ifdef::deploymentDir[] +[source,subs="attributes+",options="nowrap"] ---- -wildfly-glow show-add-ons +$ mvn -f {deploymentDir}/pom.xml wildfly:start {extraStartParams} ---- +endif::[] -// Server Provisioning Testing -include::../shared-doc/run-integration-tests-with-provisioned-server.adoc[leveloffset=+1] +. Type the following command to run the integration tests. ++ +[source,subs="attributes+",options="nowrap"] +---- +$ mvn verify -Pintegration-testing {extraProvisioningTestParams} +---- + +. Shut down the {productName} provisioned server. ++ +ifndef::deploymentDir[] +[source,subs="attributes+",options="nowrap"] +---- +$ mvn wildfly:shutdown +---- +endif::[] +ifdef::deploymentDir[] +[source,subs="attributes+",options="nowrap"] +---- +$ mvn -f {deploymentDir}/pom.xml wildfly:shutdown +---- +endif::[] \ No newline at end of file diff --git a/shared-doc/run-integration-tests-with-bootable-jar.adoc b/shared-doc/run-integration-tests-with-bootable-jar.adoc deleted file mode 100644 index 818b3bd289..0000000000 --- a/shared-doc/run-integration-tests-with-bootable-jar.adoc +++ /dev/null @@ -1,36 +0,0 @@ -[[run_the_integration_tests_with_bootable_jar_]] -= Run the Integration Tests with a bootable jar - -include::define-standalone-server-attributes.adoc[] - -The integration tests included with this quickstart, which verify that the quickstart runs correctly, may also be run with a bootable jar. - -Follow these steps to run the integration tests. - -. Make sure the bootable jar is provisioned. -+ -[source,subs="attributes+",options="nowrap"] ----- -$ mvn clean package -Pbootable-jar ----- - -. Start the {productName} bootable jar, this time using the {productName} Maven Jar Plugin, which is recommend for testing due to simpler automation. -+ -[source,subs="attributes+",options="nowrap"] ----- -$ mvn wildfly:start-jar ----- - -. Type the following command to run the `verify` goal with the `integration-testing` profile activated. -+ -[source,subs="attributes+",options="nowrap"] ----- -$ mvn verify -Pintegration-testing ----- - -. Shutdown the {productName} bootable jar, this time using the {productName} Maven Jar Plugin too. -+ -[source,options="nowrap"] ----- -$ mvn wildfly:shutdown ----- \ No newline at end of file diff --git a/shared-doc/run-integration-tests-with-provisioned-server.adoc b/shared-doc/run-integration-tests-with-provisioned-server.adoc deleted file mode 100644 index d82278745f..0000000000 --- a/shared-doc/run-integration-tests-with-provisioned-server.adoc +++ /dev/null @@ -1,94 +0,0 @@ -[[run_the_integration_tests_with_provisioned_server_]] -= Run the Integration Tests with a provisioned server - -include::define-standalone-server-attributes.adoc[] - -ifndef::mavenServerProvisioningCommand[] -ifeval::["{archiveType}"=="ear"] -:mavenServerProvisioningCommand: clean install -endif::[] -ifeval::["{archiveType}"=="war"] -:mavenServerProvisioningCommand: clean package -endif::[] -ifeval::["{archiveType}"=="jar"] -:mavenServerProvisioningCommand: clean install -endif::[] -endif::mavenServerProvisioningCommand[] - -ifndef::deploymentTargetDir[] -ifndef::deploymentDir[:deploymentTargetDir: target] -ifdef::deploymentDir[:deploymentTargetDir: {deploymentDir}/target] -endif::deploymentTargetDir[] - -ifndef::extraStartParams[:extraStartParams: ] -ifndef::extraProvisioningTestParams[:extraProvisioningTestParams: ] - -The integration tests included with this quickstart, which verify that the quickstart runs correctly, may also be run with a provisioned server. - -Follow these steps to run the integration tests. - -. Make sure the server is provisioned. -+ -[source,subs="attributes+",options="nowrap"] ----- -$ mvn {mavenServerProvisioningCommand} -Pprovisioned-server ----- - -ifdef::addQuickstartUser[] -. Add the quickstart user: -+ -[source,subs="+quotes,attributes+",options="nowrap"] ----- -$ {deploymentTargetDir}/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' {app-group-command} ----- -endif::[] - -ifdef::addQuickstartAdmin[] -. Add the quickstart admin: -+ -[source,subs="+quotes,attributes+",options="nowrap"] ----- -$ {deploymentTargetDir}/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' {admin-group-command} ----- -[NOTE] -==== -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. -+ -ifndef::deploymentDir[] -[source,subs="attributes+",options="nowrap"] ----- -$ mvn wildfly:start {extraStartParams} ----- -endif::[] -ifdef::deploymentDir[] -[source,subs="attributes+",options="nowrap"] ----- -$ mvn -f {deploymentDir}/pom.xml wildfly:start -DjbossHome={deploymentDir}/target/server {extraStartParams} ----- -endif::[] - -. Type the following command to run the `verify` goal with the `integration-testing` profile activated. -+ -[source,subs="attributes+",options="nowrap"] ----- -$ mvn verify -Pintegration-testing {extraProvisioningTestParams} ----- - -. Shutdown the {productName} provisioned server, this time using the {productName} Maven Plugin too. -+ -ifndef::deploymentDir[] -[source,subs="attributes+",options="nowrap"] ----- -$ mvn wildfly:shutdown ----- -endif::[] -ifdef::deploymentDir[] -[source,subs="attributes+",options="nowrap"] ----- -$ mvn -f {deploymentDir}/pom.xml wildfly:shutdown ----- -endif::[] \ No newline at end of file diff --git a/spring-resteasy/README-source.adoc b/spring-resteasy/README-source.adoc index 1ed180f4f2..5356bb5ec8 100644 --- a/spring-resteasy/README-source.adoc +++ b/spring-resteasy/README-source.adoc @@ -66,8 +66,6 @@ WARN [org.jboss.as.ee] (MSC service thread 1-5) WFLYEE0007: Not installing opti WARN [org.jboss.as.ee] (MSC service thread 1-5) WFLYEE0007: Not installing optional component org.springframework.web.context.request.async.StandardServletAsyncWebRequest due to an exception (enable DEBUG log level to see the cause) ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/spring-resteasy/pom.xml b/spring-resteasy/pom.xml index a1968e1d6e..09dc7bfd9e 100644 --- a/spring-resteasy/pom.xml +++ b/spring-resteasy/pom.xml @@ -137,6 +137,9 @@ provisioned-server + + true + diff --git a/tasks-jsf/README-source.adoc b/tasks-jsf/README-source.adoc index 979493c391..2c45d3d465 100644 --- a/tasks-jsf/README-source.adoc +++ b/tasks-jsf/README-source.adoc @@ -60,8 +60,6 @@ WFLYJCA0091: -ds.xml file deployments are deprecated. Support may be removed in HHH000431: Unable to determine H2 database version, certain features may not work ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/tasks-jsf/pom.xml b/tasks-jsf/pom.xml index 40800cd4c3..63ecf66a91 100644 --- a/tasks-jsf/pom.xml +++ b/tasks-jsf/pom.xml @@ -129,6 +129,9 @@ provisioned-server + + true + diff --git a/temperature-converter/README-source.adoc b/temperature-converter/README-source.adoc index 058dc16c68..815813ba6a 100644 --- a/temperature-converter/README-source.adoc +++ b/temperature-converter/README-source.adoc @@ -50,8 +50,6 @@ You will be presented with a simple form for temperature conversion. . Enter a temperature. . Press the `Convert` button to see the results. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/temperature-converter/pom.xml b/temperature-converter/pom.xml index d58598ba36..b5c3e2e027 100644 --- a/temperature-converter/pom.xml +++ b/temperature-converter/pom.xml @@ -131,6 +131,9 @@ provisioned-server + + true + diff --git a/thread-racing/README-source.adoc b/thread-racing/README-source.adoc index 6ef7e33e57..399e2f010c 100644 --- a/thread-racing/README-source.adoc +++ b/thread-racing/README-source.adoc @@ -63,8 +63,6 @@ The application will be running at the following URL http://localhost:8080/{arti To start a race press the `Insert Coin` button. The page displays the names of the threads as they join the race. It then tracks the progress of each thread through the Batch, EE Concurrency, JAX-RS, JMS, and JSON stages of the race. Finally, it displays the official race results and championship standings. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/thread-racing/pom.xml b/thread-racing/pom.xml index dfcbacde32..cb2adb7429 100644 --- a/thread-racing/pom.xml +++ b/thread-racing/pom.xml @@ -180,6 +180,9 @@ provisioned-server + + true + diff --git a/todo-backend/README-source.adoc b/todo-backend/README-source.adoc index 7260dd998d..9d66d67277 100644 --- a/todo-backend/README-source.adoc +++ b/todo-backend/README-source.adoc @@ -191,7 +191,14 @@ With the PostgreSQL database running, we can start the backend by passing the re $ ./target/server/bin/standalone.sh -Denv.POSTGRESQL_DATABASE=todos -Denv.POSTGRESQL_DATASOURCE=ToDos -Denv.POSTGRESQL_SERVICE_HOST=localhost -Denv.POSTGRESQL_SERVICE_PORT=5432 -Denv.POSTGRESQL_USER=todos -Denv.POSTGRESQL_PASSWORD=mysecretpassword ---- -The backend is running, and we can use the HTTP API to manage a list of todos: +The backend is now running, let's verify it is working as expected by running the integration tests: + +[source,subs="attributes+",options="nowrap"] +---- +$ mvn verify -Pintegration-testing +---- + +Now let's use the HTTP API to manage a list of todos: [source,options="nowrap"] ---- @@ -208,9 +215,6 @@ $ curl http://localhost:8080/todo-backend [{"completed":false,"id":1,"order":0,"title":"This is my first todo item!","url":"https://localhost:8080/1"}] ---- -:extraStartParams: -DPOSTGRESQL_DATABASE=todos -DPOSTGRESQL_SERVICE_HOST=localhost -DPOSTGRESQL_SERVICE_PORT=5432 -DPOSTGRESQL_USER=todos -DPOSTGRESQL_PASSWORD=mysecretpassword -DPOSTGRESQL_DATASOURCE=ToDos -include::../shared-doc/run-integration-tests-with-provisioned-server.adoc[leveloffset=+1] - //=========================================================== // Openshift - START == Run the Backend on OpenShift diff --git a/todo-backend/pom.xml b/todo-backend/pom.xml index 9617aa6e32..e8f34e1d5d 100644 --- a/todo-backend/pom.xml +++ b/todo-backend/pom.xml @@ -137,6 +137,9 @@ provisioned-server + + true + diff --git a/websocket-endpoint/README-source.adoc b/websocket-endpoint/README-source.adoc index 298d2dbd50..82497f5382 100644 --- a/websocket-endpoint/README-source.adoc +++ b/websocket-endpoint/README-source.adoc @@ -48,8 +48,6 @@ You should open the application URL in other browsers or tabs. You will notice t You can restart the bidding if you click on `Reset bidding` button. -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/websocket-endpoint/pom.xml b/websocket-endpoint/pom.xml index 2bc387169d..a67b851cae 100644 --- a/websocket-endpoint/pom.xml +++ b/websocket-endpoint/pom.xml @@ -151,6 +151,9 @@ provisioned-server + + true + diff --git a/websocket-hello/README-source.adoc b/websocket-hello/README-source.adoc index 692e1a4e4e..5eb2d9f7ca 100644 --- a/websocket-hello/README-source.adoc +++ b/websocket-hello/README-source.adoc @@ -54,8 +54,6 @@ The application will be running at the following URL: http://localhost:8080/{art WebSocket connection is not established. Please click the Open Connection button. ---- -// Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] diff --git a/websocket-hello/pom.xml b/websocket-hello/pom.xml index 5354225228..0b41c277cd 100644 --- a/websocket-hello/pom.xml +++ b/websocket-hello/pom.xml @@ -102,6 +102,9 @@ provisioned-server + + true +