diff --git a/.github/workflows/quickstart_security-domain-to-domain_ci.yml b/.github/workflows/quickstart_security-domain-to-domain_ci.yml index 0dbea4ab9c..8cd2ae290d 100644 --- a/.github/workflows/quickstart_security-domain-to-domain_ci.yml +++ b/.github/workflows/quickstart_security-domain-to-domain_ci.yml @@ -12,6 +12,7 @@ jobs: uses: ./.github/workflows/quickstart_ci.yml with: QUICKSTART_PATH: security-domain-to-domain - DEPLOYMENT_DIR: web + DEPLOYMENT_DIR: ear TEST_PROVISIONED_SERVER: true TEST_OPENSHIFT: false + MVN_COMMAND: install \ No newline at end of file diff --git a/security-domain-to-domain/README-source.adoc b/security-domain-to-domain/README-source.adoc index 75d727716f..a6b31ef9df 100644 --- a/security-domain-to-domain/README-source.adoc +++ b/security-domain-to-domain/README-source.adoc @@ -9,10 +9,10 @@ include::../shared-doc/attributes.adoc[] The `security-domain-to-domain` quickstart demonstrates the propagation of an identity across two different deployments using different security domains. :standalone-server-type: default -:archiveType: war +:archiveType: ear :uses-h2: :restoreScriptName: restore-configuration.cli - +:deploymentDir: ear == What is it? @@ -242,6 +242,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] // Undeploy the Quickstart include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1] @@ -250,23 +252,11 @@ include::../shared-doc/restore-standalone-server-configuration.adoc[leveloffset= // 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 JBDS instructions - -* Be sure to configure the server by running the JBoss CLI commands as described above under xref:configure_the_server[Configure the {productName} Server]. Stop the server at the end of that step. -* Be sure to xref:restore_the_standalone_server_configuration[Restore the Server Configuration] when you have completed testing this quickstart. -// Debug the Application -include::../shared-doc/debug-the-application.adoc[leveloffset=+1] - -//************************************************* -// Product Release content only -//************************************************* -ifdef::ProductRelease[] +// 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::[] // Quickstart not compatible with OpenShift -include::../shared-doc/openshift-incompatibility.adoc[leveloffset=+1] - -endif::[] \ No newline at end of file +include::../shared-doc/openshift-incompatibility.adoc[leveloffset=+1] \ No newline at end of file diff --git a/security-domain-to-domain/ear/pom.xml b/security-domain-to-domain/ear/pom.xml index 2c34f93599..209318b560 100644 --- a/security-domain-to-domain/ear/pom.xml +++ b/security-domain-to-domain/ear/pom.xml @@ -93,4 +93,63 @@ + + + + provisioned-server + + + + org.wildfly.plugins + wildfly-maven-plugin + + + + org.wildfly:wildfly-galleon-pack:${version.server} + + + + + cloud-server + ejb + h2-driver + + + + + + + + false + + + + ROOT.ear + + + + + package + + + + + + org.apache.maven.plugins + maven-ear-plugin + + + + ${project.groupId} + security-domain-to-domain-web + / + + + + + + + + + diff --git a/security-domain-to-domain/pom.xml b/security-domain-to-domain/pom.xml index 5a9ca6d207..ac35dd5eaf 100644 --- a/security-domain-to-domain/pom.xml +++ b/security-domain-to-domain/pom.xml @@ -47,15 +47,16 @@ ejb web ear + test - 31.0.0.Beta1 - + 31.0.0.Final + ${version.server} - 5.0.0.Final - 4.2.1.Final + 6.0.0.Final + 5.0.0.Beta3 @@ -160,71 +161,4 @@ - - - provisioned-server - - - - org.wildfly.plugins - wildfly-maven-plugin - - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - ejb - - - - -] - - - false - - - - ROOT.war - - - - - package - - - - - - - - - integration-testing - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - **/BasicRuntimeIT - - - - - - integration-test - verify - - - - - - - - diff --git a/security-domain-to-domain/test/pom.xml b/security-domain-to-domain/test/pom.xml new file mode 100644 index 0000000000..0910ee639e --- /dev/null +++ b/security-domain-to-domain/test/pom.xml @@ -0,0 +1,69 @@ + + + + + + + 4.0.0 + + + org.wildfly.quickstarts + security-domain-to-domain + 32.0.0.Beta1-SNAPSHOT + + security-domain-to-domain-test + + Quickstart: security-domain-to-domain - test + + + + junit + junit + test + + + + + + integration-testing + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + **/*IT + + + + + + integration-test + verify + + + + + + + + + diff --git a/security-domain-to-domain/web/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java b/security-domain-to-domain/test/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java similarity index 100% rename from security-domain-to-domain/web/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java rename to security-domain-to-domain/test/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java diff --git a/security-domain-to-domain/web/pom.xml b/security-domain-to-domain/web/pom.xml index a05f97f786..a6a8b993a1 100644 --- a/security-domain-to-domain/web/pom.xml +++ b/security-domain-to-domain/web/pom.xml @@ -89,20 +89,5 @@ jakarta.persistence-api provided - - junit - junit - test - - - - - - - org.wildfly.plugins - wildfly-maven-plugin - - -