[WFLY-18481] http-custom-mechanism Quickstart Common Enhancements CY2…

…023Q3
wildfly · Oct 24, 2023 · bc98e46 · bc98e46
1 parent 77e7bce
commit bc98e46
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 5 deletions.
diff --git a/.github/workflows/quickstart_http_custom_mechanism_ci.yml b/.github/workflows/quickstart_http_custom_mechanism_ci.yml
@@ -0,0 +1,17 @@
+name: WildFly http_custom_mechanism Quickstart CI
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths:
+      - http_custom_mechanism/**'
+      - .github/workflows/quickstart_ci.yml
+
+jobs:
+  call-quickstart_ci:
+    uses: ./.github/workflows/quickstart_ci.yml
+    with:
+      QUICKSTART_PATH: http_custom_mechanism
+      TEST_PROVISIONED_SERVER: true
+      TEST_BOOTABLE_JAR: true
+      TEST_OPENSHIFT: false
diff --git a/http-custom-mechanism/README.adoc b/http-custom-mechanism/README.adoc
@@ -297,6 +297,11 @@ Enter `clean package wildfly:deploy` for the *Goals* and click *Run*. This deplo
 // 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]
+endif::[]
+
 //*************************************************
 // Product Release content only
 //*************************************************

diff --git a/http-custom-mechanism/configure-elytron.cli b/http-custom-mechanism/configure-elytron.cli
@@ -4,7 +4,7 @@
 batch
 
 # Add the resource to discover the factory implementation for the custom module.
-/subsystem=elytron/service-loader-http-server-mechanism-factory=custom-factory:add(module=org.jboss.as.quickstart.http_custom_mechanism.custom-http-mechanism)
+/subsystem=elytron/service-loader-http-server-mechanism-factory=custom-factory:add(module=org.jboss.as.quickstart.http_custom_mechanism)
 
 # Add an `http-authentication-factory` to the mechanism factory to a `security-domain` that will be used for the authentication.
 /subsystem=elytron/http-authentication-factory=custom-mechanism:add(http-server-mechanism-factory=custom-factory,security-domain=ApplicationDomain,mechanism-configurations=[{mechanism-name=CUSTOM_MECHANISM}])

diff --git a/http-custom-mechanism/pom.xml b/http-custom-mechanism/pom.xml
@@ -49,8 +49,12 @@
     </modules>
 
     <properties>
-        <!-- The versions for BOMs, Dependencies and Plugins -->
-        <version.server.bom>30.0.0.Final</version.server.bom>
+        <!-- the version for the Server -->
+        <version.server>30.0.0.Beta1</version.server>
+        <!-- The versions for BOMs, Packs and Plugins -->
+        <version.bom.ee>${version.server}</version.bom.ee>
+        <version.pack.cloud>5.0.0.Beta1</version.pack.cloud>
+        <version.plugin.wildfly>4.2.0.Final</version.plugin.wildfly>
     </properties>
 
     <repositories>
@@ -114,7 +118,7 @@
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
                 <artifactId>wildfly-ee-with-tools</artifactId>
-                <version>${version.server.bom}</version>
+                <version>${version.bom.ee}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -150,8 +154,64 @@
             <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
+                <version>${version.plugin.wildfly}</version>
             </plugin>
         </plugins>
     </build>
-
+    <profiles>
+        <profile>
+            <id>provisioned-server</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.wildfly.plugins</groupId>
+                        <artifactId>wildfly-maven-plugin</artifactId>
+                        <configuration>
+                            <feature-packs>
+                                <feature-pack>                                    <location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
+                                </feature-pack>
+                            </feature-packs>
+                            <layers>
+                                <!-- layers may be used to customize the server to provision -->
+                                <layer>cloud-server</layer>
+                            </layers>
+                            <!-- deploys the quickstart on root web context -->
+                            <name>ROOT.war</name>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>package</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>integration-testing</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <includes>
+                                <include>**/BasicRuntimeIT</include>
+                            </includes>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>