diff --git a/.github/workflows/project_ci.yml b/.github/workflows/project_ci.yml index b2b5dd7ed0..7e7521e60d 100644 --- a/.github/workflows/project_ci.yml +++ b/.github/workflows/project_ci.yml @@ -31,7 +31,7 @@ jobs: - name: Build Quickstarts Release run: | cd quickstarts - mvn -U -B -fae clean install -Drelease + mvn -U -B -fae clean install -Drelease -P-provisioned-server,-bootable-jar shell: bash - uses: actions/upload-artifact@v4 if: failure() @@ -76,7 +76,7 @@ jobs: - name: Build Quickstarts Release with Server and BOMs Versions run: | cd quickstarts - mvn -U -B -fae clean install -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -U -B -fae clean install -Drelease -P-provisioned-server,-bootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} shell: bash - uses: actions/upload-artifact@v4 if: failure() 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/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/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/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/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-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..385587f3dd 100644 --- a/ejb-security-context-propagation/README-source.adoc +++ b/ejb-security-context-propagation/README-source.adoc @@ -199,7 +199,7 @@ Note that the `http-connector` in the `remoting` subsystem uses this `applicatio 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] +include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] == Investigate the Console Output @@ -274,8 +274,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..821aeac1d3 100644 --- a/ejb-security-programmatic-auth/README-source.adoc +++ b/ejb-security-programmatic-auth/README-source.adoc @@ -124,7 +124,7 @@ 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] +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 @@ -141,8 +141,6 @@ process-state: reload-required // Restore the {productName} Standalone Server Configuration Manually include::../shared-doc/restore-standalone-server-configuration-manual.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] // Additional Red Hat CodeReady Studio instructions * Make sure you xref:add_the_application_management_users[add the authorized application and management users] as described above. @@ -169,8 +167,6 @@ Principal has admin permission: true * Make sure you xref:restore_the_server_configuration[restore the {productName} standalone server configuration] when you have completed testing this quickstart. -// Debug the Application -include::../shared-doc/debug-the-application.adoc[leveloffset=+1] // Build and run sections for other environments/builds ifndef::ProductRelease,EAPXPRelease[] include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1] 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..fca363f3dd 100644 --- a/ejb-throws-exception/README-source.adoc +++ b/ejb-throws-exception/README-source.adoc @@ -83,7 +83,6 @@ If the *Name* input text box is empty, then the *Response* output text will disp // 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..15d820aa8c 100644 --- a/ejb-timer/README-source.adoc +++ b/ejb-timer/README-source.adoc @@ -84,8 +84,7 @@ INFO [stdout] (EJB default - 2) Timeout received for TimeoutExample[-1065503193 ---- // Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] - +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-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/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..fd437b3a63 100644 --- a/helloworld-mdb/README-source.adoc +++ b/helloworld-mdb/README-source.adoc @@ -83,7 +83,6 @@ INFO [class org.jboss.as.quickstarts.mdb.HelloWorldQueueMDB] (Thread-4 (ActiveM 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..2d2c342230 100644 --- a/helloworld-mutual-ssl-secured/README-source.adoc +++ b/helloworld-mutual-ssl-secured/README-source.adoc @@ -230,7 +230,7 @@ ynfnMaOxI67FC2QzhfzERyKqHj47WuwN0xWbS/1gBypS2nUwvItyxaEQG2X5uQY8j8QoY9wcMzIIkP2M // Server Distribution Testing :extraStandardDistTestParams: -Dserver.dir=__{jbossHomeName}__ -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] +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/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..50044d59d7 100644 --- a/helloworld-mutual-ssl/README-source.adoc +++ b/helloworld-mutual-ssl/README-source.adoc @@ -172,7 +172,7 @@ aEWK4zhPVFynfnMaOxI67FC2QzhfzERyKqHj47WuwN0xWbS/1gBypS2nUwvItyxaEQG2X5uQY8j8QoY9 // Server Distribution Testing :extraStandardDistTestParams: -Dserver.dir=__{jbossHomeName}__ -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] +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/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/pom.xml b/helloworld-rs/pom.xml index 91472d51e7..05d3e21ffe 100644 --- a/helloworld-rs/pom.xml +++ b/helloworld-rs/pom.xml @@ -110,6 +110,9 @@ provisioned-server + + true + 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/README-source.adoc b/helloworld-ws/README-source.adoc index f4c53a3959..5462ba33a7 100644 --- a/helloworld-ws/README-source.adoc +++ b/helloworld-ws/README-source.adoc @@ -50,6 +50,8 @@ JBWS024061: Adding service endpoint metadata: id=org.jboss.as.quickstarts.wshell You can verify that the Web Service is running and deployed correctly by accessing the following URL: http://localhost:8080/HelloWorldService?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/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/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..bbc713fa3d 100644 --- a/hibernate/README-source.adoc +++ b/hibernate/README-source.adoc @@ -117,6 +117,7 @@ The application will be running at the following URL: http://localhost:8080/{art // 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/README-source.adoc b/http-custom-mechanism/README-source.adoc index 7e5fd2b0cd..40acf5a1e7 100644 --- a/http-custom-mechanism/README-source.adoc +++ b/http-custom-mechanism/README-source.adoc @@ -218,6 +218,8 @@ You should see the HTTP result `HTTP/1.1 200 OK`, along with some header informa ---- +// 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 Manually diff --git a/http-custom-mechanism/add-custom-module.cli b/http-custom-mechanism/add-custom-module.cli index c238411dca..da43c69d65 100644 --- a/http-custom-mechanism/add-custom-module.cli +++ b/http-custom-mechanism/add-custom-module.cli @@ -1,3 +1,3 @@ # Add the custom module to the server - +# If you need to change this command please change also in webapp/pom.xml module add --name=org.jboss.as.quickstart.http_custom_mechanism.custom-http-mechanism --resources=custom-module/target/custom-module.jar --dependencies=org.wildfly.security.elytron diff --git a/http-custom-mechanism/webapp/pom.xml b/http-custom-mechanism/webapp/pom.xml index 09830c7a4a..9022b2a624 100644 --- a/http-custom-mechanism/webapp/pom.xml +++ b/http-custom-mechanism/webapp/pom.xml @@ -70,6 +70,9 @@ provisioned-server + + true + @@ -84,10 +87,14 @@ + + + module add --name=org.jboss.as.quickstart.http_custom_mechanism.custom-http-mechanism --resources=${project.basedir}/../custom-module/target/custom-module.jar --dependencies=org.wildfly.security.elytron + - + true diff --git a/jaxrs-client/README-source.adoc b/jaxrs-client/README-source.adoc index dac6740315..edf959f768 100644 --- a/jaxrs-client/README-source.adoc +++ b/jaxrs-client/README-source.adoc @@ -36,8 +36,6 @@ include::../shared-doc/start-the-standalone-server.adoc[leveloffset=+2] 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] === Investigate the Console Output @@ -62,6 +60,9 @@ When you run the integration tests, Maven prints summary of the performed tests [INFO] Tests run: 20, Failures: 0, Errors: 0, Skipped: 0 ---- +// Undeploy the Quickstart +include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] + // Build and run sections for other environments/builds ifndef::ProductRelease,EAPXPRelease[] include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1] 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..0ba7517ac0 100644 --- a/jaxrs-jwt/README-source.adoc +++ b/jaxrs-jwt/README-source.adoc @@ -127,7 +127,7 @@ 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] +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 @@ -145,8 +145,6 @@ process-state: reload-required // Restore the {productName} Standalone Server Configuration Manually include::../shared-doc/restore-standalone-server-configuration-manual.adoc[leveloffset=+2] -// Debug the Application -include::../shared-doc/debug-the-application.adoc[leveloffset=+1] ifndef::ProductRelease,EAPXPRelease[] include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1] 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/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..e8375c7c1f 100644 --- a/jaxws-retail/README-source.adoc +++ b/jaxws-retail/README-source.adoc @@ -28,19 +28,16 @@ include::../shared-doc/system-requirements.adoc[leveloffset=+1] include::../shared-doc/use-of-jboss-home-name.adoc[leveloffset=+1] // Start the {productName} Standalone Server include::../shared-doc/start-the-standalone-server.adoc[leveloffset=+1] - // Build and Deploy the Quickstart include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+1] - == Access the Application - 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] +include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] // Undeploy the Quickstart -include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] +include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] // Build and run sections for other environments/builds ifndef::ProductRelease,EAPXPRelease[] 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/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/jta-crash-rec/README-source.adoc b/jta-crash-rec/README-source.adoc index 50c13fa822..7173e6d800 100644 --- a/jta-crash-rec/README-source.adoc +++ b/jta-crash-rec/README-source.adoc @@ -183,6 +183,8 @@ 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] // Run the Quickstart in Red Hat CodeReady Studio or Eclipse 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/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..45cddc992b 100644 --- a/mail/README-source.adoc +++ b/mail/README-source.adoc @@ -157,8 +157,7 @@ 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] - +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/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/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..7dcec08530 100644 --- a/microprofile-config/README-source.adoc +++ b/microprofile-config/README-source.adoc @@ -48,7 +48,7 @@ also go right to the completed example which is available in this directory. 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] +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-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..efe5c03250 100644 --- a/microprofile-fault-tolerance/README-source.adoc +++ b/microprofile-fault-tolerance/README-source.adoc @@ -616,7 +616,6 @@ See details in the section < bootable-jar + + true + diff --git a/microprofile-health/README-source.adoc b/microprofile-health/README-source.adoc index 5a64680b2b..691ac88620 100644 --- a/microprofile-health/README-source.adoc +++ b/microprofile-health/README-source.adoc @@ -82,18 +82,11 @@ declared health check procedures. NOTE: Similarly, you can access `http://localhost:9990/health/ready`, `http://localhost:9990/health/started`, and `http://localhost:9990/health` -Congratulations! You successfully deployed and run this quickstart. If you wish to -create the application step by step you can follow the subsequent sections. - +// 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] -// 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..c568518e43 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: - @@ -125,13 +111,10 @@ $ curl -H "Authorization: Bearer ey..XPA" http://localhost:8080/microprofile-jwt 7 months and 19 days until your next birthday. ---- -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] +include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] +// Undeploy the Quickstart +include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] == Starting from Scratch @@ -203,7 +186,7 @@ Before the dependencies are defined add the following boms. ---- -By using boms the majority of dependencies used within this quickstart align with the version uses by the application server. +By using BOMs the majority of dependencies used within this quickstart align with the version uses by the application server. The following dependencies can now be added to the project. 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..915b5071ea 100644 --- a/microprofile-lra/README-source.adoc +++ b/microprofile-lra/README-source.adoc @@ -137,7 +137,7 @@ also go right to the completed example which is available in this directory. 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] +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-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..89dc17cb52 100644 --- a/microprofile-openapi/README-source.adoc +++ b/microprofile-openapi/README-source.adoc @@ -148,8 +148,8 @@ $ 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/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] +// Undeploy the Quickstart 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..f92d4eb7af 100644 --- a/microprofile-reactive-messaging-kafka/README-source.adoc +++ b/microprofile-reactive-messaging-kafka/README-source.adoc @@ -50,16 +50,12 @@ CAUTION: Kafka must be running before attempting to deploy the Quickstart applic // 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=+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] - [[creating-new-project]] == Creating the Maven Project 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..a97d67a0f0 100644 --- a/microprofile-rest-client/README-source.adoc +++ b/microprofile-rest-client/README-source.adoc @@ -165,7 +165,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/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..6db8f100a7 100644 --- a/opentelemetry-tracing/README-source.adoc +++ b/opentelemetry-tracing/README-source.adoc @@ -216,7 +216,7 @@ otel-collector_1 | {"kind": "exporter", "data_type": "traces", "name": "log ----- // Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] +include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] // 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..b528ea22d5 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: @@ -137,15 +134,18 @@ This script removes the remote broker connection from the `messaging-activemq` s } ---- -// Restore the {productName} Standalone Server Configuration Manually -include::../shared-doc/restore-standalone-server-configuration-manual.adoc[leveloffset=+3] - -include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] +// Server Distribution Testing +include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] [NOTE] ==== The integration tests expect a running {BrokerProductName} broker, so make sure you have started the broker before you begin. ==== +// Undeploy the Quickstart +include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] +// Restore the {productName} Standalone Server Configuration Manually +include::../shared-doc/restore-standalone-server-configuration-manual.adoc[leveloffset=+2] + // Build and run sections for other environments/builds ifndef::ProductRelease,EAPXPRelease[] include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1] 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..046b07f61b 100644 --- a/security-domain-to-domain/README-source.adoc +++ b/security-domain-to-domain/README-source.adoc @@ -243,7 +243,8 @@ 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] +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/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/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/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..651b6604d6 100644 --- a/servlet-security/README-source.adoc +++ b/servlet-security/README-source.adoc @@ -170,6 +170,8 @@ The purpose of a `role-decoder` is to instruct the security domain how roles are This configuration tells `Undertow` that applications with the `servlet-security-quickstart` security domain, as defined in the `jboss-web.xml` or by using the `@SecurityDomain` annotation in the Servlet class, should use the `security-domain` named `servlet-security-quickstart-sd`. +// Server Distribution Testing +include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] // Build and Deploy the Quickstart include::../shared-doc/build-and-deploy-the-quickstart.adoc[leveloffset=+2] @@ -197,8 +199,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-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..c55266b76c 100644 --- a/spring-resteasy/README-source.adoc +++ b/spring-resteasy/README-source.adoc @@ -67,9 +67,9 @@ WARN [org.jboss.as.ee] (MSC service thread 1-5) WFLYEE0007: Not installing opti ---- // Server Distribution Testing -include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+2] +include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1] // Undeploy the Quickstart -include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2] +include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] // Build and run sections for other environments/builds ifndef::ProductRelease,EAPXPRelease[] 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/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/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/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..7ddd8f109c 100644 --- a/todo-backend/README-source.adoc +++ b/todo-backend/README-source.adoc @@ -208,8 +208,12 @@ $ 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] +Please note that the quickstart includes integration tests, which may be executed using the following command: + +[source,subs="attributes+",options="nowrap"] +---- +$ mvn verify -Pintegration-testing +---- //=========================================================== // Openshift - START 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/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/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 +