Commit from GitHub Actions (WildFly Quickstarts Update 'README.adoc's)

wildfly · Oct 30, 2024 · de97aa6 · de97aa6
1 parent 894e958
commit de97aa6
Show file tree

Hide file tree

Showing 50 changed files with 267 additions and 1,787 deletions.
diff --git a/batch-processing/README.adoc b/batch-processing/README.adoc
@@ -743,11 +743,6 @@ The server provisioning functionality is provided by the WildFly Maven Plugin, a
                             <discover-provisioning-info>
                                 <version>${version.server}</version>
                             </discover-provisioning-info>
-                            <!--
-                                Rename the output war to ROOT.war before adding it to the server, so that the
-                                application is deployed in the root web context.
-                            -->
-                            <name>ROOT.war</name>
                             <add-ons>...</add-ons>
                         </configuration>
                         <executions>
@@ -772,11 +767,6 @@ If you get an error or the server is missing some functionality which cannot be
 wildfly-glow show-add-ons
 ----
 
-[NOTE]
-====
-Since the plugin configuration above deploys quickstart on root web context of the provisioned server, the URL to access the application should not have the `/{artifactId}` path segment after `HOST:PORT`.
-====
-
 // Server Provisioning Testing
 :leveloffset: +1
 
@@ -863,10 +853,6 @@ ifndef::deploymentDir[:deploymentTargetDir: target]
 ifdef::deploymentDir[:deploymentTargetDir: {deploymentDir}/target]
 endif::deploymentTargetDir[]
 
-ifndef::server_provisioning_server_host[]
-:server_provisioning_server_host: http://localhost:8080
-endif::server_provisioning_server_host[]
-
 ifndef::extraStartParams[:extraStartParams: ]
 ifndef::extraProvisioningTestParams[:extraProvisioningTestParams: ]
 
@@ -903,12 +889,12 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
 ====
 endif::[]
 
-. Start the {productName} provisioned server, this time using the {productName} Maven Plugin, which is recommended for testing due to simpler automation. The path to the provisioned server should be specified using the `jbossHome` system property.
+. Start the {productName} provisioned server, this time using the {productName} Maven Plugin, which is recommended for testing due to simpler automation.
 +
 ifndef::deploymentDir[]
 [source,subs="attributes+",options="nowrap"]
 ----
-$ mvn wildfly:start -DjbossHome=target/server {extraStartParams}
+$ mvn wildfly:start {extraStartParams}
 ----
 endif::[]
 ifdef::deploymentDir[]
@@ -918,11 +904,11 @@ $ mvn -f {deploymentDir}/pom.xml wildfly:start -DjbossHome={deploymentDir}/targe
 ----
 endif::[]
 
-. Type the following command to run the `verify` goal with the `integration-testing` profile activated, and specifying the quickstart's URL using the `server.host` system property, which for a provisioned server by default is `{server_provisioning_server_host}`.
+. Type the following command to run the `verify` goal with the `integration-testing` profile activated.
 +
 [source,subs="attributes+",options="nowrap"]
 ----
-$ mvn verify -Pintegration-testing -Dserver.host={server_provisioning_server_host} {extraProvisioningTestParams}
+$ mvn verify -Pintegration-testing {extraProvisioningTestParams}
 ----
 
 . Shutdown the {productName} provisioned server, this time using the {productName} Maven Plugin too.
@@ -985,11 +971,6 @@ ifndef::ProductRelease,EAPXPRelease[]
                                 <version>${version.server}</version>
                                 <context>cloud</context>
                             </discover-provisioning-info>
-                            <!--
-                                The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
-                                application is deployed in the root web context. Add ROOT.war to the server.
-                            -->
-                            <filename>ROOT.war</filename>
                             <add-ons>...</add-ons>
                         </configuration>
                         <executions>
@@ -1037,7 +1018,6 @@ ifdef::ProductRelease,EAPXPRelease[]
                                 </feature-pack>
                             </feature-packs>
                             <layers>...</layers>
-                            <name>ROOT.war</name>
                         </configuration>
                         <executions>
                             <execution>
@@ -1207,7 +1187,7 @@ ifndef::useHelmChartDir[]
 ----
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: 34.x
+  ref: main
   contextDir: batch-processing
 deploy:
   replicas: 1
@@ -1259,10 +1239,6 @@ kubectl port-forward service/{helm-app-name} 8080:8080
 The server can now be accessed via `http://localhost:8080` from outside Kubernetes. Note that the command to create the port-forward will not return, so it is easiest to run this in a separate terminal.
 
 endif::[]
-[NOTE]
-====
-The Maven profile named `openshift` is used by the Helm chart to provision the server with the quickstart deployed on the root web context, and thus the application should be accessed with the URL without the `/{artifactId}` path segment after `HOST:PORT`.
-====
 
 ifdef::openshift+post-helm-install-actions-openshift[]
 include::{post-helm-install-actions-openshift}[leveloffset=+1]
@@ -1378,11 +1354,6 @@ ifndef::ProductRelease,EAPXPRelease[]
                                 <version>${version.server}</version>
                                 <context>cloud</context>
                             </discover-provisioning-info>
-                            <!--
-                                The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
-                                application is deployed in the root web context. Add ROOT.war to the server.
-                            -->
-                            <filename>ROOT.war</filename>
                             <add-ons>...</add-ons>
                         </configuration>
                         <executions>
@@ -1430,7 +1401,6 @@ ifdef::ProductRelease,EAPXPRelease[]
                                 </feature-pack>
                             </feature-packs>
                             <layers>...</layers>
-                            <name>ROOT.war</name>
                         </configuration>
                         <executions>
                             <execution>
@@ -1631,7 +1601,7 @@ ifndef::useHelmChartDir[]
 ----
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: 34.x
+  ref: main
   contextDir: batch-processing
 deploy:
   replicas: 1
@@ -1683,10 +1653,6 @@ kubectl port-forward service/{helm-app-name} 8080:8080
 The server can now be accessed via `http://localhost:8080` from outside Kubernetes. Note that the command to create the port-forward will not return, so it is easiest to run this in a separate terminal.
 
 endif::[]
-[NOTE]
-====
-The Maven profile named `openshift` is used by the Helm chart to provision the server with the quickstart deployed on the root web context, and thus the application should be accessed with the URL without the `/{artifactId}` path segment after `HOST:PORT`.
-====
 
 ifdef::openshift+post-helm-install-actions-openshift[]
 include::{post-helm-install-actions-openshift}[leveloffset=+1]

diff --git a/bmt/README.adoc b/bmt/README.adoc
@@ -675,11 +675,6 @@ The server provisioning functionality is provided by the WildFly Maven Plugin, a
                             <discover-provisioning-info>
                                 <version>${version.server}</version>
                             </discover-provisioning-info>
-                            <!--
-                                Rename the output war to ROOT.war before adding it to the server, so that the
-                                application is deployed in the root web context.
-                            -->
-                            <name>ROOT.war</name>
                             <add-ons>...</add-ons>
                         </configuration>
                         <executions>
@@ -704,11 +699,6 @@ If you get an error or the server is missing some functionality which cannot be
 wildfly-glow show-add-ons
 ----
 
-[NOTE]
-====
-Since the plugin configuration above deploys quickstart on root web context of the provisioned server, the URL to access the application should not have the `/{artifactId}` path segment after `HOST:PORT`.
-====
-
 // Server Provisioning Testing
 :leveloffset: +1
 
@@ -795,10 +785,6 @@ ifndef::deploymentDir[:deploymentTargetDir: target]
 ifdef::deploymentDir[:deploymentTargetDir: {deploymentDir}/target]
 endif::deploymentTargetDir[]
 
-ifndef::server_provisioning_server_host[]
-:server_provisioning_server_host: http://localhost:8080
-endif::server_provisioning_server_host[]
-
 ifndef::extraStartParams[:extraStartParams: ]
 ifndef::extraProvisioningTestParams[:extraProvisioningTestParams: ]
 
@@ -835,12 +821,12 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
 ====
 endif::[]
 
-. Start the {productName} provisioned server, this time using the {productName} Maven Plugin, which is recommended for testing due to simpler automation. The path to the provisioned server should be specified using the `jbossHome` system property.
+. Start the {productName} provisioned server, this time using the {productName} Maven Plugin, which is recommended for testing due to simpler automation.
 +
 ifndef::deploymentDir[]
 [source,subs="attributes+",options="nowrap"]
 ----
-$ mvn wildfly:start -DjbossHome=target/server {extraStartParams}
+$ mvn wildfly:start {extraStartParams}
 ----
 endif::[]
 ifdef::deploymentDir[]
@@ -850,11 +836,11 @@ $ mvn -f {deploymentDir}/pom.xml wildfly:start -DjbossHome={deploymentDir}/targe
 ----
 endif::[]
 
-. Type the following command to run the `verify` goal with the `integration-testing` profile activated, and specifying the quickstart's URL using the `server.host` system property, which for a provisioned server by default is `{server_provisioning_server_host}`.
+. Type the following command to run the `verify` goal with the `integration-testing` profile activated.
 +
 [source,subs="attributes+",options="nowrap"]
 ----
-$ mvn verify -Pintegration-testing -Dserver.host={server_provisioning_server_host} {extraProvisioningTestParams}
+$ mvn verify -Pintegration-testing {extraProvisioningTestParams}
 ----
 
 . Shutdown the {productName} provisioned server, this time using the {productName} Maven Plugin too.
@@ -917,11 +903,6 @@ ifndef::ProductRelease,EAPXPRelease[]
                                 <version>${version.server}</version>
                                 <context>cloud</context>
                             </discover-provisioning-info>
-                            <!--
-                                The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
-                                application is deployed in the root web context. Add ROOT.war to the server.
-                            -->
-                            <filename>ROOT.war</filename>
                             <add-ons>...</add-ons>
                         </configuration>
                         <executions>
@@ -969,7 +950,6 @@ ifdef::ProductRelease,EAPXPRelease[]
                                 </feature-pack>
                             </feature-packs>
                             <layers>...</layers>
-                            <name>ROOT.war</name>
                         </configuration>
                         <executions>
                             <execution>
@@ -1139,7 +1119,7 @@ ifndef::useHelmChartDir[]
 ----
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: 34.x
+  ref: main
   contextDir: bmt
 deploy:
   replicas: 1
@@ -1191,10 +1171,6 @@ kubectl port-forward service/{helm-app-name} 8080:8080
 The server can now be accessed via `http://localhost:8080` from outside Kubernetes. Note that the command to create the port-forward will not return, so it is easiest to run this in a separate terminal.
 
 endif::[]
-[NOTE]
-====
-The Maven profile named `openshift` is used by the Helm chart to provision the server with the quickstart deployed on the root web context, and thus the application should be accessed with the URL without the `/{artifactId}` path segment after `HOST:PORT`.
-====
 
 ifdef::openshift+post-helm-install-actions-openshift[]
 include::{post-helm-install-actions-openshift}[leveloffset=+1]
@@ -1311,11 +1287,6 @@ ifndef::ProductRelease,EAPXPRelease[]
                                 <version>${version.server}</version>
                                 <context>cloud</context>
                             </discover-provisioning-info>
-                            <!--
-                                The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
-                                application is deployed in the root web context. Add ROOT.war to the server.
-                            -->
-                            <filename>ROOT.war</filename>
                             <add-ons>...</add-ons>
                         </configuration>
                         <executions>
@@ -1363,7 +1334,6 @@ ifdef::ProductRelease,EAPXPRelease[]
                                 </feature-pack>
                             </feature-packs>
                             <layers>...</layers>
-                            <name>ROOT.war</name>
                         </configuration>
                         <executions>
                             <execution>
@@ -1564,7 +1534,7 @@ ifndef::useHelmChartDir[]
 ----
 build:
   uri: https://github.com/wildfly/quickstart.git
-  ref: 34.x
+  ref: main
   contextDir: bmt
 deploy:
   replicas: 1
@@ -1616,10 +1586,6 @@ kubectl port-forward service/{helm-app-name} 8080:8080
 The server can now be accessed via `http://localhost:8080` from outside Kubernetes. Note that the command to create the port-forward will not return, so it is easiest to run this in a separate terminal.
 
 endif::[]
-[NOTE]
-====
-The Maven profile named `openshift` is used by the Helm chart to provision the server with the quickstart deployed on the root web context, and thus the application should be accessed with the URL without the `/{artifactId}` path segment after `HOST:PORT`.
-====
 
 ifdef::openshift+post-helm-install-actions-openshift[]
 include::{post-helm-install-actions-openshift}[leveloffset=+1]