diff --git a/README.adoc b/README.adoc deleted file mode 100644 index 56610722aa..0000000000 --- a/README.adoc +++ /dev/null @@ -1,679 +0,0 @@ -//*********************************************************************************** -// Enable the following flag to build README.html files for JBoss EAP product builds. -// Comment it out for WildFly builds. -//*********************************************************************************** -:ProductRelease: - -//*********************************************************************************** -// Enable the following flag to build README.html files for EAP CD product builds. -// Comment it out for WildFly or JBoss EAP product builds. -//*********************************************************************************** -//:EAPCDRelease: - -//*********************************************************************************** -// Enable the following flag to build README.html files for EAP XP product builds. -// Comment it out for WildFly or JBoss EAP product builds. -//*********************************************************************************** -//:EAPXPRelease: - -// This is a universal name for all releases -:ProductShortName: JBoss EAP -// Product names and links are dependent on whether it is a product release (CD or JBoss) -// or the WildFly project. -// The "DocInfo*" attributes are used to build the book links to the product documentation - -ifdef::ProductRelease[] -// JBoss EAP release -:productName: JBoss EAP -:productNameFull: Red Hat JBoss Enterprise Application Platform -:productVersion: 7.4 -:DocInfoProductNumber: {productVersion} - -endif::[] - -ifdef::EAPXPRelease[] -// JBoss EAP XP release -:productName: JBoss EAP XP -:productNameFull: Red Hat JBoss Enterprise Application Platform expansion pack -:productVersion: 2.0 -:DocInfoProductNumber: 7.3 -endif::[] - -ifdef::ProductRelease,EAPXPRelease[] -:githubRepoUrl: https://github.com/jboss-developer/jboss-eap-quickstarts/ -:jbossHomeName: EAP_HOME -:DocInfoProductName: Red Hat JBoss Enterprise Application Platform -:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform -:DocInfoPreviousProductName: jboss-enterprise-application-platform -:quickstartDownloadName: {productNameFull} {productVersion} Quickstarts -:quickstartDownloadUrl: https://access.redhat.com/jbossnetwork/restricted/listSoftware.html?product=appplatform&downloadType=distributions -// END ifdef::ProductRelease,EAPXPRelease[] -endif::[] - -ifndef::ProductRelease,EAPCDRelease,EAPXPRelease[] -// WildFly project -:productName: WildFly -:productNameFull: WildFly Application Server -:jbossHomeName: WILDFLY_HOME -:productVersion: 23 -:githubRepoUrl: https://github.com/wildfly/quickstart/ -:DocInfoProductName: Red Hat JBoss Enterprise Application Platform -:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform -// Do not update the following until after the 7.4 docs are published! -:DocInfoProductNumber: 7.3 -:DocInfoPreviousProductName: jboss-enterprise-application-platform -// END ifndef::ProductRelease,EAPCDRelease,EAPXPRelease[] -endif::[] - -:source: {githubRepoUrl} - -// Values for Openshift S2i sections attributes -:CDProductName: {productNameFull} for OpenShift -:CDProductShortName: {ProductShortName} for OpenShift -:CDProductTitle: {CDProductName} -:CDProductNameSentence: Openshift release for {ProductShortName} -:CDProductAcronym: {CDProductShortName} -:CDProductVersion: {productVersion} -:EapForOpenshiftBookName: {productNameFull} for OpenShift -:EapForOpenshiftOnlineBookName: {EapForOpenshiftBookName} Online -:xpaasproduct: {productNameFull} for OpenShift -:xpaasproductOpenShiftOnline: {xpaasproduct} Online -:xpaasproduct-shortname: {CDProductShortName} -:xpaasproductOpenShiftOnline-shortname: {xpaasproduct-shortname} Online -:ContainerRegistryName: Red Hat Container Registry -:EapForOpenshiftBookName: Getting Started with {ProductShortName} for OpenShift Container Platform -:EapForOpenshiftOnlineBookName: Getting Started with {ProductShortName} for OpenShift Online -:OpenShiftOnlinePlatformName: Red Hat OpenShift Container Platform -:OpenShiftOnlineName: Red Hat OpenShift Online -:ImagePrefixVersion: eap74-beta -:ImageandTemplateImportURL: https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/{ImagePrefixVersion}/ - -// OpenShift repository and reference for quickstarts -:EAPQuickStartRepo: https://github.com/jboss-developer/jboss-eap-quickstarts -:EAPQuickStartRepoRef: 7.4.x -// Links to the OpenShift documentation -:LinkOpenShiftGuide: https://access.redhat.com/documentation/en-us/{DocInfoProductNameURL}/{DocInfoProductNumber}/html-single/getting_started_with_jboss_eap_for_openshift_container_platform/ -:LinkOpenShiftOnlineGuide: https://access.redhat.com/documentation/en-us/{DocInfoProductNameURL}/{DocInfoProductNumber}/html-single/getting_started_with_jboss_eap_for_openshift_online/ - -ifdef::EAPCDRelease[] -// Attributes for EAP CD release -:CDProductName: JBoss Enterprise Application Platform continuous delivery -:CDProductShortName: {ProductShortName} Continuous Delivery -:CDProductTitle: JBoss Enterprise Application Platform Continuous Delivery -:CDProductNameSentence: continuous delivery release for {ProductShortName} -:CDProductAcronym: JBoss EAP CD -:CDProductVersion: 21 -:productName: {CDProductShortName} -:productNameFull: {CDProductName} -:productVersion: {CDProductVersion} -:githubRepoUrl: https://github.com/jboss-developer/jboss-eap-quickstarts/tree/openshift/ -:DocInfoProductNameURL: jboss_enterprise_application_platform_continuous_delivery -:DocInfoProductName: JBoss Enterprise Application Platform Continuous Delivery -:DocInfoProductNumber: {productVersion} -:quickstartDownloadName: JBoss EAP CD {productVersion} Quickstarts -:quickstartDownloadUrl: https://access.redhat.com/jbossnetwork/restricted/listSoftware.html?product=eap-cd&downloadType=distributions -// OpenShift repository and reference for quickstarts -:EAPQuickStartRepoRef: openshift -// END ifdef::EAPCDRelease[] -endif::[] - -ifdef::EAPXPRelease[] -// Attributes for XP releases -:EapForOpenshiftBookName: {productNameFull} for OpenShift -:EapForOpenshiftOnlineBookName: {productNameFull} for OpenShift Online -:xpaasproduct: {productNameFull} for OpenShift -:xpaasproductOpenShiftOnline: {productNameFull} for OpenShift Online -:xpaasproduct-shortname: {ProductShortName} for OpenShift -:xpaasproductOpenShiftOnline-shortname: {ProductShortName} for OpenShift Online -:ContainerRegistryName: Red Hat Container Registry -:EapForOpenshiftBookName: {productNameFull} for OpenShift -:EapForOpenshiftOnlineBookName: {productNameFull} for OpenShift Online -:ImagePrefixVersion: eap-xp2 -:ImageandTemplateImportURL: https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/{ImagePrefixVersion}/ -// OpenShift repository and reference for quickstarts -:EAPQuickStartRepoRef: xp-2.0.x -// Links to the OpenShift documentation -:LinkOpenShiftGuide: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/{DocInfoProductNumber}/html/using_eclipse_microprofile_in_jboss_eap/using-the-openshift-image-for-jboss-eap-xp_default -:LinkOpenShiftOnlineGuide: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/{DocInfoProductNumber}/html/using_eclipse_microprofile_in_jboss_eap/using-the-openshift-image-for-jboss-eap-xp_default -endif::[] - -//************************* -// Other values -//************************* -:buildRequirements: Java 8.0 (Java SDK 1.8) or later and Maven 3.3.1 or later -:jbdsEapServerName: Red Hat JBoss Enterprise Application Platform 7.3 -:javaVersion: Jakarta EE 8 -ifdef::EAPXPRelease[] -:javaVersion: Eclipse MicroProfile -endif::[] -:githubRepoBranch: master -:guidesBaseUrl: https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/ -:useEclipseUrl: {guidesBaseUrl}USE_JBDS.adoc#use_red_hat_jboss_developer_studio_or_eclipse_to_run_the_quickstarts -:useEclipseDeployJavaClientDocUrl: {guidesBaseUrl}USE_JBDS.adoc#deploy_and_undeploy_a_quickstart_containing_server_and_java_client_projects -:useEclipseDeployEARDocUrl: {guidesBaseUrl}USE_JBDS.adoc#deploy_and_undeploy_a_quickstart_ear_project -:useProductHomeDocUrl: {guidesBaseUrl}USE_OF_{jbossHomeName}.adoc#use_of_product_home_and_jboss_home_variables -:configureMavenDocUrl: {guidesBaseUrl}CONFIGURE_MAVEN_JBOSS_EAP.adoc#configure_maven_to_build_and_deploy_the_quickstarts -:arquillianTestsDocUrl: {guidesBaseUrl}RUN_ARQUILLIAN_TESTS.adoc#run_the_arquillian_tests -:addUserDocUrl: {guidesBaseUrl}CREATE_USERS.adoc#create_users_required_by_the_quickstarts -:addApplicationUserDocUrl: {guidesBaseUrl}CREATE_USERS.adoc#add_an_application_user -:addManagementUserDocUrl: {guidesBaseUrl}CREATE_USERS.adoc#add_an_management_user -:startServerDocUrl: {guidesBaseUrl}START_JBOSS_EAP.adoc#start_the_jboss_eap_server -:configurePostgresDocUrl: {guidesBaseUrl}CONFIGURE_POSTGRESQL_JBOSS_EAP.adoc#configure_the_postgresql_database_for_use_with_the_quickstarts -:configurePostgresDownloadDocUrl: {guidesBaseUrl}CONFIGURE_POSTGRESQL_JBOSS_EAP.adoc#download_and_install_postgresql -:configurePostgresCreateUserDocUrl: {guidesBaseUrl}CONFIGURE_POSTGRESQL_JBOSS_EAP.adoc#create_a_database_user -:configurePostgresAddModuleDocUrl: {guidesBaseUrl}CONFIGURE_POSTGRESQL_JBOSS_EAP.adoc#add_the_postgres_module_to_the_jboss_eap_server -:configurePostgresDriverDocUrl: {guidesBaseUrl}CONFIGURE_POSTGRESQL_JBOSS_EAP.adoc#configure_the_postgresql_driver_in_the_jboss_eap_server -:configureBytementDownloadDocUrl: {guidesBaseUrl}CONFIGURE_BYTEMAN.adoc#download_and_configure_byteman -:configureBytemanDisableDocUrl: {guidesBaseUrl}CONFIGURE_BYTEMAN.adoc#disable_the_byteman_script -:configureBytemanClearDocUrl: {guidesBaseUrl}CONFIGURE_BYTEMAN.adoc#clear_the_transaction_object_store -:configureBytemanQuickstartDocUrl: {guidesBaseUrl}CONFIGURE_BYTEMAN.adoc#configure_byteman_for_use_with_the_quickstarts -:configureBytemanHaltDocUrl: {guidesBaseUrl}CONFIGURE_BYTEMAN.adoc#use_byteman_to_halt_the_application[ -:configureBytemanQuickstartsDocUrl: {guidesBaseUrl}CONFIGURE_BYTEMAN.adoc#configure_byteman_for_use_with_the_quickstarts - -:EESubsystemNamespace: urn:jboss:domain:ee:4.0 -:IiopOpenJdkSubsystemNamespace: urn:jboss:domain:iiop-openjdk:2.0 -:MailSubsystemNamespace: urn:jboss:domain:mail:3.0 -:SingletonSubsystemNamespace: urn:jboss:domain:singleton:1.0 -:TransactionsSubsystemNamespace: urn:jboss:domain:transactions:4.0 - -// LinkProductDocHome: https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/ -:LinkProductDocHome: https://access.redhat.com/documentation/en/jboss-enterprise-application-platform-continuous-delivery -:LinkConfigGuide: https://access.redhat.com/documentation/en-us/{DocInfoProductNameURL}/{DocInfoProductNumber}/html-single/configuration_guide/ -:LinkDevelopmentGuide: https://access.redhat.com/documentation/en-us/{DocInfoProductNameURL}/{DocInfoProductNumber}/html-single/development_guide/ -:LinkGettingStartedGuide: https://access.redhat.com/documentation/en-us/{DocInfoProductNameURL}/{DocInfoProductNumber}/html-single/getting_started_guide/ -:LinkOpenShiftWelcome: https://docs.openshift.com/online/welcome/index.html -:LinkOpenShiftSignup: https://docs.openshift.com/online/getting_started/choose_a_plan.html -:OpenShiftTemplateName: JBoss EAP CD (no https) - -:ConfigBookName: Configuration Guide -:DevelopmentBookName: Development Guide -:GettingStartedBookName: Getting Started Guide - -:JBDSProductName: Red Hat CodeReady Studio -:JBDSVersion: 12.15 -:LinkJBDSInstall: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/installation_guide/ -:JBDSInstallBookName: Installation Guide -:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/ -:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools - -:outfilesuffix: .html - -:toc: -:toclevels: 4 -:numbered: - -ifndef::ProductRelease,EAPCDRelease,EAPXPRelease[] -= WildFly Quickstarts - -[toc] - -[abstract] -The quickstarts demonstrate Jakarta EE 8 and a few additional technologies from the WildFly stack. They provide small, specific, working examples that can be used as a reference for your own project. - -[[introduction]] -== Introduction - -These quickstarts run on the WildFly application server. The quickstarts are configured to use the correct Maven dependencies and ensure that you test and compile the quickstarts against the correct runtime environment. - -Each quickstart folder contains a `README.adoc` file that describes the quickstart features and provides instructions about how to build and run it. Instructions are provided to build the more readable `README.html` files. - -Make sure you read this entire document before you attempt to work with the quickstarts. - -[[system_requirements]] -== System Requirements - -The applications these projects produce are designed to be run on WildFly 16 or later. - -All you need to build these projects is Java 8.0 (Java SDK 1.8) or later and Maven 3.3.1 or later. - -[[use_of_product_home_and_jboss_home_variables]] -== Use of WILDFLY_HOME and QUICKSTART_HOME Variables - -The quickstart `README` files use the _replaceable_ value `__WILDFLY_HOME__` to denote the path to the WildFly server. When you encounter this value in a `README` file, make sure you replace it with the actual path to your WildFly server. - -When you see the replaceable variable __QUICKSTART_HOME__, replace it with the path to the root directory of all of the quickstarts. - -[[prerequisites]] -== Prerequisites - -Before you begin, you must perform the following tasks. - -. xref:build_wildfly_server[Build the WildFly Server (Optional)]: This step is only required if you plan to run the latest https://github.com/wildfly/wildfly[development version of the WildFly server]. It is not required if you are running a https://github.com/wildfly/wildfly/tags[tagged] or https://github.com/wildfly/wildfly/releases[released] version of the WildFly server. - -. xref:build_wildfly_boms[Build and Install the WildFly BOMs (Optional)]: This step is only required if you are building a development version of the WildFly server and see dependency issues when you build the quickstarts. It is not required if you are running a https://github.com/wildfly/quickstart/tags[tagged] or https://github.com/wildfly/boms/releases[released] version of the WildFly server. - -. xref:install_the_quickstart_parent_artifact_in_maven[Install the Quickstart Parent Artifact in Maven (Optional)]: This step is only required if you are running the latest https://github.com/wildfly/quickstart[development version of the quickstarts]. It is not required if you are running a https://github.com/wildfly/quickstart/tags[tagged] or https://github.com/wildfly/quickstart/releases[released] version of the quickstarts. - -. xref:build_quickstart_readme_files[Build the Quickstart README.html Files (Required)]: The quickstart `README` files are written in AsciiDoc to provide modular, reusable content; however, this makes them difficult to read. For this reason, you must also build the quickstart `README.html` files from the AsciiDoc source. - -[[build_wildfly_server]] -=== Build the WildFly Server (Optional) - -If you have downloaded a https://github.com/wildfly/wildfly/tags[tagged] or https://github.com/wildfly/wildfly/releases[released] version of the WildFly server, you can ignore this step. You can simply extract the WildFly server from the compressed file and https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/START_JBOSS_EAP.adoc#start-the-red-hat-jboss-enterprise-application-platform-server[start the server] from that directory. - -If you plan to run the https://github.com/wildfly/wildfly[development version of the WildFly server], you must first download and build the WildFly server from source. - -. If you have not yet done so, you must clone https://github.com/wildfly/wildfly[WildFly server] repository and navigate to it. You might also want to change the remote name from `origin` to `upstream` to be consistent with your other repositories. -+ -[source,options="nowrap"] ----- -$ git clone git@github.com:wildfly/wildfly.git -$ cd wildfly -$ git remote rename origin upstream ----- -. Verify that your local `master` branch contains the latest updates. -+ -[source,options="nowrap"] ----- -$ git fetch upstream -$ git checkout master -$ git reset --hard upstream/master ----- - -. Build the WildFly server using the following command. -+ -[source,options="nowrap"] ----- -$ mvn clean install -DskipTests -Denforcer.skip=true -Dcheckstyle.skip=true ----- - -. The WildFly server folder and ZIP files, which are named `wildfly-__VERSION__-SNAPSHOT` and `wildfly-__VERSION__-SNAPSHOT.ZIP` respectively, are located in the `build/target/` directory. You can copy that folder or unzip the file to another location or https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/START_JBOSS_EAP.adoc#start-the-red-hat-jboss-enterprise-application-platform-server[start the server] from that directory. - - -[[build_wildfly_boms]] -=== Build and Install the WildFly BOMs (Optional) - -If you have downloaded and are running a https://github.com/wildfly/quickstart/tags[tagged] or https://github.com/wildfly/quickstart/releases[released] version of the quickstarts, you can ignore this step because the required BOMs are already installed in Maven. - -If you are using the latest https://github.com/wildfly/quickstart[development version] of the quickstarts and you are able to successfully build and deploy the quickstarts, you can also ignore this step because the required BOMS are already installed in Maven. - -However, if you are using the latest https://github.com/wildfly/quickstart[development version] of the quickstarts and you see build errors indicating missing dependencies, you must first xref:build_wildfly_server[build the latest WildFly server] and then build and install the WildFly BOMs. This installs the latest Maven artifacts that are required by the SNAPSHOT version of the WildFly quickstarts that are still under development. - -. If you have not yet done so, clone https://github.com/wildfly/boms[WildFly BOMs] repository and navigate to it. You might also want to rename the directory to `wildfly-boms` to make it clear which BOMs it contains and also change the remote name from `origin` to `upstream` to be consistent with your other repositories. -+ -[source,options="nowrap"] ----- -$ git clone git@github.com:wildfly/boms.git -$ mv boms wildfly-boms -$ cd wildfly-boms -$ git remote rename origin upstream ----- -. Verify that your local `master` branch contains the latest updates. -+ -[source,options="nowrap"] ----- -$ git fetch upstream -$ git checkout master -$ git reset --hard upstream/master ----- - -. Build the WildFly BOMs using the following command. -+ -[source,options="nowrap"] ----- -$ mvn clean install ----- -+ -NOTE: If you run into build errors, check with the WildFly team to see if the repositories are temporarily out of sync. - -. At this point, you can verify that all of the quickstarts build using the following command. -+ -[source,options="nowrap"] ----- -$ mvn clean install '-Pdefault,!complex-dependencies' ----- - -[[install_the_quickstart_parent_artifact_in_maven]] -=== Install the Quickstart Parent Artifact in Maven (Optional) - -The root `POM.xml` file defines dependencies that are required by some of the quickstarts. - -If you have downloaded and are running a https://github.com/wildfly/quickstart/tags[tagged] or https://github.com/wildfly/quickstart/releases[released] version of the quickstarts, you can ignore this step because the `quickstart-parent` artifact is already installed in Maven. - -If you are running the latest https://github.com/wildfly/quickstart[development version] of the quickstarts, you must install the `quickstart-parent` artifact so its dependencies are available to the quickstarts that need it. To install it, navigate to your __QUICKSTART_HOME__ directory directory and run the following command. - -[source,subs="+quotes,attributes+",options="nowrap"] ----- -$ cd __QUICKSTART_HOME__ -$ mvn clean install -N ----- - -[[build_quickstart_readme_files]] -=== Build the Quickstart README.html Files (Required) - -The quickstart `README` files are written in AsciiDoc, not only because the language is much more powerful than Markdown, but also also because it is possible to extract common instructions into separate files to be reused across the quickstarts. While this makes them more flexible and easier to maintain, unfortunately, included files do not render in a readable format in GitHub or in most text editors. - -The Maven plugin that is used to build and deploy the quickstarts can also generate fully rendered `README.html` instructions from the `README.adoc` files. - -To build all of the quickstart `README.html` files, including the root `README.html` file that contains the table with links to all available quickstarts, navigate to the root folder of the quickstarts and run the following command. - -[source,options="nowrap"] ----- -$ mvn clean package -Pdocs ----- - -[TIP] -==== -To build the `README.html` file for a specific quickstart, navigate to the quickstart directory and run the above command. -==== - -If you see errors about missing dependencies, check the xref:prerequisites[prerequisites] section to determine whether you need to xref:build_wildfly_boms[build the WildFly BOMs] that corresponds to the version of the quickstarts that you are using. - -[[suggested_approach_to_the_quickstarts]] -== Suggested Approach to the Quickstarts - -We recommend that you approach the quickstarts as follows: - -* Regardless of your level of expertise, we suggest you start with the `helloworld` quickstart. It is the simplest example and is an easy way to prove the server is configured and running correctly. -* If you are a beginner or new to JBoss, start with the quickstarts labeled `Beginner`, then try those marked as `Intermediate`. When you are comfortable with those, move on to the `Advanced` quickstarts. -* Some quickstarts are based upon other quickstarts but have expanded capabilities and functionality. If a prerequisite quickstart is listed, make sure you deploy and test it before looking at the expanded version. - - -[[run_the_quickstarts]] -== Run the Quickstarts Using the Maven Command Line - -The root folder of each individual quickstart contains a `README.html` file with detailed instructions on how to build and run the example. In most cases you do the following: - -* https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/START_JBOSS_EAP.adoc#start_the_jboss_eap_server[Start the WildFly server]. -* Optionally, you can xref:build_the_quickstart_archive[build the quickstart archive] to test for compile errors. -* xref:build_and_deploy_the_quickstart[Build and deploy the quickstart]. -* xref:undeploy_the_quickstart[Undeploy the quickstart] when you are finished testing. - -IMPORTANT: See the `README` file in each individual quickstart folder for specific details and information on how to run and access the example. - -[[build_the_quickstart_archive]] -=== Build the Quickstart Archive - -You can follow these steps to build the application to test for compile errors or to view the contents of the archive. See the specific quickstart `README` file for complete details. - -. Open a terminal and navigate to the root directory of the quickstart you want to build. -. Use the following command if you only want to build the archive, but not deploy it. -+ -[source,options="nowrap"] ----- -$ mvn clean install ----- - -[[build_and_deploy_the_quickstart]] -=== Build and Deploy the Quickstart - -This section describes the basic steps to build and deploy an application. See the specific instructions in each quickstart `README` file for any variations to this process. - -. Make sure you start the WildFly server as described in the quickstart `README` file. -. Open a terminal and navigate to the root directory of the quickstart you want to run. -. Use the following command to build and deploy the archive. -+ -[source,options="nowrap"] ----- -$ mvn clean install wildfly:deploy ----- - -[[undeploy_the_quickstart]] -=== Undeploy the Quickstart - -Use the following command to undeploy the quickstart. - -[source,options="nowrap"] ----- -$ mvn wildfly:undeploy ----- - -[[run_the_quickstarts_in_jboss_developer_studio_or_eclipse]] -== Run the Quickstarts in Red Hat CodeReady Studio or Eclipse - -You can also start the server and deploy the quickstarts or run the Arquillian tests from Eclipse using JBoss tools. For general information about how to import a quickstart, add a WildFly server, and build and deploy a quickstart, see https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/USE_JBDS.adoc#use_red_hat_jboss_developer_studio_or_eclipse_to_run_the_quickstarts[Use Red Hat CodeReady Studio or Eclipse to Run the Quickstarts]. - -[[optional_components]] -== Configure Optional Components - -The following components are needed for only a small subset of the quickstarts. Do not install or configure them unless the quickstart requires it. - -* xref:create_quickstart_users[Create Quickstart Users] -* xref:configure_postgresql[Configure the PostgreSQL Database] -* xref:configure_byteman[Configure Byteman] - -[[create_quickstart_users]] -=== Create Quickstart Users - -Some of the quickstarts, particularly those that run in a secured mode and demonstrate security, require that you create quickstart users with different roles for authorization purposes. See https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/CREATE_USERS.adoc#create_users_required_by_the_quickstarts[Create Users Required by the Quickstarts] for detailed instructions to create users required by the quickstarts. - -[[configure_postgresql]] -=== Configure the PostgreSQL Database - -Some of the quickstarts that demonstrate transactions require that you install and configure the PostgreSQL database. See https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/CONFIGURE_POSTGRESQL_JBOSS_EAP.adoc#configure_the_postgresql_database_for_use_with_the_quickstarts[Configure the PostgreSQL Database for Use with the Quickstarts] for instructions. - -[[configure_byteman]] -=== Configure Byteman - -A few of the quickstarts use _Byteman_ to demonstrate distributed transaction processing and crash recovery. See https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/CONFIGURE_BYTEMAN.adoc#configure_byteman_for_use_with_the_quickstarts[Configure Byteman for Use with the Quickstarts] for instructions. - -// END ifndef::ProductRelease,EAPCDRelease,EAPXPRelease[] -endif::[] - -//********************************************************************************** -// -// WildFly Developers: You can ignore the rest of this file. -// It is for the JBoss EAP product and XP Releases. -// -//********************************************************************************** - -ifdef::ProductRelease,EAPXPRelease[] -// These instructions are only for the JBoss EAP product and XP Releases. -= {productNameFull} ({productName}) Quickstarts - -[abstract] -The quickstarts demonstrate {javaVersion} and a few additional technologies from the {productNameFull} stack. They provide small, specific, working examples that can be used as a reference for your own project. - -[[introduction]] -== Introduction - -These quickstarts run on {productNameFull} {productVersion}. Each quickstart folder contains a `README.html` file that describes the quickstart features and provides instructions about how to build and run it. - -We recommend that you use the *{quickstartDownloadName}* ZIP file, which you can download from the {quickstartDownloadUrl}[{productName} Software Download] page on the Red Hat Customer Portal. This version of the quickstarts uses the correct dependencies and ensures that you test and compile against the correct server runtime environment. - -Each quickstart folder contains a `README.html` file that describes the quickstart features and provides instructions about how to build and run it. - -Make sure you read this entire document before you attempt to work with the quickstarts. - -[[system_requirements]] -== System Requirements - -The applications these projects produce are designed to be run on {productNameFull} {productVersion} or later. - -All you need to build these projects is {buildRequirements}. - -[[use_of_product_home_and_jboss_home_variables]] -== Use of {jbossHomeName} and QUICKSTART_HOME Variables - -The quickstart `README` files use the _replaceable_ value `__{jbossHomeName}__` to denote the path to the {productName} installation. When you encounter this value in a `README` file, make sure you replace it with the actual path to your {productName} installation. The installation path is described in detail here: link:{useProductHomeDocUrl}[Use of __{jbossHomeName}__ and __JBOSS_HOME__ Variables] - -When you see the replaceable variable __QUICKSTART_HOME__, replace it with the path to the root directory of all of the quickstarts. - -[[suggested_approach_to_the_quickstarts]] -== Suggested Approach to the Quickstarts - -We suggest you approach the quickstarts as follows: - -* Regardless of your level of expertise, we suggest you start with the `helloworld` quickstart. It is the simplest example and is an easy way to prove the server is configured and running correctly. -* If you are a beginner or new to JBoss, start with the quickstarts labeled `Beginner`, then try those marked as `Intermediate`. When you are comfortable with those, move on to the `Advanced` quickstarts. -* Some quickstarts are based upon other quickstarts but have expanded capabilities and functionality. If a prerequisite quickstart is listed, make sure you deploy and test it before looking at the expanded version. - -[[run_the_quickstarts]] -== Run the Quickstarts Using the Maven Command Line - -The root folder of each individual quickstart contains a `README` file with specific details on how to build and run the example. In most cases you do the following: - -* link:{StartServerDocUrl}[Start the {productName} server]. -* Optionally, you can xref:build_the_quickstart_archive[build the quickstart archive] to test for compile errors. -* xref:build_and_deploy_the_quickstart[Build and deploy the quickstart]. -* xref:undeploy_the_quickstart[Undeploy the quickstart] when you are finished testing. - -IMPORTANT: See the `README` file in each individual quickstart folder for specific details and information on how to run and access the example. - -[[build_the_quickstart_archive]] -==== Build the Quickstart Archive - -You can follow these steps to build the application to test for compile errors or to view the contents of the archive. See the specific quickstart `README` file for complete details. - -. Open a terminal and navigate to the root directory of the quickstart you want to build. -. Use the following command if you only want to build the archive, but not deploy it. -+ -[source,options="nowrap"] ----- -$ mvn clean install ----- - -[[build_and_deploy_the_quickstart]] -==== Build and Deploy the Quickstart - -This section describes the basic steps to build and deploy an application. See the specific instructions in each quickstart `README` file for any variations to this process. - -. Make sure you start the {productName} server as described in the quickstart `README` file. -. Open a terminal and navigate to the root directory of the quickstart you want to run. -. Use the following command to build and deploy the archive. -+ -[source,options="nowrap"] ----- -$ mvn clean install wildfly:deploy ----- - -[[undeploy_the_quickstart]] -==== Undeploy an Quickstart - -Use the following command to undeploy the quickstart. - -[source,options="nowrap"] ----- -$ mvn wildfly:undeploy ----- - -// Getting Started with OpenShift -include::shared-doc/openshift-getting-started-overview.adoc[leveloffset=+1] - -[[run_the_quickstarts_in_jboss_developer_studio_or_eclipse]] -== Run the Quickstarts in {JBDSProductName} or Eclipse - -You can also start the server and deploy the quickstarts or run the Arquillian tests from Eclipse using JBoss tools. For general information about how to import a quickstart, add a {productName} server, and build and deploy a quickstart, see link:{useEclipseUrl}[Use {JBDSProductName} or Eclipse to Run the Quickstarts]. - -ifdef::ProductRelease[] -// Optional components are used only for the Product Releases. -[[optional_components]] -== Configure Optional Components - -The following components are needed for only a small subset of the quickstarts. Do not install or configure them unless the quickstart requires it. - -* xref:create_quickstart_users[Create Quickstart Users] -* xref:configure_postgresql[Configure the PostgreSQL Database] -* xref:configure_byteman[Configure Byteman] - -[[create_quickstart_users]] -=== Create Quickstart Users - -Some of the quickstarts, particularly those that run in a secured mode and demonstrate security, require that you create quickstart users with different roles for authorization purposes. See https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/CREATE_USERS.adoc#create_users_required_by_the_quickstarts[Create Users Required by the Quickstarts] for detailed instructions to create users required by the quickstarts. - -[[configure_postgresql]] -=== Configure the PostgreSQL Database - -Some of the quickstarts that demonstrate transactions require that you install and configure the PostgreSQL database. See https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/CONFIGURE_POSTGRESQL_JBOSS_EAP.adoc#configure_the_postgresql_database_for_use_with_the_quickstarts[Configure the PostgreSQL Database for Use with the Quickstarts] for instructions. - -[[configure_byteman]] -=== Configure Byteman - -A few of the quickstarts use _Byteman_ to demonstrate distributed transaction processing and crash recovery. See https://github.com/jboss-developer/jboss-developer-shared-resources/blob/master/guides/CONFIGURE_BYTEMAN.adoc#configure_byteman_for_use_with_the_quickstarts[Configure Byteman for Use with the Quickstarts] for instructions. -// END ifdef::ProductRelease[] -endif::[] - -// The following is included for all versions: WildFly, JBoss EAP, EAP CD and EAP XP -[[available_quickstarts]] -== Table of Available Quickstarts - -All available quickstarts, which are listed in the following table, can be found here: {githubRepoUrl}. - -Each quickstart provides the list of technologies demonstrated by the quickstart and the required experience level needed to build and deploy it. Click on the quickstart link in the table to see more detailed information about how to run it. Some quickstarts require deployment of other quickstarts. This information is noted in the `Prerequisites` section of the quickstart `README.html` file. - -NOTE: Some of these quickstarts use the H2 database included with WildFly. It is a lightweight, relational example datasource that is used for examples only. It is not robust or scalable, is not supported, and should NOT be used in a production environment! - -// -[cols="1,1,1,2,1,1", options="header"] -|=== -| Quickstart Name | Demonstrated Technologies | Openshift Compatible | Description | Experience Level Required | Prerequisites -| link:app-client[app-client]|EJB, EAR, AppClient | No | The `app-client` quickstart demonstrates how to code and package a client app and use the {productName} client container to start the client `Main` program. | Intermediate | _none_ -| link:batch-processing[batch-processing]|CDI, Batch 1.0, JSF | Yes | The `batch-processing` quickstart shows how to use chunk oriented batch jobs to import a file to a database. | Intermediate | _none_ -| link:bean-validation[bean-validation]|CDI, JPA, BV | No | The `bean-validation` quickstart provides Arquillian tests to demonstrate how to use CDI, JPA, and Bean Validation. | Beginner | _none_ -| link:bean-validation-custom-constraint[bean-validation-custom-constraint]|CDI, JPA, BV | No | The `bean-validation-custom-constraint` quickstart demonstrates how to use the Bean Validation API to define custom constraints and validators. | Beginner | _none_ -| link:bmt[bmt]|EJB, BMT | Yes | The `bmt` quickstart demonstrates Bean-Managed Transactions (BMT), showing how to manually manage transaction demarcation while accessing JPA entities. | Intermediate | _none_ -| link:cmt[cmt]|EJB, CMT, JMS | Yes | The `cmt` quickstart demonstrates Container-Managed Transactions (CMT), showing how to use transactions managed by the container. | Intermediate | _none_ -| link:contacts-jquerymobile[contacts-jquerymobile]|jQuery Mobile, jQuery, JavaScript, HTML5, REST | Yes | The `contacts-jquerymobile` quickstart demonstrates a {javaVersion} mobile database application using HTML5, jQuery Mobile, JAX-RS, JPA, and REST. | Beginner | _none_ -| link:ejb-asynchronous[ejb-asynchronous]|Asynchronous EJB | No | The `ejb-asynchronous` quickstart demonstrates the behavior of asynchronous EJB invocations by a deployed EJB and a remote client and how to handle errors. | Advanced | _none_ -| link:ejb-in-ear[ejb-in-ear]|EJB, EAR | No | The `ejb-in-ear` quickstart demonstrates how to deploy an EAR archive that contains a *JSF* WAR and an EJB JAR. | Intermediate | _none_ -| link:ejb-in-war[ejb-in-war]|EJB, JSF, WAR | Yes | The `ejb-in-war` quickstart demonstrates how to package an EJB bean in a WAR archive and deploy it to {productName}. Arquillian tests are also provided. | Intermediate | _none_ -| link:ejb-multi-server[ejb-multi-server]|EJB, EAR | No | The `ejb-multi-server` quickstart shows how to communicate between multiple applications deployed to different servers using an EJB to log the invocation. | Advanced | _none_ -| link:ejb-remote[ejb-remote]|EJB, JNDI | No | The `ejb-remote` quickstart uses EJB and JNDI to demonstrate how to access an EJB, deployed to {productName}, from a remote Java client application. | Intermediate | _none_ -| link:ejb-security[ejb-security]|EJB, Security | No | The `ejb-security` quickstart demonstrates the use of Jakarta EE declarative security to control access to EJBs in {productName}. | Intermediate | _none_ -| link:ejb-security-context-propagation[ejb-security-context-propagation]|EJB, Security | No | The `ejb-security-context-propagation` quickstart demonstrates how the security context can be propagated to a remote EJB using a remote outbound connection configuration | Advanced | _none_ -| link:ejb-security-jaas[ejb-security-jaas]|EJB, Security | No | The `ejb-security-jaas` quickstart demonstrates how legacy `JAAS` security domains can be used in conjunction with `Elytron` | Intermediate | _none_ -| link:ejb-security-programmatic-auth[ejb-security-programmatic-auth]|EJB, Security | No | The `ejb-security-programmatic-auth` quickstart demonstrates how to programmatically setup different identities when invoking a remote secured EJB. | Intermediate | _none_ -| link:ejb-throws-exception[ejb-throws-exception]|EJB, EAR | No | The `ejb-throws-exception` quickstart demonstrates how to throw and handle exceptions across JARs in an EAR. | Intermediate | _none_ -| link:ejb-timer[ejb-timer]|EJB Timer | Yes | The `ejb-timer` quickstart demonstrates how to use the EJB timer service `@Schedule` and `@Timeout` annotations with {productName}. | Beginner | _none_ -| link:greeter[greeter]|CDI, JSF, JPA, EJB, JTA | Yes | The `greeter` quickstart demonstrates the use of CDI, JPA, JTA, EJB and JSF in {productName}. | Beginner | _none_ -| link:ha-singleton-deployment[ha-singleton-deployment]|EJB, Singleton Deployments, Clustering | No | The `ha-singleton-deployment` quickstart demonstrates the recommended way to deploy any service packaged in an application archive as a cluster-wide singleton. | Advanced | _none_ -| link:ha-singleton-service[ha-singleton-service]|JBoss MSC, Singleton Service, Clustering | No | The `ha-singleton-service` quickstart demonstrates how to deploy a cluster-wide singleton JBoss MSC service. | Advanced | _none_ -| link:helloworld[helloworld]|CDI, Servlet | Yes | The `helloworld` quickstart demonstrates the use of CDI and Servlet 3 and is a good starting point to verify {productName} is configured correctly. | Beginner | _none_ -| link:helloworld-html5[helloworld-html5]|CDI, JAX-RS, HTML5 | Yes | The `helloworld-html5` quickstart demonstrates the use of CDI 1.2 and JAX-RS 2.0 using the HTML5 architecture and RESTful services on the backend. | Beginner | _none_ -| link:helloworld-jms[helloworld-jms]|JMS | No | The `helloworld-jms` quickstart demonstrates the use of external JMS clients with {productName}. | Intermediate | _none_ -| link:helloworld-mbean[helloworld-mbean]|CDI, JMX, MBean | No | The `helloworld-mbean` quickstart demonstrates the use of CDI and MBean in {productName} and includes JConsole instructions and Arquillian tests. | Intermediate | _none_ -| link:helloworld-mdb[helloworld-mdb]|JMS, EJB, MDB | Yes | The `helloworld-mdb` quickstart uses JMS and EJB Message-Driven Bean (MDB) to create and deploy JMS topic and queue resources in {productName}. | Intermediate | _none_ -| link:helloworld-mdb-propertysubstitution[helloworld-mdb-propertysubstitution]|JMS, EJB, MDB | No | The `helloworld-mdb-propertysubstitution` quickstart demonstrates the use of JMS and EJB MDB, enabling property substitution with annotations. | Intermediate | _none_ -| link:helloworld-mutual-ssl[helloworld-mutual-ssl]|Mutual SSL, Undertow | No | The `helloworld-mutual-ssl` quickstart is a basic example that demonstrates mutual SSL configuration in {productName} | Intermediate | _none_ -| link:helloworld-mutual-ssl-secured[helloworld-mutual-ssl-secured]|Mutual SSL, Security, Undertow | No | The `helloworld-mutual-ssl-secured` quickstart demonstrates securing a Web application using client mutual SSL authentication and role-based access control | Intermediate | _none_ -| link:helloworld-rs[helloworld-rs]|CDI, JAX-RS | Yes | The `helloworld-rs` quickstart demonstrates a simple Hello World application, bundled and deployed as a WAR, that uses JAX-RS to say Hello. | Intermediate | _none_ -| link:helloworld-singleton[helloworld-singleton]|EJB, Singleton | Yes | The `helloworld-singleton` quickstart demonstrates an EJB Singleton Bean that is instantiated once and maintains state for the life of the session. | Beginner | _none_ -| link:helloworld-ssl[helloworld-ssl]|SSL, Undertow | No | The `helloworld-ssl` quickstart is a basic example that demonstrates server side SSL configuration in {productName}. | Beginner | _none_ -| link:helloworld-ws[helloworld-ws]|JAX-WS | No | The `helloworld-ws` quickstart demonstrates a simple Hello World application, bundled and deployed as a WAR, that uses JAX-WS to say Hello. | Beginner | _none_ -| link:hibernate[hibernate]|Hibernate | Yes | The `hibernate` quickstart demonstrates how to use Hibernate ORM 5 API over JPA, using Hibernate-Core and Hibernate Bean Validation, and EJB. | Intermediate | _none_ -| link:inter-app[inter-app]|EJB, CDI, JSF | No | The `inter-app` quickstart shows you how to use a shared API JAR and an EJB to provide inter-application communication between two WAR deployments. | Advanced | _none_ -| link:jaxrs-client[jaxrs-client]|JAX-RS | Yes | The `jaxrs-client` quickstart demonstrates JAX-RS Client API, which interacts with a JAX-RS Web service that runs on {productName}. | Beginner | _none_ -| link:jaxws-addressing[jaxws-addressing]|JAX-WS | No | The `jaxws-addressing` quickstart is a working example of the web service using WS-Addressing. | Beginner | _none_ -| link:jaxws-ejb[jaxws-ejb]|JAX-WS | No | The `jaxws-ejb` quickstart is a working example of the web service endpoint created from an EJB. | Beginner | _none_ -| link:jaxws-pojo[jaxws-pojo]|JAX-WS | No | The `jaxws-pojo` quickstart is a working example of the web service endpoint created from a POJO. | Beginner | _none_ -| link:jaxws-retail[jaxws-retail]|JAX-WS | No | The `jaxws-retail` quickstart is a working example of a simple web service endpoint. | Beginner | _none_ -| link:jsonp[jsonp]|CDI, JSF, JSON-P | Yes | The `jsonp` quickstart demonstrates how to use the JSON-P API to produce object-based structures and then parse and consume them as stream-based JSON strings. | Beginner | _none_ -| link:jta-crash-rec[jta-crash-rec]|JTA, Crash Recovery | No | The `jta-crash-rec` quickstart uses JTA and Byteman to show how to code distributed (XA) transactions in order to preserve ACID properties on server crash. | Advanced | _none_ -| link:jts[jts]|JTS, EJB, JMS | No | The `jts` quickstart shows how to use JTS to perform distributed transactions across multiple containers, fulfilling the properties of an ACID transaction. | Intermediate | link:cmt[cmt] -| link:jts-distributed-crash-rec[jts-distributed-crash-rec]|JTS, Crash Recovery | No | The `jts-distributed-crash-rec` quickstart uses JTS and Byteman to demonstrate distributed crash recovery across multiple application servers. | Advanced | link:jts[jts] -| link:kitchensink[kitchensink]|CDI, JSF, JPA, EJB, JAX-RS, BV | Yes | The `kitchensink` quickstart demonstrates a {javaVersion} web-enabled database application using JSF, CDI, EJB, JPA, and Bean Validation. | Intermediate | _none_ -| link:kitchensink-angularjs[kitchensink-angularjs]|AngularJS, CDI, JPA, EJB, JPA, JAX-RS, BV | Yes | The `kitchensink-angularjs` quickstart demonstrates a {javaVersion} application using AngularJS with JAX-RS, CDI, EJB, JPA, and Bean Validation. | Intermediate | _none_ -| link:kitchensink-ear[kitchensink-ear]|CDI, JSF, JPA, EJB, JAX-RS, BV, EAR | No | The `kitchensink-ear` quickstart demonstrates web-enabled database application, using JSF, CDI, EJB, JPA, and Bean Validation, packaged as an EAR. | Intermediate | _none_ -| link:kitchensink-jsp[kitchensink-jsp]|JSP, JSTL, CDI, JPA, EJB, JAX-RS, BV | Yes | The `kitchensink-jsp` quickstart demonstrates how to use JSP, JSTL, CDI, EJB, JPA, and Bean Validation in {productName}. | Intermediate | _none_ -| link:kitchensink-ml[kitchensink-ml]|CDI, JSF, JPA, EJB, JAX-RS, BV, i18n, l10n | Yes | The `kitchensink-ml` quickstart demonstrates a localized {javaVersion} compliant application using JSF, CDI, EJB, JPA, and Bean Validation. | Intermediate | _none_ -| link:logging[logging]|Logging | No | The `logging` quickstart demonstrates how to configure different logging levels in {productName}. It also includes an asynchronous logging example. | Intermediate | _none_ -| link:logging-tools[logging-tools]|JBoss Logging Tools | Yes | The `logging-tools` quickstart shows how to use JBoss Logging Tools to create internationalized loggers, exceptions, and messages and localize them. | Beginner | _none_ -| link:mail[mail]|JavaMail, CDI, JSF | No | The `mail` quickstart demonstrates how to send email using CDI and JSF and the default Mail provider that ships with {productName}. | Beginner | _none_ -| link:managed-executor-service[managed-executor-service]|EE Concurrency Utilities, JAX-RS, JAX-RS Client API | Yes | The `managed-executor-service` quickstart demonstrates how Jakarta EE applications can submit tasks for asynchronous execution. | Beginner | _none_ -| link:messaging-clustering[messaging-clustering]|JMS, MDB | No | The `messaging-clustering` quickstart does not contain any code and instead uses the `helloworld-mdb` quickstart to demonstrate clustering using ActiveMQ Messaging. | Intermediate | link:helloworld-mdb[helloworld-mdb] -| link:messaging-clustering-singleton[messaging-clustering-singleton]|JMS, MDB, Clustering | No | The `messaging-clustering-singleton` quickstart uses a JMS topic and a queue to demonstrate clustering using {productName} messaging with MDB singleton configuration where only one node in the cluster will be active. | Advanced | _none_ -| link:numberguess[numberguess]|CDI, JSF | Yes | The `numberguess` quickstart demonstrates the use of CDI (Contexts and Dependency Injection) and JSF (JavaServer Faces) in {productName}. | Beginner | _none_ -| link:payment-cdi-event[payment-cdi-event]|CDI, JSF | Yes | The `payment-cdi-event` quickstart demonstrates how to create credit and debit CDI Events in {productName}, using a JSF front-end client. | Beginner | _none_ -| link:resteasy-jaxrs-client[resteasy-jaxrs-client]|JAX-RS, CDI | No | The `resteasy-jaxrs-client` quickstart demonstrates an external JAX-RS RestEasy client, which interacts with a JAX-RS Web service that uses CDI and JAX-RS. | Intermediate | link:helloworld-rs[helloworld-rs] -| link:servlet-async[servlet-async]|Asynchronous Servlet, CDI, EJB | Yes | The `servlet-async` quickstart demonstrates how to use asynchronous servlets to detach long-running tasks and free up the request processing thread. | Intermediate | _none_ -| link:servlet-filterlistener[servlet-filterlistener]|Servlet Filter, Servlet Listener | Yes | The `servlet-filterlistener` quickstart demonstrates how to use Servlet filters and listeners in an application. | Intermediate | _none_ -| link:servlet-security[servlet-security]|Servlet, Security | No | The `servlet-security` quickstart demonstrates the use of Jakarta EE declarative security to control access to Servlets and Security in {productName}. | Intermediate | _none_ -| link:shopping-cart[shopping-cart]|SFSB EJB | No | The `shopping-cart` quickstart demonstrates how to deploy and run a simple {javaVersion} shopping cart application that uses a stateful session bean (SFSB). | Intermediate | _none_ -| link:spring-greeter[spring-greeter]|Spring MVC, JSP, JPA | Yes | The `spring-greeter` quickstart is based on the `greeter` quickstart, but differs in that it uses Spring MVC for Mapping `GET` and `POST` requests. | Beginner | _none_ -| link:spring-kitchensink-basic[spring-kitchensink-basic]|JSP, JPA, JSON, Spring, JUnit | Yes | The `spring-kitchensink-basic` quickstart is an example of a {javaVersion} application using JSP, JPA and Spring 4.x. | Intermediate | _none_ -| link:spring-kitchensink-springmvctest[spring-kitchensink-springmvctest]|JSP, JPA, JSON, Spring, JUnit | Yes | The `spring-kitchensink-springmvctest` quickstart demonstrates how to create an MVC application using JSP, JPA and Spring 4.x. | Intermediate | _none_ -| link:spring-resteasy[spring-resteasy]|Resteasy, Spring | Yes | The `spring-resteasy` quickstart demonstrates how to package and deploy a web application that includes resteasy-spring integration. | Beginner | _none_ -| link:tasks-jsf[tasks-jsf]|JSF, JPA | Yes | The `tasks-jsf` quickstart demonstrates how to use JPA persistence with JSF as the view layer. | Intermediate | _none_ -| link:tasks-rs[tasks-rs]|JPA, JAX-RS | No | The `tasks-rs` quickstart demonstrates how to implement a JAX-RS service that uses JPA persistence. | Intermediate | _none_ -| link:temperature-converter[temperature-converter]|CDI, JSF, SLSB EJB | Yes | The `temperature-converter` quickstart does temperature conversion using an EJB Stateless Session Bean (SLSB), CDI, and a JSF front-end client. | Beginner | _none_ -| link:thread-racing[thread-racing]|Batch, CDI, EE Concurrency, JAX-RS, JMS, JPA, JSON, Web Sockets | Yes | A thread racing web application that demonstrates technologies introduced or updated in the latest Jakarta EE specification. | Beginner | _none_ -| link:websocket-client[websocket-client]|Web Socket, CDI Events, JSON, SSL | Yes | Demonstrates use of a Javascript WebSocket client, WebSocket configuration, programmatic binding, and secure WebSocket. | Intermediate | _none_ -| link:websocket-endpoint[websocket-endpoint]|CDI, WebSocket, JSON-P | Yes | Shows how to use WebSockets with JSON to broadcast information to all open WebSocket sessions in {productName}. | Beginner | _none_ -| link:websocket-hello[websocket-hello]|WebSocket, CDI, JSF | Yes | The `websocket-hello` quickstart demonstrates how to create a simple WebSocket application. | Beginner | _none_ -| link:wsat-simple[wsat-simple]|WS-AT, JAX-WS | No | The `wsat-simple` quickstart demonstrates a WS-AT (WS-AtomicTransaction) enabled JAX-WS Web service, bundled as a WAR, and deployed to {productName}. | Intermediate | _none_ -| link:wsba-coordinator-completion-simple[wsba-coordinator-completion-simple]|WS-BA, JAX-WS | No | The `wsba-coordinator-completion-simple` quickstart deploys a WS-BA (WS Business Activity) enabled JAX-WS Web service WAR (CoordinatorCompletion protocol). | Intermediate | _none_ -| link:wsba-participant-completion-simple[wsba-participant-completion-simple]|WS-BA, JAX-WS | No | The `wsba-participant-completion-simple` quickstart deploys a WS-BA (WS Business Activity) enabled JAX-WS Web service WAR (ParticipantCompletion Protocol). | Intermediate | _none_ -| link:xml-jaxp[xml-jaxp]|JAXP, SAX, DOM, Servlet | Yes | The `xml-jaxp` quickstart demonstrates how to use Servlet and JSF to upload an XML file to {productName} and validate and parse it using DOM or SAX. | Intermediate | _none_ -|=== -// - diff --git a/README.html b/README.html index a560195fce..f04901b087 100644 --- a/README.html +++ b/README.html @@ -447,22 +447,32 @@

Red Hat JBoss Enterprise Application Platform (JBoss EAP) Quickstarts

  • 3. Use of EAP_HOME and QUICKSTART_HOME Variables
  • 4. Suggested Approach to the Quickstarts
  • 5. Run the Quickstarts Using the Maven Command Line - @@ -570,8 +580,8 @@

    5. Run the Quickstarts Using the Maven Command Line -
    -

    5.1. Build the Quickstart Archive

    +
    +

    5.1. Build the Quickstart Archive

    You can follow these steps to build the application to test for compile errors or to view the contents of the archive. See the specific quickstart README file for complete details.

    @@ -591,8 +601,8 @@

    5.1. Build the Quickstart Archive

    -
    -

    5.2. Build and Deploy the Quickstart

    +
    +

    5.2. Build and Deploy the Quickstart

    This section describes the basic steps to build and deploy an application. See the specific instructions in each quickstart README file for any variations to this process.

    @@ -615,8 +625,8 @@

    5.2. Build and Deploy the Quickstart

    -
    -

    5.3. Undeploy an Quickstart

    +
    +

    5.3. Undeploy an Quickstart

    Use the following command to undeploy the quickstart.

    @@ -643,7 +653,120 @@

    6. Getting Started with JBoss E

    -

    7. Run the Quickstarts in Red Hat CodeReady Studio or Eclipse

    +

    7. Use Red Hat CodeReady Workspaces or Eclipse Che

    +
    +
    +

    7.1. What is a devfile

    +
    +
    +
    A devfile is a file that describes and define a development environment:
    +
    +
    +
    +
      +
    • +

      The source code.

      +
      • +
    • +

      The development components, such as browser IDE tools and application runtimes.

      +
      • +
    • +

      A list of pre-defined commands.

      +
      • +
    • +

      Projects to clone.

      +
      • +
    +
    +
    +

    A devfiles is a YAML file that CodeReady Workspaces consumes and transforms into a cloud workspace composed of multiple containers. You can find more details in the End-user Guide for Red Hat CodeReady Workspaces.

    +
    +
    +

    We provide sample Red Hat CodeReady Workspaces or Eclipse Che devfiles to build and run the kitchensink-jsp Quickstart with this cloud IDE.

    +
    +
    + + + + + +
    +
    Important
    +    		 +The devfiles provided are UNSUPPORTED. They are provided as examples only. +
    +
    +
    +
    +

    7.2. How to use those devfiles

    +
    +

    To create your workspace you can either copy and paste the content from our devfiles accessible at crw-java8-maven-eap.yaml and crw-java11-maven-eap.yaml.

    +
    +
    +

    Another solution is to paste the URL:

    +
    +
    + +
    +
    +

    and let the IDE download the files.

    +
    +
    +

    If you want to try this Quickstart on the Developer Sandbox for Red Hat OpenShift you can use the following links :

    +
    +
    + +
    +
    + + + + + +
    +
    Important
    +    		 +When using the Java 8 devfile, you must not install the Java11 plugin in your workspace as it will conflict with the selected Java8 plugin and this will break debugging (see CRW-1789 for more details). So don’t install the proposed plugins when you are prompted. +
    +
    +
    +

    7.2.1. Where to Find Information

    +
    +
      +
    • +

      For information about how to download and install Red Hat CodeReady Workspaces, see the Installation Guide.

      +
      • +
    • +

      For information about how to configure JBoss EAP within Red Hat CodeReady Workspaces, see End-user Guide.

      +
      • +
    • +

      For information about how to import the quickstarts into Red Hat CodeReady Workspaces, and for examples of how to build and deploy a basic quickstart, see Using the Quickstart Examples in the Getting Started Guide for JBoss EAP.

      +
      • +
    +
    +
    +

    See Red Hat CodeReady Workspaces on the Red Hat Developer Program website for additional information.

    +
    +
    +
    +
    +
    +
    +

    8. Run the Quickstarts in Red Hat CodeReady Studio or Eclipse

    You can also start the server and deploy the quickstarts or run the Arquillian tests from Eclipse using JBoss tools. For general information about how to import a quickstart, add a JBoss EAP server, and build and deploy a quickstart, see Use Red Hat CodeReady Studio or Eclipse to Run the Quickstarts.

    @@ -651,7 +774,7 @@

    7. Run the Qui

    -

    8. Configure Optional Components

    +

    9. Configure Optional Components

    The following components are needed for only a small subset of the quickstarts. Do not install or configure them unless the quickstart requires it.

    @@ -670,19 +793,19 @@

    8. Configure Optional Components

    -

    8.1. Create Quickstart Users

    +

    9.1. Create Quickstart Users

    Some of the quickstarts, particularly those that run in a secured mode and demonstrate security, require that you create quickstart users with different roles for authorization purposes. See Create Users Required by the Quickstarts for detailed instructions to create users required by the quickstarts.

    -

    8.2. Configure the PostgreSQL Database

    +

    9.2. Configure the PostgreSQL Database

    Some of the quickstarts that demonstrate transactions require that you install and configure the PostgreSQL database. See Configure the PostgreSQL Database for Use with the Quickstarts for instructions.

    -

    8.3. Configure Byteman

    +

    9.3. Configure Byteman

    A few of the quickstarts use Byteman to demonstrate distributed transaction processing and crash recovery. See Configure Byteman for Use with the Quickstarts for instructions.

    @@ -690,7 +813,7 @@

    8.3. Configure Byteman

    -

    9. Table of Available Quickstarts

    +

    10. Table of Available Quickstarts

    All available quickstarts, which are listed in the following table, can be found here: https://github.com/jboss-developer/jboss-eap-quickstarts/.

    @@ -875,6 +998,14 @@

    9. Table of Available Quickstarts

    none

    +

    ejb-txn-remote-call

    +

    EJB, JTA, Clustering

    +

    Yes

    +

    The ejb-txn-remote-call quickstart demonstrates remote transactional EJB calls over two application servers of JBoss EAP.

    +

    Intermediate

    +

    none

    + +

    greeter

    CDI, JSF, JPA, EJB, JTA

    Yes

    @@ -1238,7 +1369,7 @@

    9. Table of Available Quickstarts

    spring-kitchensink-basic

    JSP, JPA, JSON, Spring, JUnit

    Yes

    -

    The spring-kitchensink-basic quickstart is an example of a Jakarta EE 8 application using JSP, JPA and Spring 4.x.

    +

    The spring-kitchensink-basic quickstart is an example of a Jakarta EE 8 application using JSP, JPA and Spring 5.x.

    Intermediate

    none

    @@ -1246,7 +1377,7 @@

    9. Table of Available Quickstarts

    spring-kitchensink-springmvctest

    JSP, JPA, JSON, Spring, JUnit

    Yes

    -

    The spring-kitchensink-springmvctest quickstart demonstrates how to create an MVC application using JSP, JPA and Spring 4.x.

    +

    The spring-kitchensink-springmvctest quickstart demonstrates how to create an MVC application using JSP, JPA and Spring 5.x.

    Intermediate

    none

    @@ -1291,6 +1422,14 @@

    9. Table of Available Quickstarts

    none

    +

    todo-backend

    +

    JPA, JAX-RS, OpenShift, Galleon

    +

    No

    +

    The todo-backend quickstart demonstrates how to implement a backend that exposes a HTTP API with JAX-RS

    +

    Intermediate

    +

    none

    + +

    websocket-client

    Web Socket, CDI Events, JSON, SSL

    Yes

    @@ -1353,7 +1492,7 @@

    9. Table of Available Quickstarts

    diff --git a/README.md b/README.md new file mode 100644 index 0000000000..2b2da21f07 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +The quickstarts demonstrate Jakarta EE 8 and a few additional technologies from the Red Hat JBoss Enterprise Application Platform stack. They provide small, specific, working examples that can be used as a reference for your own project. + +This branch contains the latest 7.4 release of the Red Hat JBoss EAP quickstarts. + +Please refer to the root README.html for additional information. \ No newline at end of file diff --git a/app-client/README.html b/app-client/README.html index 80ebecf750..a1bbb9d161 100644 --- a/app-client/README.html +++ b/app-client/README.html @@ -885,7 +885,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/app-client/client-simple/pom.xml b/app-client/client-simple/pom.xml index 73b69edd8c..de57782528 100644 --- a/app-client/client-simple/pom.xml +++ b/app-client/client-simple/pom.xml @@ -22,7 +22,7 @@ org.jboss.eap.quickstarts app-client - 7.4.0.Beta + 7.4.0.GA app-client-client-simple jar diff --git a/app-client/ear/pom.xml b/app-client/ear/pom.xml index b2ebac3c55..c6194ea669 100644 --- a/app-client/ear/pom.xml +++ b/app-client/ear/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts app-client - 7.4.0.Beta + 7.4.0.GA app-client-ear ear diff --git a/app-client/ejb/pom.xml b/app-client/ejb/pom.xml index 990e3890f7..cdf71dee3e 100644 --- a/app-client/ejb/pom.xml +++ b/app-client/ejb/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts app-client - 7.4.0.Beta + 7.4.0.GA app-client-ejb ejb diff --git a/app-client/pom.xml b/app-client/pom.xml index 95cda5420a..be58945f14 100644 --- a/app-client/pom.xml +++ b/app-client/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml app-client @@ -32,7 +32,8 @@ Quickstart: app-client This project demonstrates how to package and use an EE application client. This POM defines common properties to specify the used versions and plug-ins. - The subprojects are built in the appropriate sequence. + The subprojects are built in the appropriate sequence. + diff --git a/batch-processing/README.html b/batch-processing/README.html index 71fb88d4fb..460a3c76c6 100644 --- a/batch-processing/README.html +++ b/batch-processing/README.html @@ -892,7 +892,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -901,10 +901,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -913,7 +913,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -922,10 +922,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -935,17 +935,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -988,12 +988,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the batch-processing source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the batch-processing source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="batch-processing-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1032,9 +1032,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="batch-processing-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1119,11 +1119,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1181,7 +1181,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1222,7 +1222,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3

    • @@ -1233,7 +1233,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml index 05f96a8b97..d3de7926a7 100644 --- a/batch-processing/pom.xml +++ b/batch-processing/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/bean-validation-custom-constraint/README.html b/bean-validation-custom-constraint/README.html index c3f330642e..d2576fcb01 100644 --- a/bean-validation-custom-constraint/README.html +++ b/bean-validation-custom-constraint/README.html @@ -688,7 +688,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/bean-validation-custom-constraint/pom.xml b/bean-validation-custom-constraint/pom.xml index 232f8acf67..f5922ed56e 100644 --- a/bean-validation-custom-constraint/pom.xml +++ b/bean-validation-custom-constraint/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/bean-validation/README.html b/bean-validation/README.html index 3ff8dc774a..77f8f88e2a 100644 --- a/bean-validation/README.html +++ b/bean-validation/README.html @@ -671,7 +671,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/bean-validation/pom.xml b/bean-validation/pom.xml index 3ef60711a9..fee315994a 100644 --- a/bean-validation/pom.xml +++ b/bean-validation/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/bmt/README.html b/bmt/README.html index 8a82f22d70..af7a3b6bea 100644 --- a/bmt/README.html +++ b/bmt/README.html @@ -787,7 +787,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -796,10 +796,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -808,7 +808,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -817,10 +817,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -830,17 +830,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -883,12 +883,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the bmt source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the bmt source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="bmt-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -927,9 +927,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="bmt-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1014,11 +1014,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1076,7 +1076,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1117,7 +1117,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1128,7 +1128,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/bmt/pom.xml b/bmt/pom.xml index c131755bb7..b295f31f87 100644 --- a/bmt/pom.xml +++ b/bmt/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/cmt/README.html b/cmt/README.html index c120496845..bf870efd6f 100644 --- a/cmt/README.html +++ b/cmt/README.html @@ -846,7 +846,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -855,10 +855,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -867,7 +867,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -876,10 +876,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -889,17 +889,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -942,12 +942,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the cmt source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the cmt source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="cmt-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -986,9 +986,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="cmt-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1073,11 +1073,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1135,7 +1135,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1176,7 +1176,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1187,7 +1187,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/cmt/pom.xml b/cmt/pom.xml index e95939697c..33e4bd9f12 100644 --- a/cmt/pom.xml +++ b/cmt/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml cmt diff --git a/contacts-jquerymobile/README.html b/contacts-jquerymobile/README.html index a21ef328e7..d7554c970f 100644 --- a/contacts-jquerymobile/README.html +++ b/contacts-jquerymobile/README.html @@ -1040,7 +1040,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -1049,10 +1049,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -1061,7 +1061,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -1070,10 +1070,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -1083,17 +1083,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -1136,12 +1136,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the contacts-jquerymobile source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the contacts-jquerymobile source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="contacts-jquerymobile-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1176,9 +1176,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="contacts-jquerymobile-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1259,11 +1259,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1321,7 +1321,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1362,7 +1362,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1373,7 +1373,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/contacts-jquerymobile/functional-tests/pom.xml b/contacts-jquerymobile/functional-tests/pom.xml index 5d2bf3809c..e305d6b656 100644 --- a/contacts-jquerymobile/functional-tests/pom.xml +++ b/contacts-jquerymobile/functional-tests/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../../pom.xml contacts-jquerymobile-test-webdriver diff --git a/contacts-jquerymobile/functional-tests/src/test/resources/arquillian.xml b/contacts-jquerymobile/functional-tests/src/test/resources/arquillian.xml index 566978211a..eda7b569f1 100644 --- a/contacts-jquerymobile/functional-tests/src/test/resources/arquillian.xml +++ b/contacts-jquerymobile/functional-tests/src/test/resources/arquillian.xml @@ -32,13 +32,8 @@ - - firefox - - + + phantomjs diff --git a/contacts-jquerymobile/pom.xml b/contacts-jquerymobile/pom.xml index ed99961b13..dc18f9b9a8 100644 --- a/contacts-jquerymobile/pom.xml +++ b/contacts-jquerymobile/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml contacts-jquerymobile @@ -188,7 +188,8 @@ wro4j-maven-plugin ${version.ro.isdc.wro4j} - app.min,formSetup.min,namespace.min,submissions.min,theming.min,util.min,validation.min,app-style.min,validator.min + app.min,formSetup.min,namespace.min,submissions.min,theming.min,util.min,validation.min,app-style.min,validator.min + ${project.build.directory}/${project.build.finalName}/css/ ${project.build.directory}/${project.build.finalName}/js/ ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory diff --git a/ejb-asynchronous/README.html b/ejb-asynchronous/README.html index 554c9704e1..72505995b0 100644 --- a/ejb-asynchronous/README.html +++ b/ejb-asynchronous/README.html @@ -722,7 +722,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/ejb-asynchronous/client/pom.xml b/ejb-asynchronous/client/pom.xml index c177c3ed35..0677765f5a 100644 --- a/ejb-asynchronous/client/pom.xml +++ b/ejb-asynchronous/client/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-asynchronous - 7.4.0.Beta + 7.4.0.GA ejb-asynchronous-client jar @@ -81,7 +81,7 @@ -classpath - + org.jboss.as.quickstarts.ejb.asynchronous.client.AsynchronousClient     diff --git a/ejb-asynchronous/ejb/pom.xml b/ejb-asynchronous/ejb/pom.xml index 05ec458f61..e3dc721f28 100644 --- a/ejb-asynchronous/ejb/pom.xml +++ b/ejb-asynchronous/ejb/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-asynchronous - 7.4.0.Beta + 7.4.0.GA ejb-asynchronous-ejb ejb diff --git a/ejb-asynchronous/pom.xml b/ejb-asynchronous/pom.xml index 64af18ef93..ab18e4f479 100644 --- a/ejb-asynchronous/pom.xml +++ b/ejb-asynchronous/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml ejb-asynchronous @@ -53,7 +53,7 @@ ${project.groupId} ejb-asynchronous-ejb - 7.4.0.Beta + 7.4.0.GA ejb-client diff --git a/ejb-in-ear/README.html b/ejb-in-ear/README.html index 2d238d7044..deadb1dc83 100644 --- a/ejb-in-ear/README.html +++ b/ejb-in-ear/README.html @@ -687,7 +687,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/ejb-in-ear/ear/pom.xml b/ejb-in-ear/ear/pom.xml index c6a52b107a..47205a74f7 100644 --- a/ejb-in-ear/ear/pom.xml +++ b/ejb-in-ear/ear/pom.xml @@ -26,7 +26,7 @@ org.jboss.eap.quickstarts ejb-in-ear - 7.4.0.Beta + 7.4.0.GA ejb-in-ear-ear ear diff --git a/ejb-in-ear/ejb/pom.xml b/ejb-in-ear/ejb/pom.xml index eabae061d8..ef742c346d 100644 --- a/ejb-in-ear/ejb/pom.xml +++ b/ejb-in-ear/ejb/pom.xml @@ -26,7 +26,7 @@ org.jboss.eap.quickstarts ejb-in-ear - 7.4.0.Beta + 7.4.0.GA ejb-in-ear-ejb Quickstart: ejb-in-ear - ejb diff --git a/ejb-in-ear/pom.xml b/ejb-in-ear/pom.xml index fd2629f249..e2f8b70338 100644 --- a/ejb-in-ear/pom.xml +++ b/ejb-in-ear/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml ejb-in-ear @@ -53,7 +53,7 @@ ${project.groupId} ejb-in-ear-ejb - 7.4.0.Beta + 7.4.0.GA ejb @@ -62,7 +62,7 @@ ${project.groupId} ejb-in-ear-web - 7.4.0.Beta + 7.4.0.GA war compile diff --git a/ejb-in-ear/web/pom.xml b/ejb-in-ear/web/pom.xml index 2ffc105ad3..a41d0082a6 100644 --- a/ejb-in-ear/web/pom.xml +++ b/ejb-in-ear/web/pom.xml @@ -26,7 +26,7 @@ org.jboss.eap.quickstarts ejb-in-ear - 7.4.0.Beta + 7.4.0.GA ejb-in-ear-web war diff --git a/ejb-in-war/README.html b/ejb-in-war/README.html index c08dfdeade..b39f0b50df 100644 --- a/ejb-in-war/README.html +++ b/ejb-in-war/README.html @@ -822,7 +822,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -831,10 +831,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -843,7 +843,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -852,10 +852,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -865,17 +865,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -918,12 +918,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the ejb-in-war source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the ejb-in-war source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="ejb-in-war-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -958,9 +958,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="ejb-in-war-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1041,11 +1041,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1103,7 +1103,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1144,7 +1144,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1155,7 +1155,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/ejb-in-war/pom.xml b/ejb-in-war/pom.xml index 23f6fe622b..d4b9cc9e14 100644 --- a/ejb-in-war/pom.xml +++ b/ejb-in-war/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml ejb-in-war diff --git a/ejb-multi-server/README.html b/ejb-multi-server/README.html index 4b2ebaca09..7f798f61d9 100644 --- a/ejb-multi-server/README.html +++ b/ejb-multi-server/README.html @@ -1034,7 +1034,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/ejb-multi-server/app-main/ear/pom.xml b/ejb-multi-server/app-main/ear/pom.xml index 72b9d61f48..7e9dcde690 100644 --- a/ejb-multi-server/app-main/ear/pom.xml +++ b/ejb-multi-server/app-main/ear/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server-app-main - 7.4.0.Beta + 7.4.0.GA ejb-multi-server-app-main-ear ear diff --git a/ejb-multi-server/app-main/ejb/pom.xml b/ejb-multi-server/app-main/ejb/pom.xml index 5b1adcb3a3..65a376bcdc 100644 --- a/ejb-multi-server/app-main/ejb/pom.xml +++ b/ejb-multi-server/app-main/ejb/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server-app-main - 7.4.0.Beta + 7.4.0.GA ejb-multi-server-app-main-ejb ejb @@ -56,6 +56,11 @@ jboss-annotations-api_1.3_spec provided + + org.jboss.ejb3 + jboss-ejb3-ext-api + provided + diff --git a/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppBean.java b/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppBean.java index fdf03b0a52..f3f298619e 100644 --- a/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppBean.java +++ b/ejb-multi-server/app-main/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/MainAppBean.java @@ -28,6 +28,8 @@ import javax.naming.InitialContext; import javax.naming.NamingException; +import org.jboss.ejb3.annotation.SecurityDomain; + import org.jboss.logging.Logger; /** @@ -38,6 +40,7 @@ * @author Wolf-Dieter Fink */ @Stateless +@SecurityDomain("other") public class MainAppBean implements MainApp { private static final Logger LOGGER = Logger.getLogger(MainAppBean.class); @Resource diff --git a/ejb-multi-server/app-main/pom.xml b/ejb-multi-server/app-main/pom.xml index 5ad6ed88b0..3a9cf1015d 100644 --- a/ejb-multi-server/app-main/pom.xml +++ b/ejb-multi-server/app-main/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server - 7.4.0.Beta + 7.4.0.GA ../pom.xml ejb-multi-server-app-main diff --git a/ejb-multi-server/app-main/web/pom.xml b/ejb-multi-server/app-main/web/pom.xml index 5bdd6ed2a1..9fdde74b46 100644 --- a/ejb-multi-server/app-main/web/pom.xml +++ b/ejb-multi-server/app-main/web/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server-app-main - 7.4.0.Beta + 7.4.0.GA ejb-multi-server-app-main-web war diff --git a/ejb-multi-server/app-one/ear/pom.xml b/ejb-multi-server/app-one/ear/pom.xml index 7e587c0226..bc664baffd 100644 --- a/ejb-multi-server/app-one/ear/pom.xml +++ b/ejb-multi-server/app-one/ear/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server-app-one - 7.4.0.Beta + 7.4.0.GA ejb-multi-server-app-one-ear ear diff --git a/ejb-multi-server/app-one/ejb/pom.xml b/ejb-multi-server/app-one/ejb/pom.xml index ede244646e..1abc8fe0c5 100644 --- a/ejb-multi-server/app-one/ejb/pom.xml +++ b/ejb-multi-server/app-one/ejb/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server-app-one - 7.4.0.Beta + 7.4.0.GA ejb-multi-server-app-one-ejb ejb @@ -49,6 +49,11 @@ jboss-logging provided + + org.jboss.ejb3 + jboss-ejb3-ext-api + provided + diff --git a/ejb-multi-server/app-one/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppOneBean.java b/ejb-multi-server/app-one/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppOneBean.java index 4bd0f3cff4..62be74fa38 100644 --- a/ejb-multi-server/app-one/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppOneBean.java +++ b/ejb-multi-server/app-one/ejb/src/main/java/org/jboss/as/quickstarts/ejb/multi/server/app/AppOneBean.java @@ -22,6 +22,8 @@ import javax.ejb.SessionContext; import javax.ejb.Stateless; +import org.jboss.ejb3.annotation.SecurityDomain; + import org.jboss.logging.Logger; /** @@ -37,6 +39,7 @@ * @author Wolf-Dieter Fink */ @Stateless +@SecurityDomain("other") public class AppOneBean implements AppOne { private static final Logger LOGGER = Logger.getLogger(AppOneBean.class); diff --git a/ejb-multi-server/app-one/pom.xml b/ejb-multi-server/app-one/pom.xml index 2fde6522a0..810edb7a3c 100644 --- a/ejb-multi-server/app-one/pom.xml +++ b/ejb-multi-server/app-one/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server - 7.4.0.Beta + 7.4.0.GA ejb-multi-server-app-one pom diff --git a/ejb-multi-server/app-two/ear/pom.xml b/ejb-multi-server/app-two/ear/pom.xml index eb231238ec..b73ed2f7a5 100644 --- a/ejb-multi-server/app-two/ear/pom.xml +++ b/ejb-multi-server/app-two/ear/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server-app-two - 7.4.0.Beta + 7.4.0.GA ejb-multi-server-app-two-ear ear diff --git a/ejb-multi-server/app-two/ejb/pom.xml b/ejb-multi-server/app-two/ejb/pom.xml index 9a18c7f426..726bfcce1c 100644 --- a/ejb-multi-server/app-two/ejb/pom.xml +++ b/ejb-multi-server/app-two/ejb/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server-app-two - 7.4.0.Beta + 7.4.0.GA ejb-multi-server-app-two-ejb ejb diff --git a/ejb-multi-server/app-two/pom.xml b/ejb-multi-server/app-two/pom.xml index c2bf63e988..45e10d45ef 100644 --- a/ejb-multi-server/app-two/pom.xml +++ b/ejb-multi-server/app-two/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server - 7.4.0.Beta + 7.4.0.GA ejb-multi-server-app-two pom diff --git a/ejb-multi-server/app-web/pom.xml b/ejb-multi-server/app-web/pom.xml index 1afe6a3b20..4593527e13 100644 --- a/ejb-multi-server/app-web/pom.xml +++ b/ejb-multi-server/app-web/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server - 7.4.0.Beta + 7.4.0.GA ejb-multi-server-app-web war diff --git a/ejb-multi-server/client/pom.xml b/ejb-multi-server/client/pom.xml index a155f9a5b7..4ab5482973 100644 --- a/ejb-multi-server/client/pom.xml +++ b/ejb-multi-server/client/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-multi-server - 7.4.0.Beta + 7.4.0.GA ejb-multi-server-client jar diff --git a/ejb-multi-server/install-domain.cli b/ejb-multi-server/install-domain.cli index 297b82f7a3..83f882a929 100644 --- a/ejb-multi-server/install-domain.cli +++ b/ejb-multi-server/install-domain.cli @@ -21,6 +21,7 @@ batch /host=master/core-service=management/security-realm=ApplicationRealm/authentication=local:remove /profile=default/subsystem=ejb3:write-attribute(name=default-missing-method-permissions-deny-access, value=false) +/profile=full/subsystem=ejb3:write-attribute(name=default-missing-method-permissions-deny-access, value=false) /profile=ha/subsystem=ejb3:write-attribute(name=default-missing-method-permissions-deny-access, value=false) # Set the property for unique Tx node identifier @@ -237,6 +238,12 @@ batch /host=master/server-config=app-web:add(auto-start=true, group=quickstart-ejb-multi-appWeb-server, socket-binding-port-offset=300) /host=master/server-config=app-web/system-property=txNodeIdentifier:add(value=web) +# update interface bind addresses from '127.0.0.1' to 'localhost' to workaround an authentication issue +/host=master/interface=management:write-attribute(name=inet-address, value="${jboss.bind.address.management:localhost}" +/host=master/interface=public:write-attribute(name=inet-address, value="${jboss.bind.address:localhost}" +/interface=private:write-attribute(name=inet-address, value="${jboss.bind.address.private:localhost}") +/interface=unsecure:write-attribute(name=inet-address, value="${jboss.bind.address.unsecure:localhost}") + # Run the batch run-batch diff --git a/ejb-multi-server/pom.xml b/ejb-multi-server/pom.xml index c86b174922..472cccba24 100644 --- a/ejb-multi-server/pom.xml +++ b/ejb-multi-server/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml ejb-multi-server @@ -32,7 +32,8 @@ Quickstart: ejb-multi-server A project that demonstrates multiple applications deployed on different servers. This POM defines common properties to specify the used versions and plug-ins. - The subprojects are built in the appropriate sequence. + The subprojects are built in the appropriate sequence. + diff --git a/ejb-remote/README.html b/ejb-remote/README.html index 1f5d0f39df..e3bb913b9c 100644 --- a/ejb-remote/README.html +++ b/ejb-remote/README.html @@ -510,7 +510,7 @@

    Use of the EAP_HOME and QUICKSTART_HOME Variable

    Add the Authorized Application User

    -

    This quickstart uses secured management interfaces and requires that you create the following application user to access the running application.

    +

    This quickstart uses secured application interfaces and requires that you create the following application user to access the running application.

    @@ -897,7 +897,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/ejb-remote/client/pom.xml b/ejb-remote/client/pom.xml index b4add899b2..39373e5c51 100644 --- a/ejb-remote/client/pom.xml +++ b/ejb-remote/client/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-remote - 7.4.0.Beta + 7.4.0.GA ../pom.xml ejb-remote-client @@ -71,7 +71,7 @@ -Dhttp=${http} -classpath - + org.jboss.as.quickstarts.ejb.remote.client.RemoteEJBClient diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml index e7b7168864..e1cfe8f12d 100644 --- a/ejb-remote/pom.xml +++ b/ejb-remote/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA../pom.xmlejb-remote diff --git a/ejb-remote/server-side/pom.xml b/ejb-remote/server-side/pom.xml index 6a412a8245..91c0c0980f 100644 --- a/ejb-remote/server-side/pom.xml +++ b/ejb-remote/server-side/pom.xml @@ -20,7 +20,7 @@ org.jboss.eap.quickstarts ejb-remote - 7.4.0.Beta + 7.4.0.GA ../pom.xml ejb-remote-server-side diff --git a/ejb-security-context-propagation/README.html b/ejb-security-context-propagation/README.html index 7cca194965..0d231657ad 100644 --- a/ejb-security-context-propagation/README.html +++ b/ejb-security-context-propagation/README.html @@ -1149,7 +1149,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/ejb-security-context-propagation/pom.xml b/ejb-security-context-propagation/pom.xml index dc25a3f135..233d947625 100644 --- a/ejb-security-context-propagation/pom.xml +++ b/ejb-security-context-propagation/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA../pom.xmlejb-security-context-propagation @@ -100,7 +100,7 @@ -classpath - + org.jboss.as.quickstarts.ejb_security_context_propagation.RemoteClient diff --git a/ejb-security-jaas/README.html b/ejb-security-jaas/README.html index 98fa28dba5..7ce41e6e3d 100644 --- a/ejb-security-jaas/README.html +++ b/ejb-security-jaas/README.html @@ -1166,7 +1166,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/ejb-security-jaas/pom.xml b/ejb-security-jaas/pom.xml index 6a69da6aa9..93858918f5 100644 --- a/ejb-security-jaas/pom.xml +++ b/ejb-security-jaas/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml ejb-security-jaas @@ -99,7 +99,7 @@ -classpath - + org.jboss.as.quickstarts.ejb_security_jaas.RemoteClient diff --git a/ejb-security-programmatic-auth/README.html b/ejb-security-programmatic-auth/README.html index 422a6a0133..3320954308 100644 --- a/ejb-security-programmatic-auth/README.html +++ b/ejb-security-programmatic-auth/README.html @@ -939,7 +939,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/ejb-security-programmatic-auth/pom.xml b/ejb-security-programmatic-auth/pom.xml index a073ee7d2f..3b5c01578b 100644 --- a/ejb-security-programmatic-auth/pom.xml +++ b/ejb-security-programmatic-auth/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml ejb-security-programmatic-auth @@ -95,7 +95,7 @@ -classpath - + org.jboss.as.quickstarts.ejb_security_programmatic_auth.RemoteClient diff --git a/ejb-security/README.html b/ejb-security/README.html index 775238fa32..72ae44ddc7 100644 --- a/ejb-security/README.html +++ b/ejb-security/README.html @@ -513,7 +513,7 @@

    Use of the EAP_HOME and QUICKSTART_HOME Variable

    Add the Authorized Application User

    -

    This quickstart uses secured management interfaces and requires that you create the following application user to access the running application.

    +

    This quickstart uses secured application interfaces and requires that you create the following application user to access the running application.

    @@ -995,7 +995,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/ejb-security/pom.xml b/ejb-security/pom.xml index a14b92fb32..9659739b86 100644 --- a/ejb-security/pom.xml +++ b/ejb-security/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA../pom.xmlejb-security @@ -91,7 +91,7 @@ -classpath - + org.jboss.as.quickstarts.ejb_security.RemoteClient diff --git a/ejb-throws-exception/README.html b/ejb-throws-exception/README.html index c9ca32caec..773e783b61 100644 --- a/ejb-throws-exception/README.html +++ b/ejb-throws-exception/README.html @@ -744,7 +744,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/ejb-throws-exception/ear/pom.xml b/ejb-throws-exception/ear/pom.xml index 2d40043c2b..a45e28c0ff 100644 --- a/ejb-throws-exception/ear/pom.xml +++ b/ejb-throws-exception/ear/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-throws-exception - 7.4.0.Beta + 7.4.0.GA ejb-throws-exception-ear ear diff --git a/ejb-throws-exception/ejb-api/pom.xml b/ejb-throws-exception/ejb-api/pom.xml index 2ad2e66a7c..5268ac9171 100644 --- a/ejb-throws-exception/ejb-api/pom.xml +++ b/ejb-throws-exception/ejb-api/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-throws-exception - 7.4.0.Beta + 7.4.0.GA ejb-throws-exception-ejb-api jar diff --git a/ejb-throws-exception/ejb/pom.xml b/ejb-throws-exception/ejb/pom.xml index 50c8187a8d..d4468b9f57 100644 --- a/ejb-throws-exception/ejb/pom.xml +++ b/ejb-throws-exception/ejb/pom.xml @@ -1,19 +1,19 @@ - 4.0.0 @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-throws-exception - 7.4.0.Beta + 7.4.0.GA ejb-throws-exception-ejb ejb @@ -38,7 +38,7 @@ - jakarta.enterprise @@ -46,8 +46,8 @@ provided - org.hibernate.validator @@ -55,7 +55,7 @@ provided - jakarta.persistence @@ -68,10 +68,10 @@ ejb-throws-exception-ejb-api - - org.jboss.spec.javax.ejb diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml index d30721b107..e0c5efd0d9 100644 --- a/ejb-throws-exception/pom.xml +++ b/ejb-throws-exception/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml ejb-throws-exception @@ -55,7 +55,7 @@ ${project.groupId} ejb-throws-exception-ejb - 7.4.0.Beta + 7.4.0.GA ejb @@ -64,7 +64,7 @@ ${project.groupId} ejb-throws-exception-ejb-api - 7.4.0.Beta + 7.4.0.GA 4.0.0 @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts ejb-throws-exception - 7.4.0.Beta + 7.4.0.GA ejb-throws-exception-web war @@ -38,7 +38,7 @@ - jakarta.enterprise @@ -46,7 +46,7 @@ provided - jakarta.persistence @@ -54,7 +54,7 @@ provided - ${project.groupId} @@ -69,7 +69,7 @@ provided - org.jboss.spec.javax.ws.rs diff --git a/ejb-timer/README.html b/ejb-timer/README.html index a6a0679df4..b137f255c3 100644 --- a/ejb-timer/README.html +++ b/ejb-timer/README.html @@ -753,7 +753,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -762,10 +762,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -774,7 +774,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -783,10 +783,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -796,17 +796,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -849,12 +849,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the ejb-timer source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the ejb-timer source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="ejb-timer-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -889,9 +889,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="ejb-timer-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -972,11 +972,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1034,7 +1034,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1075,7 +1075,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1086,7 +1086,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml index 729fd07b71..b13ff94a71 100644 --- a/ejb-timer/pom.xml +++ b/ejb-timer/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml ejb-timer diff --git a/ejb-txn-remote-call/README.html b/ejb-txn-remote-call/README.html new file mode 100644 index 0000000000..fa8330d9b3 --- /dev/null +++ b/ejb-txn-remote-call/README.html @@ -0,0 +1,1598 @@ + + + + + + + + +ejb-txn-remote-call: Demonstrates remote EJB calls and transaction propagation + + + + + +
    +
    +
    +
    +
    +The ejb-txn-remote-call quickstart demonstrates remote transactional EJB calls over two application servers of JBoss EAP. +
    +
    +
    +
    +
    +

    What is it?

    +
    +
    +

    The ejb-txn-remote-call quickstart demonstrates the remote transactional EJB calls over two application servers of Red Hat JBoss Enterprise Application Platform. The remote side forms a HA cluster.

    +
    +
    +
    +
    +

    Description

    +
    +
    +

    The EJB remote call propagates a JTA transaction. Further, the quickstart demonstrates the transaction recovery, which is run for both servers when a failure occurs.

    +
    +
    +

    This quickstart contains two Maven projects. +The first maven project represents the sender side, and is intended to be deployed on the first server (server1). +The second project represents the called side. This project is intended to be deployed +to the other two servers (server2 and server3). The two projects should not be deployed to the same server.

    +
    +

    + ++++ + + + + + + + + + + + + + + + + +
    Table 1. Maven projects in this quickstart
    ProjectDescription

    client

    An application that you deploy to the first server, to server1. +It includes REST endpoints that provide EJB remote calls to the server application +residing on the other servers. +In addition, the remote EJB calls the REST endpoint invocation process to insert data into a database. +The REST invocation starts a transaction that enlists two participants +(the database and the EJB remote invocation). +The transaction manager then uses the two-phase commit to commit the transaction +over the two servers. +Further, the quickstart examines failures and shows the transactional behaviour +in such cases.

    server

    An application that receives the remote EJB calls from the client application. +This server application is deployed to server2 and server3. +The EJB component receives the EJB remote call and, depending on the scenario, +resumes on the transaction propagated in the context of the remote EJB call. +The call inserts data to the database. +The propagated transaction enlists two participants +(the database, and a mock XAResource used for quickstart demonstration purposes).

    +
    + +
    +

    Running the Quickstart

    +
    +
    +

    The quickstart elaborates on running the example in a bare metal environment and on OpenShift.

    +
    +
    +
    +
    +

    System Requirements

    +
    +
    +

    The application this project produces is designed to be run on Red Hat JBoss Enterprise Application Platform 7.4 or later.

    +
    +
    +

    All you need to build this project is Java 8.0 (Java SDK 1.8) or later and Maven 3.3.1 or later. See Configure Maven to Build and Deploy the Quickstarts to make sure you are configured correctly for testing the quickstarts.

    +
    +
    +
    +
    +

    Use of the EAP_HOME_1, EAP_HOME_2, and QUICKSTART_HOME Variables

    +
    +
    +

    This quickstart requires that you clone your EAP_HOME installation directory and run two servers. The installation path is described in detail here: Use of EAP_HOME and JBOSS_HOME Variables.

    +
    +
    +

    In the following instructions, replace EAP_HOME_1 with the path to your first JBoss EAP server and replace EAP_HOME_2 with the path to your second cloned JBoss EAP server.

    +
    +
    +

    When you see the replaceable variable QUICKSTART_HOME, replace it with the path to the root directory of all of the quickstarts.

    +
    +
    +
    +
    +

    Run the Quickstart in Red Hat CodeReady Studio or Eclipse

    +
    +
    +

    This quickstart is not supported in Red Hat CodeReady Studio.

    +
    +
    +
    +
    +

    The Goal

    +
    +
    +

    Your goal is to set up and start 3 JBoss EAP servers, first deploys the client +application the other two configure a cluster and deploy the server application. +The EJB remote call propagates transaction from client application +to server application. The remote call hits one of the two servers where the server application is deployed.

    +
    +
    +
    +
    +

    Running in a bare metal environment

    +
    +
    +

    Setup JBoss EAP servers

    +
    +

    The easiest way to start multiple instances on a local computer is to copy the JBoss EAP installation directory +to three separate directories.

    +
    +
    +

    The installation directory for server1 (client application) is named EAP_HOME_1, +for server2 it is named EAP_HOME_2 (server application) and for server3 it is named EAP_HOME_3 (server application).

    +
    +
    +
    +
    # considering the $EAP_HOME is installation directory of the JBoss EAP
+cp -r $EAP_HOME server1
+EAP_HOME_1="$PWD/server1"
+cp -r $EAP_HOME server2
+EAP_HOME_2="$PWD/server2"
+cp -r $EAP_HOME server3
+EAP_HOME_3="$PWD/server3"
    +
    +
    +
    +
    +

    Configure EJB remoting, and authentication of the remote call

    +
    +

    To successfully process the remote call from server1 to either server2 +or to server3 you must create a user on the receiver server +that the remote call will be authenticated to.

    +
    +
    +

    Run the following procedure in the directories EAP_HOME_2 and EAP_HOME_3 to create the user for server2 and server3.

    +
    +
    +

    Add the Authorized Application User

    +
    +

    This quickstart uses secured application interfaces and requires that you create the following application user to access the running application.

    +
    + ++++++ + + + + + + + + + + + + + + + + +
    UserNameRealmPasswordRoles

    quickstartUser

    ApplicationRealm

    quickstartPwd1!

    +
    +

    To add the application user, open a terminal and type the following command:

    +
    +
    +
    +
    $ EAP_HOME/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!'
    +
    +
    +
    + + + + + +
    +
    Note
    +    		 +For Windows, use the EAP_HOME\bin\add-user.bat script. +
    +
    +
    +

    If you prefer, you can use the add-user utility interactively. +For an example of how to use the add-user utility, see the instructions located here: Add an Application User.

    +
    +
    + + + + + +
    +
    Note
    +    		 +
    +

    For the add-user.sh (or .bat) command you, can add the parameter -ds. +When you include this parameter, after the user is added, the system outputs a secret value that you can use to set up the remote output connection on server1.

    +
    +
    +

    The output of command when -ds parameter is used:

    +
    +
    +
    +
    To represent the user add the following to the server-identities definition <secret value="cXVpY2tzdGFydFB3ZDEh" />
    +
    +
    +
    +
    +
    +

    Now, you must configure server1 to authenticate with the remote side when +the EJB call is invoked. +See the script ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client/extensions/remote-configuration.cli +to review the commands that will be executed. +The cli script is configured with cli.local.properties +to run in embedded mode against the standalone.xml.

    +
    +
    +
    +
    # go to the directory with distribution of server1
+cd $EAP_HOME_1
+./bin/jboss-cli.sh \
+  --file=${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client/extensions/remote-configuration.cli \
+  --properties=${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client/extensions/cli.local.properties
    +
    +
    +
    + + + + + +
    +
    Note
    +    		 +For Windows, use the bin\jboss-cli.bat script. +
    +
    +
    +
      +
    • +

      It configures a remote outbound socket that points to the port where EJB remoting endpoint +can be reached at server2.

      +
      • +
    • +

      It configures a remote outbound connection. It is referenced in the war deployment with jboss-ejb-client.xml descriptor +(see ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client/src/main/webapp/WEB-INF/jboss-ejb-client.xml).

      +
      • +
    • +

      It defines the security realm, using the credentials of the user created at Add the Authorized Application User.

      +
      • +
    • +

      It defines the security realm, using the credentials of the user created at Add the Authorized Application User.

      +
      • +
    +
    +
    +
    +
    +

    Configure datasources

    +
    +

    The EJBs perform transactional work against a database, so the servers need +to know how to connect to that database. The following steps shows how to configure +an XA datasource with the name ejbJtaDs for connecting to a PostgreSQL database.

    +
    +
    + + + + + +
    +
    Note
    +    		 +
    +

    First you need a database running. +The following procedure briefly summarizes the steps required to configure PostgreSQL.

    +
    +
    +

    For local testing purposes you can use a simple docker container:

    +
    +
    +
    +
    docker run -p 5432:5432 --rm  -ePOSTGRES_DB=test -ePOSTGRES_USER=test -ePOSTGRES_PASSWORD=test postgres:9.4 -c max-prepared-transactions=110 -c log-statement=all
    +
    +
    +
    +
    +
    +
      +
    1. +

      Install the JDBC driver as a jboss module. +Using Maven artifact definition and $JBoss EAP will download +the driver during startup.
      +Run the command on each server.

      +
      +
      +
      cd $EAP_HOME_1
+./bin/jboss-cli.sh "embed-server,\
+  module add --name=org.postgresql.jdbc \
+  --module-xml=${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client/extensions/postgresql-module.xml"
+cd $EAP_HOME_2
+# -- ditto --
+cd $EAP_HOME_3
+# -- ditto --
      +
      +
      +
      2. +
    2. +

      Configure the JDBC driver. For server1 use the configuration file standalone.xml; +for the server2 and server3 use the configuration file standalone-ha.xml.

      +
      +
      +
      cd $EAP_HOME_1
+./bin/jboss-cli.sh "embed-server --server-config=standalone.xml,\
+ /subsystem=datasources/jdbc-driver=postgresql:add(driver-name=postgresql,driver-module-name=org.postgresql.jdbc,driver-xa-datasource-class-name=org.postgresql.xa.PGXADataSource)"
+cd $EAP_HOME_2
+./bin/jboss-cli.sh "embed-server --server-config=standalone-ha.xml,\
+ /subsystem=datasources/jdbc-driver=postgresql:add(driver-name=postgresql,driver-module-name=org.postgresql.jdbc,driver-xa-datasource-class-name=org.postgresql.xa.PGXADataSource)"
+cd $EAP_HOME_3
+# -- ditto --
      +
      +
      +
      3. +
    3. +

      Configure xa-datasource for each server. For server1 use the configuration file standalone.xml; +for server2 and server3 use the configuration file standalone-ha.xml.

      +
      +
      +
      cd ${jbossHomeName}_1
+./bin/jboss-cli.sh "embed-server --server-config=standalone.xml,\
+  xa-data-source add --name=ejbJtaDs --driver-name=postgresql --jndi-name=java:jboss/datasources/ejbJtaDs --user-name=test --password=test --xa-datasource-properties=ServerName=localhost,\
+  /subsystem=datasources/xa-data-source=ejbJtaDs/xa-datasource-properties=PortNumber:add(value=5432),\
+  /subsystem=datasources/xa-data-source=ejbJtaDs/xa-datasource-properties=DatabaseName:add(value=test)"
+cd ${jbossHomeName}_2
+./bin/jboss-cli.sh "embed-server --server-config=standalone-ha.xml,\
+  xa-data-source add --name=ejbJtaDs --driver-name=postgresql --jndi-name=java:jboss/datasources/ejbJtaDs --user-name=test --password=test --xa-datasource-properties=ServerName=localhost,\
+  /subsystem=datasources/xa-data-source=ejbJtaDs/xa-datasource-properties=PortNumber:add(value=5432),\
+  /subsystem=datasources/xa-data-source=ejbJtaDs/xa-datasource-properties=DatabaseName:add(value=test)"
+cd cd ${jbossHomeName}_3
+# -- ditto --
      +
      +
      +
      4. +
    +
    +
    + + + + + +
    +
    Note
    +    		 +For Windows, use the bin\jboss-cli.bat script. +
    +
    +
    +
    +

    Start JBoss EAP servers

    +
    +

    When the setup was done you can start the servers. +Start the server1 with the standalone.xml configuration. +The server2 and the server3 comprise a cluster, you need to start them +with the standalone-ha.xml configuration.

    +
    +
    +

    For starting at the same machine you need to use the port offset +to bind every server at a different port. +Each server has to define a unique transaction node id and jboss node name. +Use the system properties jboss.tx.node.id and jboss.node.name when starting the servers. +The configuration file custom-config.xml refers to application user’s credentials +and making possible for the transaction recovery to authenticate to recover the remote transaction failure.

    +
    +
    +

    Start each server in a separate terminal.

    +
    +
    +
    +
    cd $EAP_HOME_1
+./bin/standalone.sh -c standalone.xml -Djboss.tx.node.id=server1 -Djboss.node.name=server1 -Dwildfly.config.url=${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client/configuration/custom-config.xml
+
+cd $EAP_HOME_2
+./bin/standalone.sh -c standalone-ha.xml -Djboss.tx.node.id=server2 -Djboss.node.name=server2 -Djboss.socket.binding.port-offset=100
+
+cd $EAP_HOME_3
+./bin/standalone.sh -c standalone-ha.xml -Djboss.tx.node.id=server3 -Djboss.node.name=server3 -Djboss.socket.binding.port-offset=200
    +
    +
    +
    + + + + + +
    +
    Note
    +    		 +For Windows, use the bin\standalone.bat script. +
    +
    +
    +
    +

    Deploying the Quickstart applications

    +
    +
      +
    1. +

      Expecting the JBoss EAP servers were configured and started.

      +
      2. +
    2. +

      Clean and build the project by navigating to the root directory of this quickstart in terminal and running

      +
      +
      +
      cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/
+mvn clean install
      +
      +
      +
      3. +
    3. +

      On server1, navigate to the client subfolder of the ejb-txn-remote-call quickstart and deploy the application war file.

      +
      +
      +
      cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client
+mvn wildfly:deploy
      +
      +
      +
      4. +
    4. +

      On server2 and server3, navigate to the server subfolder of the ejb-txn-remote-call quickstart and deploy the application war file.

      +
      +
      +
      cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/server
+mvn wildfly:deploy -Dwildfly.port=10090
+mvn wildfly:deploy -Dwildfly.port=10190
      +
      +
      +
      5. +
    +
    +
    +

    The commands should finish without any errors. +The commands connect to running instances of the JBoss EAP +and deploys the war archives to the servers. +If an error occurs first verify that the JBoss EAP is running +and that’s bound to the correct port. +Then consult the error message details.

    +
    +
    +

    If you run the commands then verify +that the deployments are published on the all three servers.

    +
    +
    +
      +
    1. +

      On to server1 check the log to confirm that the client/target/client.war archive is deployed.

      +
      +
      +
      ...
+INFO  [org.wildfly.extension.undertow] (ServerService Thread Pool -- 76) WFLYUT0021: Registered web context: '/client' for server 'default-server'
+INFO  [org.jboss.as.server] (management-handler-thread - 2) WFLYSRV0010: Deployed "client.war" (runtime-name : "client.war")
      +
      +
      +
      2. +
    2. +

      On server2 and server3, check the log to confirm that the server/target/server.war archive is deployed.

      +
      +
      +
      ...
+INFO  [org.wildfly.extension.undertow] (ServerService Thread Pool -- 86) WFLYUT0021: Registered web context: '/server' for server 'default-server'
+INFO  [org.jboss.as.server] (management-handler-thread - 1) WFLYSRV0010: Deployed "server.war" (runtime-name : "server.war")
      +
      +
      +
      3. +
    3. +

      Verify that server2 and server3 formed a HA cluster. +Check the server log of either server2 and server3, or both.

      +
      4. +
    +
    +
    +
    +
    [org.infinispan.CLUSTER] () ISPN000094: Received new cluster view for channel ejb: [server2|1] (2) [server2, server3]
+[org.infinispan.CLUSTER] () ISPN100000: Node server3 joined the cluster
+...
+INFO  [org.infinispan.CLUSTER] () [Context=server.war/infinispan] ISPN100010: Finished rebalance with members [server2, server3], topology id 5
    +
    +
    +
    +
    +

    Examining the Quickstart

    +
    +

    After the JBoss EAP servers are configured and started, and the quickstart artifacts are deployed +you can invoke the methods and examine their results.

    +
    +
    +

    The client.war deployed to server1 exposes several endpoints that invoke +EJB remote invocations to the HA cluster that server2 and server3 formed.

    +
    +
    +

    The expected behaviour varies depending on type +of the remote call. It depends on running the call as part of the transaction – +then the transaction affinity makes all calls to hit the same server instance. +When the calls go to stateful EJB then the affinity again ensures +the multiple calls hitting the same server instance (the calls to stateful EJB are sticky). +When the call runs against the stateless EJB out of the transaction context then +the calls should be load balanced over the both servers in the HA cluster. +The following table defines the available endpoints, and the expected behaviour +when they are invoked.

    +
    +
    + + + + + +
    +
    Note
    +    		 +
    +

    The endpoints return data in JSON format. You can use curl for invocation +and jq command to format the results. For example: +curl -s http://localhost:8080/client/remote-outbound-stateless | jq .

    +
    +
    +
    +
    + + + + + +
    +
    Note
    +    		 +
    +

    On Windows, the curl and jq commands might not be available. +If so, enter the endpoints directly to a browser of your choice. +The behaviour and the obtained JSON will be the same as for the curl command.

    +
    +
    +
    +
    +

    The HTTP invocations return the hostnames of the contacted servers.

    +
    + + +++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Table 2. HTTP endpoints of the test invocation
    URLBehaviourExpectation

    http://localhost:8080/client/remote-outbound-stateless

    Two invocations under the transaction context started on server1 (client application). +The EJB remote call is configured from the remote-outbound-connection. +Both calls are directed to the same remote server instance (server application) +due to transaction affinity.

    The two returned hostnames must be the same.

    http://localhost:8080/client/remote-outbound-notx-stateless

    Seven remote invocations to stateless EJB without a transaction context. +The EJB remote call is configured from the remote-outbound-connection. +The EJB client is expected to load balance the calls on various servers.

    The list of the returned hostnames should contain occurrences of both + server2 and server3.

    http://localhost:8080/client/direct-stateless

    Two invocations under the transaction context started on server1 (client application). The stateless bean is invoked on the remote side. +The EJB remote call is configured from data in the client application source code. +The remote invocation is run via the EJB remoting protocol.

    The returned hostnames must be the same.

    http://localhost:8080/client/direct-stateless-http

    Two invocations under the transaction context started on server1 (client application). The stateless bean is invoked on the remote side. +The EJB remote call is configured from data in the client application source code. +The remote invocation is run, unlike the other calls of this quickstarts, via EJB over HTTP.

    The returned hostnames must be the same.

    http://localhost:8080/client/remote-outbound-notx-stateful

    Two invocations under the transaction context stared on server1 (client application). +The EJB remote call is configured from the remote-outbound-connection. +Both calls are directed to the same stateful bean on the remote server because +the stateful bean invocations are sticky ensuring affinity to the same server instance.

    The returned hostnames must be the same.

    http://localhost:8080/client/remote-outbound-fail-stateless

    An invocation under the transaction context started on server1 (client application). +The call goes to one of the remote servers, where errors occur during transaction processing. +The failure is simulated at time of two-phase commit. +This HTTP call finishes with success. Only the server log shows some warnings. +This is an expected behaviour. An intermittent failure during commit phase +of two-phase protocol makes the transaction manager obliged to finish the work +eventually. The finalization of work is done in the background +(by Narayana recovery manager, see details below), and the HTTP call may inform the client back with success.

    When the recovery manager finishes the work all the transaction resources are committed.

    +
    +

    Observing the recovery processing after client/remote-outbound-fail-stateless call

    +
    +

    The EJB call simulates the presence of an intermittent network error +happening at the commit phase of two-phase commit protocol (2PC).

    +
    +
    +

    The transaction recovery manager +periodically retries to recover the unfinished work. +When it makes the work successfully committed, the transaction is complete, +and the database update will be visible. You can confirm the database update +was processed by issuing REST endpoint reporting number of finished commits.

    +
    +
    +

    You can invoke the endpoint server/commits at both servers server2 and server3 +where server application is deployed (i.e. http://localhost:8180/server/commits +and http://localhost:8280/server/commits). +The output of this command is a tuple. It shows the node info, and the number of commits recorded. For example the output could be ["host: mydev.narayana.io/192.168.0.1, jboss node name: server2","3"] and it says that the hostname is mydev.narayana.io, the jboss node name is server2, +and the number of commits is 3.

    +
    +
    +

    Transaction recovery manager runs periodically (by default, it runs every 2 minutes) +on all servers. The transaction was initiated on server1, +and you will need to wait until is initiated there.

    +
    +
    + + + + + +
    +
    Note
    +    		 +
    +

    You can speed up the process and invoke the recovery process manually by accessing +the port on which the recovery process listens. +When the listener is enabled you can force the recovery to start on demand. +Use telnet to send the SCAN command to the recovery manager socket at localhost:4712.

    +
    +
    +
    +
    telnet localhost 4712
+Trying 127.0.0.1...
+Connected to localhost.
+Escape character is '^]'.
+SCAN
+DONE
+Connection closed by foreign host.
    +
    +
    +
    +
    +
    +
    Steps to observe that the recovery processing was done
    +
    +
      +
    1. +

      Before the executing the remote-outbound-fail-stateless endpoint do verify +how many commits are counted on server2 and server3 by executing the /commits +HTTP endpoints.

      +
      +
      +
      curl http://localhost:8180/server/commits; echo
+# output:
+# ["host: mydev.narayana.io/192.168.0.1, jboss node name: server2","1"]
+curl http://localhost:8280/server/commits; echo
+# output:
+# ["host: mydev.narayana.io/192.168.0.1, jboss node name: server3","2"]
      +
      +
      +
      2. +
    2. +

      Invoke the HTTP request to http://localhost:8080/client/remote-outbound-fail-stateless

      +
      +

      The output prints the name of server the request hits. +Immediately verify the number of commits finished by running the /commit HTTP endpoint at that server again.

      +
      +
      3. +
    3. +

      Verify that the number of commits has not changed yet.

      +
      4. +
    4. +

      Check the log of server1 for the following warning message

      +
      +
      +
      ARJUNA016036: commit on < formatId=131077, gtrid_length=35, bqual_length=36, tx_uid=..., node_name=server1, branch_uid=..., subordinatenodename=null, eis_name=unknown eis name > (Subordinate XAResource at remote+http://localhost:8180) failed with exception $XAException.XA_RETRY: javax.transaction.xa.XAException: WFTXN0029: The peer threw an XA exception
      +
      +
      +
      +

      The message means that the transaction manager was not able to commit the transaction. +An error occurred during committing the transaction on the remote server. +The XAException.XA_RETRY exception, meaning an intermittent failure, was reported to the log.

      +
      +
      5. +
    5. +

      The logs on server2 or server3 contain a warning about the XAResource failure as well.

      +
      +
      +
      ARJUNA016036: commit on < formatId=131077, gtrid_length=35, bqual_length=43, tx_uid=..., node_name=server1, branch_uid=..., subordinatenodename=server2, eis_name=unknown eis name > (org.jboss.as.quickstarts.ejb.mock.MockXAResource@731ae22) failed with exception $XAException.XAER_RMFAIL: javax.transaction.xa.XAException
      +
      +
      +
      6. +
    6. +

      Wait (or force) recovery to be processed at server1.

      +
      7. +
    7. +

      The number of commits on the targeted server instance has increased by one.

      +
      8. +
    +
    +
    +
    +
    +
    +
    +
    +

    Undeploy the Quickstart

    +
    +
    +

    When you are finished testing the quickstart, follow these steps to undeploy the archive.

    +
    +
    +
      +
    1. +

      Make sure you start the JBoss EAP server as described above.

      +
      2. +
    2. +

      Open a terminal and navigate to the root directory of this quickstart.

      +
      3. +
    3. +

      Type this command to undeploy the archive:

      +
      +
      +
      $ mvn wildfly:undeploy
      +
      +
      +
      4. +
    +
    +
    +

    Repeat the same for the server2 and server3 by navigating +to the quickstart sub-folder ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/server and run:

    +
    +
    +
    +
    mvn wildfly:undeploy -Dwildfly.port=10090
+mvn wildfly:undeploy -Dwildfly.port=10190
    +
    +
    +
    +

    Server Log: Expected Warnings and Errors

    +
    +

    This quickstart is not production grade. The server log includes the following +warnings during the startup. It is safe to ignore these warnings.

    +
    +
    +
    +
    WFLYDM0111: Keystore standalone/configuration/application.keystore not found, it will be auto generated on first use with a self signed certificate for host localhost
+
+WFLYELY01084: KeyStore .../standalone/configuration/application.keystore not found, it will be auto generated on first use with a self-signed certificate for host localhost
+
+WFLYSRV0018: Deployment "deployment.server.war" is using a private module ("org.jboss.jts") which may be changed or removed in future versions without notice.
    +
    +
    +
    +
    +
    +
    +

    Running on OpenShift

    +
    +
    +

    OpenShift deployment

    +
    +

    Before deploying this quickstart to OpenShift Container Platform we need to inspect +a bit the platform. The JBoss EAP server runs in a pod. The pod is an ephemeral object +that could be rescheduled, restarted or moved to a different machine by the platform. +The ephemeral nature of the pod is a poor match for the transaction manager handling transactions +and for EJB remoting passing the context as well. +The transaction manager requires a persistent log to be saved +for each JBoss EAP server instance. +The EJB remoting requires a stable remote endpoint for connection to guarantee +the state of stateful beans and the transaction affinity. +The stability of the remote endpoint address is important for transaction +recovery calls to eventually finish the transactions too. +For these properties being guaranteed from the platform +we use StatefulSet object in OpenShift.

    +
    +
    +

    The recommended way to deploy applications to JBoss EAP is using +the JBoss EAP Operator which utilizes the StatefulSet to manage JBoss EAP +as the default option in the background.

    +
    +
    + + + + + +
    +
    Note
    +    		 +Other quickstarts discuss deploying + of the applications with ReplicaSet defined by DeploymentConfig in a template. + It’s a different approach that does not match well with the transaction affinity + and cannot be used here. +
    +
    +
    +
    +

    Running on OpenShift: Prerequisites

    +
    +
    Prepare OpenShift for Quickstart Deployment
    +
    +
      +
    1. +

      Log in to your OpenShift instance using the oc login command.

      +
      2. +
    2. +

      Create a new project for the quickstart in OpenShift. You can create a project in OpenShift using the following command.

      +
      +
      +
      $ oc new-project ejb-txn-remote-call-project
      +
      +
      +
      3. +
    +
    +
    +
    +

    Running on OpenShift: Start PostgreSQL database

    +
    +

    The quickstart requires the PostgreSQL database to be running. +For testing purposes you can use the provided yaml template +which deploys the database on your OpenShift instance +(usable only for the testing purpose).

    +
    +
    +
    +
    # change path to ${PATH_TO_QUICKSTART_DIR}
+cd ${PATH_TO_QUICKSTART_DIR}
+# deploy not-production ready XA capable PostgreSQL database to OpenShift
+oc new-app --namespace=$(oc project -q) \
+           --file=${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client/extensions/postgresql.deployment.yaml
    +
    +
    +
    +
    +

    Running on OpenShift: Build the application

    +
    +

    For building the application the JBoss EAP s2i functionality +(provided out-of-boxy by OpenShift) needs to be used.

    +
    +
    +

    The JBoss EAP provides ImageStream definition of builder images and runtime images. +The builder image makes the application to be build, configure the application server +with s2i scripts. The resulted image may be used for running, +but it’s big as it contains many dependencies needed only for the build. +The chain build defines the next step which is to get the runtime image +and copy there the configured JBoss EAP server with the application.

    +
    +
    +
    +
    # Install builder and runtime image streams
+oc create -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
+
+# Deploy template with chain build to get the quickstart
+# being deployed within runtime image
+oc create -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/master/eap-s2i-build.yaml
    +
    +
    +
    +

    The final step for starting the application start +is the s2i chain build execution.

    +
    +
    +
    +
    # s2i chain build for client application
+oc new-app --template=eap-s2i-build \
+  -p EAP_IMAGESTREAM_NAMESPACE=$(oc project -q) \
+  -p APPLICATION_IMAGE=client \
+  -p SOURCE_REPOSITORY_URL=https://github.com/jboss-developer/jboss-eap-quickstarts \
+  -p SOURCE_REPOSITORY_REF=7.4.x \
+  -p CONTEXT_DIR=ejb-txn-remote-call/client \
+  -p EAP_IMAGE=jboss-eap74-openjdk11-openshift \
+  -p EAP_RUNTIME_IMAGE=jboss-eap74-openjdk11-runtime-openshift
+# s2i chain build for server application
+oc new-app --template=eap-s2i-build \
+  -p EAP_IMAGESTREAM_NAMESPACE=$(oc project -q) \
+  -p APPLICATION_IMAGE=server \
+  -p SOURCE_REPOSITORY_URL=https://github.com/jboss-developer/jboss-eap-quickstarts \
+  -p SOURCE_REPOSITORY_REF=7.4.x \
+  -p CONTEXT_DIR=ejb-txn-remote-call/server \
+  -p EAP_IMAGE=jboss-eap74-openjdk11-openshift \
+  -p EAP_RUNTIME_IMAGE=jboss-eap74-openjdk11-runtime-openshift
    +
    +
    +
    +

    Wait for the builds to finish. You can verify the build status by executing +the oc get pod command.

    +
    +
    +

    The expected output, after few whiles, shows that the *-build jobs +have got the value Completed in the STATUS column.

    +
    +
    +
    +
    oc get pod
+NAME                                READY   STATUS      RESTARTS   AGE
+client-2-build                      0/1     Completed   0          35m
+client-build-artifacts-1-build      0/1     Completed   0          45m
+server-2-build                      0/1     Completed   0          15m
+server-build-artifacts-1-build      0/1     Completed   0          19m
    +
    +
    +
    +
    +

    Running on OpenShift: Install JBoss EAP Operator

    +
    +

    With the prior step we have got the application image with the server being part of. +The next step is to install the JBoss EAP Operator which is responsible +for managing the life cycle of the application image.

    +
    +
    +

    Consult necessary steps to install the JBoss EAP Operator +at JBoss EAP documentation +https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/

    +
    +
    +

    The following steps can be used as a quickstart guide

    +
    +
    +
    +
    # 1. log in to account with cluster-admin permission
+# 2. create a YAML file containing Subscription object
+cat >> /tmp/eap-operator-sub.yaml << EOF
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: eap
+  namespace: openshift-operators
+spec:
+  channel: alpha
+  installPlanApproval: Automatic
+  name: eap
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace
+EOF
+# 3. create the Subscription object in the OpenShift
+oc apply -f eap-operator-sub.yaml
+# 4. verify the openshift-operators namespace that the object was created
+oc get csv -n openshift-operators
    +
    +
    +
    +
    +

    Running on OpenShift: Run the Quickstart with JBoss EAP Operator

    +
    +

    After you install the JBoss EAP Operator, you can deploy the`CustomResource` that uses it. +The CustomResource.yaml definition contains information the JBoss EAP Operator uses +to start the application pods for the client application and for the server application.

    +
    +
    +

    Before deploying the application, ensure the view permissions for the default system account +is set up. The KUBE_PING protocol, that is used for forming the HA JBoss EAP cluster +on OpenShift, requires view permissions to read labels of pods.

    +
    +
    +
    +
    oc policy add-role-to-user view system:serviceaccount:$(oc project -q):default -n $(oc project -q)
    +
    +
    +
    +

    After granting the permissions, deploy the CustomResource, managed by JBoss EAP Operator +that, referencing to the built application images.

    +
    +
    + + + + + +
    +
    Caution
    +    		 +
    +

    Adjust the value of the applicationImage value in the OpenShift deployment templates +${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client/client-cr.yaml and +${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/server/server-cr.yaml +to match the project. It is the most probably ejb-txn-remote-call-project.

    +
    +
    +
    +
    +
    +
    cd ${PATH_TO_QUICKSTART_DIR}
+
+# deploying client definition, one replica, PostgreSQL database has to be available
+oc create -f ejb-txn-remote-call/client/client-cr.yaml
+# deploying server definition, two replicas, PostgreSQL database has to be available
+oc create -f ejb-txn-remote-call/server/server-cr.yaml
    +
    +
    +
    +

    If these commands are successful, the oc get pod command shows +all the pods required for the quickstart, namely the quickstart client and two +server pods and the PostgreSQL database pod that the application connects to.

    +
    +
    +
    +
    NAME                                READY   STATUS      RESTARTS   AGE
+client-0                            1/1     Running     0          29m
+postgresql-f9f475f87-l944r          1/1     Running     1          22h
+server-0                            1/1     Running     0          11m
+server-1                            1/1     Running     0          11m
    +
    +
    +
    +

    To observe the JBoss EAP Operator look at

    +
    +
    +
    +
    oc get po -n openshift-operators
+
+NAME                            READY   STATUS    RESTARTS   AGE
+eap-operator-75c77c789c-2zdnd   1/1     Running   0          86m
    +
    +
    +
    +
    +

    Running on OpenShift: Verify the Quickstarts

    +
    +

    The JBoss EAP Operator creates routes that make the applications accessible +outside the OpenShift environment. Run the oc get route command to find the location of the REST endpoint. +An example of the output is:

    +
    +
    +
    +
    NAME           HOST/PORT                                                            PATH   SERVICES              PORT
+client-route   client-route-ejb-txn-remote-call-client-artifacts.apps-crc.testing          client-loadbalancer   http
+server-route   server-route-ejb-txn-remote-call-client-artifacts.apps-crc.testing          server-loadbalancer   http
    +
    +
    +
    +

    For HTTP endpoints provided by the quickstart application +check the table above.

    +
    +
    +
    +
    curl -s $(oc get route client-route --template='{{ .spec.host }}')/client/remote-outbound-stateless | jq .
+curl -s $(oc get route client-route --template='{{ .spec.host }}')/client/remote-outbound-stateless | jq .
+curl -s $(oc get route client-route --template='{{ .spec.host }}')/client/remote-outbound-notx-stateless | jq .
+curl -s $(oc get route client-route --template='{{ .spec.host }}')/client/direct-stateless | jq .
+curl -s $(oc get route client-route --template='{{ .spec.host }}')/client/remote-outbound-notx-stateful | jq .
    +
    +
    +
    +

    If you like to observe the recovery processing +then you can follow these shell commands.

    +
    +
    +
    +
    # To check failure resolution
+# verify the number of commits that come from the first and second node of the `server` deployments.
+# Two calls are needed, as each reports the commit count of different node.
+# Remember the reported number of commits to be compared with the results after crash later.
+curl -s $(oc get route server-route --template='{{ .spec.host }}')/server/commits
+curl -s $(oc get route server-route --template='{{ .spec.host }}')/server/commits
+
+# Run the remote call that causes the JVM of the server to crash.
+curl -s $(oc get route client-route --template='{{ .spec.host }}')/client/remote-outbound-fail-stateless
+# The platforms restarts the server back to life.
+# The following commands then make us waiting while printing the number of commits happened at the servers.
+while true; do
+  curl -s $(oc get route server-route --template='{{ .spec.host }}')/server/commits
+  curl -s $(oc get route server-route --template='{{ .spec.host }}')/server/commits
+  I=$((I+1))
+  echo " <<< Round: $I >>>"
+  sleep 2
+done
    +
    +
    +
    +
    +

    Running on OpenShift: Quickstart application removal

    +
    +

    To remove the application you need to remove the WildFlyServer definition +(which was deployed by *-cr yaml descriptor). +You can do that by running oc remove WildFlyServer client +and oc remove WildFlyServer server. +With that the application will be stopped, and the pods will be removed.

    +
    +
    +
    +
    +
    +
    +

    Conclusion

    +
    +
    +

    This quickstarts is a showcase for the EJB remoting calls from one JBoss EAP server +to other with transaction propagation being involved. +It shows things from multiple areas from setting-up the datasources, through security definition +for remote connection, EJB remoting in the application, up to observing the transaction recovery processing. +On top of that it shows running this all in OpenShift managed with JBoss EAP Operator.

    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ejb-txn-remote-call/client/.s2i/environment b/ejb-txn-remote-call/client/.s2i/environment new file mode 100644 index 0000000000..37a3a162e1 --- /dev/null +++ b/ejb-txn-remote-call/client/.s2i/environment @@ -0,0 +1 @@ +S2I_IMAGE_SOURCE_MOUNTS=extensions \ No newline at end of file diff --git a/ejb-txn-remote-call/client/client-cr.yaml b/ejb-txn-remote-call/client/client-cr.yaml new file mode 100644 index 0000000000..db52dee548 --- /dev/null +++ b/ejb-txn-remote-call/client/client-cr.yaml @@ -0,0 +1,37 @@ +apiVersion: wildfly.org/v1alpha1 +kind: WildFlyServer +metadata: + name: client +spec: + applicationImage: "image-registry.openshift-image-registry.svc:5000/ejb-txn-remote-call-project/client:latest" + replicas: 1 + env: + - name: JAVA_OPTS_APPEND + value: -Dwildfly.config.url=$JBOSS_HOME/standalone/configuration/custom-config.xml + - name: DB_SERVICE_PREFIX_MAPPING + value: test-postgresql=TEST + - name: TEST_NONXA + value: 'false' + - name: TEST_JNDI + value: java:jboss/datasources/ejbJtaDs + - name: TEST_POSTGRESQL_SERVICE_HOST + value: postgresql + - name: TEST_POSTGRESQL_SERVICE_PORT + value: '5432' + - name: TEST_DRIVER + value: postgresql + - name: TEST_DATABASE + valueFrom: + secretKeyRef: + name: postgresql + key: database-name + - name: TEST_USERNAME + valueFrom: + secretKeyRef: + name: postgresql + key: username + - name: TEST_PASSWORD + valueFrom: + secretKeyRef: + name: postgresql + key: password diff --git a/ejb-txn-remote-call/client/configuration/custom-config.xml b/ejb-txn-remote-call/client/configuration/custom-config.xml new file mode 100644 index 0000000000..d3abdc88dc --- /dev/null +++ b/ejb-txn-remote-call/client/configuration/custom-config.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ejb-txn-remote-call/client/extensions/cli.local.properties b/ejb-txn-remote-call/client/extensions/cli.local.properties new file mode 100644 index 0000000000..77b060a14e --- /dev/null +++ b/ejb-txn-remote-call/client/extensions/cli.local.properties @@ -0,0 +1,5 @@ +remoteServerHost=127.0.0.1 +remoteServerPort=8180 +remoteDeploymentName=server +serverConfig=standalone.xml +clientMappingsSocketBinding=127.0.0.1 diff --git a/ejb-txn-remote-call/client/extensions/cli.openshift.properties b/ejb-txn-remote-call/client/extensions/cli.openshift.properties new file mode 100644 index 0000000000..ae01bf00fa --- /dev/null +++ b/ejb-txn-remote-call/client/extensions/cli.openshift.properties @@ -0,0 +1,5 @@ +remoteServerHost=server-0.server-headless +remoteServerPort=8080 +remoteDeploymentName=server +serverConfig=standalone-openshift.xml +clientMappingsSocketBinding=${env.HOSTNAME}.${env.STATEFULSET_HEADLESS_SERVICE_NAME} diff --git a/ejb-txn-remote-call/client/extensions/install.sh b/ejb-txn-remote-call/client/extensions/install.sh new file mode 100644 index 0000000000..10cfd35e61 --- /dev/null +++ b/ejb-txn-remote-call/client/extensions/install.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# This script (install.sh) will be executed during build 'client-build-artifacts' +# This script copies the CLI scripts to $JBOSS_HOME/extensions to be processed in the post hook +# The post hook part means that on launching of the application server the postconfigure.sh is executed + +set -x +echo "Running ejb-txn-remote-call/client/install.sh" +injected_dir=$1 +# copy any needed files into the target build. +cp -rf ${injected_dir} $JBOSS_HOME/extensions diff --git a/ejb-txn-remote-call/client/extensions/postconfigure.sh b/ejb-txn-remote-call/client/extensions/postconfigure.sh new file mode 100644 index 0000000000..0024e83f77 --- /dev/null +++ b/ejb-txn-remote-call/client/extensions/postconfigure.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +# This script (postconfigure.sh) is executed during launch of the application server (not during the build) +# This script is expected to be copied to $JBOSS_HOME/extensions/ folder by script install.sh + +STANDALONE_XML='standalone-openshift.xml' +POSTCONFIGURE_PROPERTIES_FILE="${JBOSS_HOME}/extensions/cli.openshift.properties" + +# on JBoss EAP with standalone-openshift.xml, on with WildFly standalone.xml +if [ ! -f "${JBOSS_HOME}/standalone/configuration/${STANDALONE_XML}" ]; then + STANDALONE_XML='standalone.xml' + sed -i "s/serverConfig=.*/serverConfig=${STANDALONE_XML}/" "${POSTCONFIGURE_PROPERTIES_FILE}" +fi + +# container does not provide PostgreSQL driver +if [ ! -f "${JBOSS_HOME}/modules/org/postgresql/jdbc/main/module.xml" ]; then + echo "Creating PostgreSQL JDBC module and driver under ${STANDALONE_XML}" + "${JBOSS_HOME}"/bin/jboss-cli.sh "embed-server --server-config=${STANDALONE_XML},\ + module add --name=org.postgresql.jdbc --module-xml=${JBOSS_HOME}/extensions/postgresql-module.xml" + "${JBOSS_HOME}"/bin/jboss-cli.sh "embed-server --server-config=${STANDALONE_XML},\ + /subsystem=datasources/jdbc-driver=postgresql:add(driver-name=postgresql,driver-module-name=org.postgresql.jdbc,driver-xa-datasource-class-name=org.postgresql.xa.PGXADataSource)" +fi + +echo "Executing ejb-txn-remote-call/client ${JBOSS_HOME}/extensions/remote-configuration.cli file with properties file: ${POSTCONFIGURE_PROPERTIES_FILE}." +[ "x$SCRIPT_DEBUG" = "xtrue" ] && cat "${JBOSS_HOME}/extensions/remote-configuration.cli" +"${JBOSS_HOME}"/bin/jboss-cli.sh --file="${JBOSS_HOME}/extensions/remote-configuration.cli" --properties="${POSTCONFIGURE_PROPERTIES_FILE}" + +echo "Using client.war instead of ROOT.war" +if [ -f "${JBOSS_HOME}"/standalone/deployments/ROOT.war ]; then + mv "${JBOSS_HOME}"/standalone/deployments/ROOT.war "${JBOSS_HOME}"/standalone/deployments/client.war +fi \ No newline at end of file diff --git a/ejb-txn-remote-call/client/extensions/postgresql-module.xml b/ejb-txn-remote-call/client/extensions/postgresql-module.xml new file mode 100644 index 0000000000..f2a5a58797 --- /dev/null +++ b/ejb-txn-remote-call/client/extensions/postgresql-module.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ejb-txn-remote-call/client/extensions/postgresql.deployment.yaml b/ejb-txn-remote-call/client/extensions/postgresql.deployment.yaml new file mode 100644 index 0000000000..0a827fbd9d --- /dev/null +++ b/ejb-txn-remote-call/client/extensions/postgresql.deployment.yaml @@ -0,0 +1,75 @@ +apiVersion: v1 +kind: Template +metadata: + name: postgresql-template + annotations: + description: "Creating PostgreSQL database" + iconClass: "iconpostgresql" + tags: "database,sql" +parameters: + - description: PostgreSQL image to use + name: POSTGRESQL_IMAGE + value: registry.access.redhat.com/rhscl/postgresql-10-rhel7:latest +labels: + template: "postgresql" +objects: + - apiVersion: v1 + kind: Secret + metadata: + name: postgresql + type: Opaque + stringData: + database-name: test + username: test + password: test + # non-production ready deployment of PostgreSQL to show WildFly quickstarts capabilities + - apiVersion: apps/v1 + kind: Deployment + metadata: + name: postgresql + labels: + app: postgresql + spec: + replicas: 1 + selector: + matchLabels: + app: postgresql + template: + metadata: + labels: + app: postgresql + spec: + containers: + - name: postgresql + image: ${POSTGRESQL_IMAGE} + ports: + - containerPort: 5432 + env: + - name: POSTGRESQL_DATABASE + valueFrom: + secretKeyRef: + key: database-name + name: postgresql + - name: POSTGRESQL_USER + valueFrom: + secretKeyRef: + key: username + name: postgresql + - name: POSTGRESQL_PASSWORD + valueFrom: + secretKeyRef: + key: password + name: postgresql + - name: POSTGRESQL_MAX_PREPARED_TRANSACTIONS + value: "42" + - apiVersion: v1 + kind: Service + metadata: + name: postgresql + spec: + selector: + app: postgresql + ports: + - protocol: TCP + port: 5432 + targetPort: 5432 diff --git a/ejb-txn-remote-call/client/extensions/remote-configuration.cli b/ejb-txn-remote-call/client/extensions/remote-configuration.cli new file mode 100644 index 0000000000..89e6421e4a --- /dev/null +++ b/ejb-txn-remote-call/client/extensions/remote-configuration.cli @@ -0,0 +1,58 @@ +# setup from cli.*.properties +set remoteDeploymentName=${remoteDeploymentName} +set remoteServerHost=${remoteServerHost} +set remoteServerPort=${remoteServerPort} +set remoteServerUsername=${remoteServerUsername} +set remoteServerPassword=${remoteServerPassword} +set serverConfig=${serverConfig} +set clientMappingsSocketBinding=${clientMappingsSocketBinding} + +# running embeded server with server config +embed-server --server-config=$serverConfig + +/system-property=remote.server.host:add(value=$remoteServerHost) +/system-property=remote.server.port:add(value=$remoteServerPort) +/system-property=remote.server.username:add(value=quickstartUser) +/system-property=remote.server.password:add(value=quickstartPwd1!) +/system-property=remote.deployment.name:add(value=$remoteDeploymentName) +/system-property=client.mappings.socket.binding:add(value=$clientMappingsSocketBinding) + +echo "System properties defined" + +/socket-binding-group=standard-sockets/remote-destination-outbound-socket-binding=server2:add(host=${remote.server.host}, port=${remote.server.port}) + +echo "Outbound socket binding 'server2' created" + +# adding password realm where secret is password 'quickstartUser' converted to base64 format +/core-service=management/security-realm=RemotePasswordRealm:add() +/core-service=management/security-realm=RemotePasswordRealm/server-identity=secret:add(value="cXVpY2tzdGFydFB3ZDEh") +# reload # when would be run not in embed mode + +echo "Security realm 'RemotePasswordRealm' created" + +/subsystem=remoting/remote-outbound-connection=remote-ejb-connection:add(outbound-socket-binding-ref=server2, username=${remote.server.username}, security-realm=RemotePasswordRealm, protocol=remote+http) +/subsystem=remoting/remote-outbound-connection=remote-ejb-connection/property=SASL_POLICY_NOANONYMOUS:add(value=false) +/subsystem=remoting/remote-outbound-connection=remote-ejb-connection/property=SSL_ENABLED:add(value=false) +/subsystem=remoting/remote-outbound-connection=remote-ejb-connection/property=SASL_DISALLOWED_MECHANISMS:add(value=JBOSS-LOCAL-USER) + +echo "Remote outbound connection 'remote-ejb-connection' created" + +# for transaction manager could be asked for recovery to be started the listener at port has to be enabled (JVM restart needed) +/subsystem=transactions:write-attribute(name=recovery-listener,value=true) +echo "Transaction recovery listener enabled" +# the recovery listener is normally bound at port 4712, you can verify it with: +# /socket-binding-group=standard-sockets/socket-binding=txn-recovery-environment:read-attribute(name=bound-port) +# for recovery invocation you can use e.g.: `telnet localhost 4712`; enter 'SCAN' on input + +# to get detailed insight on what happening during transaction processing switch on the TRACE logging for Narayana +# /subsystem=logging/logger=com.arjuna:write-attribute(name=level,value=TRACE) + +# needed for ejb client works fine with multiple servers in ha cluster +if (result == undefined) of /socket-binding-group=standard-sockets/socket-binding=http:read-attribute(name=client-mappings) + echo "Configuring server socket binding with client-mappings..." + /socket-binding-group=standard-sockets/socket-binding=http:list-add(name=client-mappings, value={destination-address="${client.mappings.socket.binding}"}) +end-if + +echo "remote-configuration.cli script finished" + +quit diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml new file mode 100644 index 0000000000..702424e91f --- /dev/null +++ b/ejb-txn-remote-call/client/pom.xml @@ -0,0 +1,98 @@ + + + + 4.0.0 + + org.jboss.eap.quickstarts + quickstart-parent + 7.4.0.GA + ../../pom.xml + + + ejb-txn-remote-call-client + war + Quickstart: ejb-txn-remote-call-client + The project is the application to be deployed on the client server to call the second server + + + + + jakarta.enterprise + jakarta.enterprise.cdi-api + provided + + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + provided + + + org.jboss.resteasy + resteasy-jackson-provider + provided + + + + org.jboss.spec.javax.ejb + jboss-ejb-api_3.2_spec + provided + + + + org.jboss.spec.javax.transaction + jboss-transaction-api_1.3_spec + provided + + + + jakarta.persistence + jakarta.persistence-api + provided + + + + org.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + provided + + + + org.jboss.logging + jboss-logging + provided + + + org.jboss.spec.javax.jms + jboss-jms-api_2.0_spec + + + + + client + + + maven-war-plugin + ${version.war.plugin} + + false + + + + + diff --git a/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/RemoteBeanCaller.java b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/RemoteBeanCaller.java new file mode 100644 index 0000000000..509a232e3d --- /dev/null +++ b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/RemoteBeanCaller.java @@ -0,0 +1,249 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.client; + +import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; +import javax.naming.NamingException; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.jboss.as.quickstarts.ejb.entity.CallerUser; +import org.jboss.as.quickstarts.ejb.server.RemoteBeanInterface; +import org.jboss.logging.Logger; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * EJB which runs the remote calls to the EJBs. + * We use the EJB here for benefit of automatic transaction management. + */ +@Stateless +public class RemoteBeanCaller { + private static final Logger log = Logger.getLogger(RemoteBeanCaller.class); + + @PersistenceContext + private EntityManager em; + + /** + *

    + * The method calls the remote EJB {@link Stateless} endpoint. + *

    + *

    + * To lookup the remote endpoint is used remote outbound connection defined in the standalone.xml configuration file. + * The deployment links to the configuration by descriptor WEB-INF/jboss-ejb-client.xml. + *

    + * + *

    + * The demonstration shows what happens when several subsequent calls are run while no transaction is started. + * With one remote server all requests go to that one instance of server2. + * It makes a difference if there are two (or more) remote servers clustered (server2 is run in HA of more instances). + *
    + * There is defined no transaction context, the remote call should be load-balanced by EJB client + * and the first call goes to the first remote server and the second call goes to the second remote server. + *

    + * + * @return list of strings as return values from the remote beans, + * in this case the return values are hostnames and the jboss node names of the remote application server + * @throws NamingException when remote lookup fails + */ + @TransactionAttribute(value = TransactionAttributeType.NOT_SUPPORTED) + public List remoteOutboundStatelessNoTxBeanCall() throws NamingException { + log.debugf("Calling with outbound connection without transaction to StatelessBean.successOnCall()"); + + RemoteBeanInterface bean = RemoteLookupHelper.lookupRemoteEJBOutbound("StatelessBean", RemoteBeanInterface.class, false); + List callResponses = new ArrayList<>(); + for (int i = 1; i <= 20; i++) { + callResponses.add(bean.successOnCall()); + } + return callResponses; + } + + /** + *

    + * The method calls the remote EJB {@link Stateless} endpoint. + *

    + *

    + * To lookup the remote endpoint is used remote outbound connection defined in the standalone.xml configuration file. + * The deployment links to the configuration by descriptor WEB-INF/jboss-ejb-client.xml. + *

    + * + *

    + * The demonstration shows what happens when two subsequent calls are run within started transaction.
    + * (The default {@link TransactionAttribute} value is {@link TransactionAttributeType#REQUIRED}.) + *

    + *

    + * There is no difference with one remote server (started only one instance of server2). + * It makes a difference if there are two remote servers clustered (server2 is run in HA with two instances). + *
    + * In such case the remote call will reach the same server for both remote ejb invocations. + * It's because of the transaction affinity which has to be provided by EJB client. + *

    + * + * @return list of strings as return values from the remote beans, + * in this case the return value is a hostname and the jboss node name of the remote application server + * @throws NamingException when remote lookup fails + */ + public List remoteOutboundStatelessBeanCall() throws NamingException { + log.debugf("Calling with outbound connection with transaction to StatelessBean.successOnCall()"); + + em.persist(new CallerUser("Bilbo", "Baggins")); + + RemoteBeanInterface bean = RemoteLookupHelper.lookupRemoteEJBOutbound("StatelessBean", RemoteBeanInterface.class, false); + return Arrays.asList( + bean.successOnCall(), + bean.successOnCall() + ); + } + + /** + *

    + * The method calls the remote EJB {@link Stateless} endpoint.
    + * The invocation runs over EJB remoting where first call is run over HTTP, + * then the HTTP upgrade requests the change to remoting protocol + *

    + *

    + * To lookup the remote endpoint is used direct definition of the hostname, port and credentials + * here in code. More specifically at time when {@link javax.naming.InitialContext} is defined, + * see {@link RemoteLookupHelper#lookupRemoteEJBDirect(String, Class, boolean, String, int, String, String, boolean)}. + *

    + *

    + * For details on the call processing see {@link #remoteOutboundStatelessBeanCall()}. + *

    + * + * @return list of strings as return values from the remote beans, + * in this case the return values are hostname and the jboss node names of the remote application server + * @throws NamingException when remote lookup fails + */ + public List directLookupStatelessBeanOverEjbRemotingCall() throws NamingException { + log.debugf("Calling direct lookup with transaction to StatelessBean.successOnCall()"); + + String remoteHost = System.getProperty("remote.server.host"); + int remotePort = Integer.getInteger("remote.server.port", 0); + String remoteUsername = System.getProperty("remote.server.username"); + String remotePassword = System.getProperty("remote.server.password"); + + RemoteBeanInterface bean = RemoteLookupHelper.lookupRemoteEJBDirect("StatelessBean", RemoteBeanInterface.class, false, + remoteHost, remotePort, remoteUsername, remotePassword, false); + return Arrays.asList( + bean.successOnCall(), + bean.successOnCall() + ); + } + + /** + * This is the same invocation as for {@link #directLookupStatelessBeanOverEjbRemotingCall}. + * The difference is that there is used the HTTP protocol for EJB calls. Each invocation will be a HTTP request. + * + * @return list of strings as return values from the remote beans, + * in this case the return values are hostname and the jboss node names of the remote application server + * @throws NamingException when remote lookup fails + */ + public List directLookupStatelessBeanOverHttpCall() throws NamingException { + log.debugf("Calling direct lookup with transaction to StatelessBean.successOnCall()"); + + String remoteHost = System.getProperty("remote.server.host"); + int remotePort = Integer.getInteger("remote.server.port", 0); + String remoteUsername = System.getProperty("remote.server.username"); + String remotePassword = System.getProperty("remote.server.password"); + + RemoteBeanInterface bean = RemoteLookupHelper.lookupRemoteEJBDirect("StatelessBean", RemoteBeanInterface.class, false, + remoteHost, remotePort, remoteUsername, remotePassword, true); + return Arrays.asList( + bean.successOnCall(), + bean.successOnCall() + ); + } + + /** + *

    + * The method calls the remote EJB {@link javax.ejb.Stateful} endpoint. + *

    + *

    + * To lookup the remote endpoint is used remote outbound connection defined in the standalone.xml configuration file. + * The deployment links to the configuration by descriptor WEB-INF/jboss-ejb-client.xml. + *

    + * + *

    + * This demonstrates what happens on two subsequent calls to the stateful bean when no transaction is started. + * In fact, for stateful bean the demonstrated behaviour makes no difference if the transaction is or is not started. + *

    + *

    + * As there are processed two remote EJB invocations and we talk about stateful bean the EJB client has to ensure + * that both calls ends at the same remote server. + * The demonstration does not make much sense when there is started only one instance of the remote server (server2). + * But in case there are two remote servers started (two instances of server2 are run) + * then the second EJB invocation has to be directed to the same server as the first one. + *

    + * + * @return list of strings as return values from the remote beans, + * in this case the return value are hostnames and the jboss node names of the remote application server + * @throws NamingException when remote lookup fails + */ + @TransactionAttribute(value = TransactionAttributeType.NOT_SUPPORTED) + public List remoteOutboundStatefulNoTxBeanCall() throws NamingException { + log.debugf("Calling with outbound connection without transaction to StatefulBean.successOnCall()"); + + RemoteBeanInterface bean = RemoteLookupHelper.lookupRemoteEJBOutbound("StatefulBean", RemoteBeanInterface.class, true); + return Arrays.asList( + bean.successOnCall(), + bean.successOnCall() + ); + } + + /** + *

    + * The method calls the remote EJB {@link Stateless} endpoint. + *

    + *

    + * To lookup the remote endpoint is used remote outbound connection defined in the standalone.xml configuration file. + * The deployment links to the configuration by descriptor WEB-INF/jboss-ejb-client.xml. + *

    + * + *

    + * The method demonstrates the need of transaction recovery processing in case of some types of failures. + * This one simulates an intermittent network failure happening on finishing the remote transaction. + *

    + *

    + * The failure is invoked at time when transaction is decided to by committed by the two-phase protocol. + * The remote call returns success despite the fact the remote server has not closed all the resources with commit. + * The first attempt to commit fails and it's then the responsibility of recovery manager to finish + * this transaction with another attempt of committing the remote transaction. + *

    + *

    + * The recovery manager runs periodically, by default every 2 minutes. For making the recovery faster + * we may force the recovery to be processed. This could be done if the recovery listener is enabled + * (see remote-configuration.cli script). Then it's possible to send command 'SCAN' + * to socket at port 4712). The unfinished transaction is then finished. + *

    + * + * @return hostname of server as String that the invocation goes to + * @throws NamingException when remote lookup fails + */ + public String remoteOutboundStatelessBeanFail() throws NamingException { + log.debugf("Calling with failure to StatelessBean.failOnCall()"); + + em.persist(new CallerUser("Fell", "Rider")); + + RemoteBeanInterface bean = RemoteLookupHelper.lookupRemoteEJBOutbound("StatelessBean", RemoteBeanInterface.class, false); + return bean.failOnCall(); + } +} diff --git a/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/RemoteLookupHelper.java b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/RemoteLookupHelper.java new file mode 100644 index 0000000000..0464aabe0a --- /dev/null +++ b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/RemoteLookupHelper.java @@ -0,0 +1,111 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.client; + +import java.util.Properties; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +/** + * Methods for remote EJB lookup. + */ +public class RemoteLookupHelper { + private static final String JNDI_PKG_PREFIXES = "org.jboss.ejb.client.naming"; + // this is name of the deployment on the second server. The project is named 'server' and the built war is the 'server.war' + private static final String REMOTE_DEPLOYMENT_NAME = System.getProperty("remote.deployment.name", "server"); + + private RemoteLookupHelper() throws IllegalAccessException { + throw new IllegalAccessException("Utility class, cannot be instantiated"); + } + + /** + * Method which creates a remote proxy endpoint defined by the EJB class name and the EJB remote interface. + * The method first defines the JNDI properties (put to {@link Properties} data structure) and then constructs + * the string lookup representation of the remote bean as explained at + * WildFly Developer Guide. + * + * This method expects there is configured a remote outbound connection in the standalone.xml configuration + * and that the deployment refers it with an definition in the WEB-INF/jboss-ejb-client.xml descriptor. + * + * @param beanImplName name of the bean implemented at the remote server which implements the remote interface + * @param remoteInterface remote interface with definition of metods that could be called against the remote EJB implementation + * @param isStateful true if the remote EJB bean (endpoint) is the stateful bean, if it's stateless then use 'false' + * @return bean which is casted to the remoteInterface + * @throws NamingException is thrown when a trouble on InitialContext lookup occurs + */ + @SuppressWarnings("unchecked") + public static T lookupRemoteEJBOutbound(String beanImplName, Class remoteInterface, boolean isStateful) throws NamingException { + final Properties jndiProperties = new Properties(); + jndiProperties.put(Context.URL_PKG_PREFIXES, JNDI_PKG_PREFIXES); + final Context context = new InitialContext(jndiProperties); + + return (T) context.lookup("ejb:/" + REMOTE_DEPLOYMENT_NAME + "/" + beanImplName + "!" + + remoteInterface.getName() + (isStateful ? "?stateful" : "")); + } + + /** + * Method which creates a remote proxy endpoint defined by the EJB class name and the EJB remote interface. + * The method first defines the JNDI properties (put to {@link Properties} data structure) and then constructs + * the string lookup representation of the remote bean as explained at + * WildFly Developer Guide. + * + * This method connects to the particular host and port with the provided credentials. + * + * This method does not rely on remote outbound connection. The proxy is created directly from the data + * provided as arguments. + * + * @param beanImplName name of the bean implemented at the remote server which implements the remote interface + * @param remoteInterface remote interface with definition of metods that could be called against the remote EJB implementation + * @param isStateful true if the remote EJB bean (endpoint) is the stateful bean, if it's stateless then use 'false' + * @return bean which is casted to the remoteInterface + * @throws NamingException is thrown when a trouble on InitialContext lookup occurs + */ + @SuppressWarnings("unchecked") + public static T lookupRemoteEJBDirect(String beanImplName, Class remoteInterface, boolean isStateful, + String host, int port, String user, String password, boolean isHttp) throws NamingException { + if(host == null || port == 0 || user == null || password == null) { + throw new NullPointerException("host, port or credentials are null or undefined"); + } + + Properties jndiProperties = new Properties(); + jndiProperties.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, "org.wildfly.naming.client.WildFlyInitialContextFactory"); + + if(isHttp) { + //use HTTP based invocation. Each invocation will be a HTTP request + jndiProperties.put(Context.PROVIDER_URL, "http://" + host + ":" + port + "/wildfly-services"); + } else { + //use HTTP upgrade, an initial upgrade requests is sent to upgrade to the remoting protocol + jndiProperties.put(javax.naming.Context.PROVIDER_URL, "remote+http://" + host + ":" + port); + } + jndiProperties.put(Context.URL_PKG_PREFIXES, JNDI_PKG_PREFIXES); + + jndiProperties.put("jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT", "false"); + jndiProperties.put("jboss.naming.client.connect.options.org.xnio.Options.SSL_STARTTLS", "false"); + jndiProperties.put("jboss.naming.client.connect.options.org.xnio.Options.SSL_ENABLED", "false"); + jndiProperties.put("jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS", "true"); + jndiProperties.put("jboss.naming.client.connect.options.org.xnio.Options.SASL_DISALLOWED_MECHANISMS", "JBOSS-LOCAL-USER"); + jndiProperties.put(Context.SECURITY_PRINCIPAL, user); + jndiProperties.put(Context.SECURITY_CREDENTIALS, password); + + final Context context = new InitialContext(jndiProperties); + + return (T) context.lookup("ejb:/" + REMOTE_DEPLOYMENT_NAME + "/" + beanImplName + "!" + + remoteInterface.getName() + (isStateful ? "?stateful" : "")); + } +} diff --git a/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/RestEndpoints.java b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/RestEndpoints.java new file mode 100644 index 0000000000..b210af66da --- /dev/null +++ b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/RestEndpoints.java @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.client; + +import org.jboss.as.quickstarts.ejb.entity.CallerUser; + +import javax.ejb.EJB; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.List; + +/** + * REST endpoints that serves as a simple API to invoke the remote EJBs. + */ +@Path("/") +public class RestEndpoints { + + @EJB + private RemoteBeanCaller remoteCaller; + + @EJB + private UsersManagement usersMgmt; + + @GET + @Path("/remote-outbound-stateless") + @Produces(MediaType.APPLICATION_JSON) + public List toStatelessRemoteOutbound() throws Exception { + return remoteCaller.remoteOutboundStatelessBeanCall(); + } + + @GET + @Path("/remote-outbound-notx-stateless") + @Produces(MediaType.APPLICATION_JSON) + public List toStatelessRemoteOutboundNoTx() throws Exception { + return remoteCaller.remoteOutboundStatelessNoTxBeanCall(); + } + + @GET + @Path("/direct-stateless") + @Produces(MediaType.APPLICATION_JSON) + public List toStatelessDirect() throws Exception { + return remoteCaller.directLookupStatelessBeanOverEjbRemotingCall(); + } + + @GET + @Path("/direct-stateless-http") + @Produces(MediaType.APPLICATION_JSON) + public List toStatelessDirectHttp() throws Exception { + return remoteCaller.directLookupStatelessBeanOverHttpCall(); + } + + @GET + @Path("/remote-outbound-notx-stateful") + @Produces(MediaType.APPLICATION_JSON) + public List toStatefulRemoteOutboundNoTx() throws Exception { + return remoteCaller.remoteOutboundStatefulNoTxBeanCall(); + } + + @GET + @Path("/remote-outbound-fail-stateless") + @Produces(MediaType.APPLICATION_JSON) + public String toFailStatelessRemoteOutbound() throws Exception { + return remoteCaller.remoteOutboundStatelessBeanFail(); + } + + + @GET + @Path("/users") + @Produces(MediaType.APPLICATION_JSON) + public List listUsers() { + return usersMgmt.getUsers(); + } +} diff --git a/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/UsersManagement.java b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/UsersManagement.java new file mode 100644 index 0000000000..8d225dc650 --- /dev/null +++ b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/client/UsersManagement.java @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.client; + +import org.jboss.as.quickstarts.ejb.entity.CallerUser; +import org.jboss.logging.Logger; + +import javax.ejb.Stateless; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import java.util.List; + +/** + * EJB which runs the remote calls to the EJBs. + * We use the EJB here for benefit of automatic transaction management. + */ +@Stateless +public class UsersManagement { + private static final Logger log = Logger.getLogger(UsersManagement.class); + private static final String tableFormatStringForPrint = "%5s%32s%32s%n"; + + @PersistenceContext + EntityManager em; + + public List getUsers() { + return em.createQuery( + "SELECT u FROM " + CallerUser.class.getSimpleName() + " u").getResultList(); + } + + public String printUsers() { + StringBuffer sb = new StringBuffer(); + sb.append(String.format(tableFormatStringForPrint, "ID", "First Name", "Last Name")); + sb.append(String.format(tableFormatStringForPrint, "---", "---", "---")); + for(CallerUser user: getUsers()) { + sb.append(String.format(tableFormatStringForPrint, + user.getId(), user.getFirstName(), user.getLastName())); + } + return sb.toString(); + } +} diff --git a/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/entity/CallerUser.java b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/entity/CallerUser.java new file mode 100644 index 0000000000..d0b64d6414 --- /dev/null +++ b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/entity/CallerUser.java @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.entity; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * Hibernate entity and JSON element to be returned from a JAX-RS method. + */ +@Entity +@XmlRootElement +public final class CallerUser { + + @Id + @GeneratedValue + private int id; + + private String firstName, lastName; + + + private CallerUser() { + // no-op constructor for the Hibernate initiation + } + + public CallerUser(String firstName, String lastName) { + this.firstName = firstName; + this.lastName = lastName; + } + + public int getId() { + return id; + } + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } +} + diff --git a/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/server/RemoteBeanInterface.java b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/server/RemoteBeanInterface.java new file mode 100644 index 0000000000..6078a18399 --- /dev/null +++ b/ejb-txn-remote-call/client/src/main/java/org/jboss/as/quickstarts/ejb/server/RemoteBeanInterface.java @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.server; + +/** + * Interface to call the remote bean. + * It's duplication of what is part of the 'server' artifact. + * This duplication is here for ease of use, especially with OpenShift S2I for one project with two maven modules. + */ +public interface RemoteBeanInterface { + /** + * Successful execution is assumed. + */ + String successOnCall(); + + /** + * A failure on call could be expected. + */ + String failOnCall(); +} + diff --git a/ejb-txn-remote-call/client/src/main/resources/META-INF/persistence.xml b/ejb-txn-remote-call/client/src/main/resources/META-INF/persistence.xml new file mode 100644 index 0000000000..b7294825c8 --- /dev/null +++ b/ejb-txn-remote-call/client/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,32 @@ + + + + + + + java:jboss/datasources/ejbJtaDs + + + + + + + diff --git a/ejb-txn-remote-call/client/src/main/webapp/WEB-INF/jboss-ejb-client.xml b/ejb-txn-remote-call/client/src/main/webapp/WEB-INF/jboss-ejb-client.xml new file mode 100644 index 0000000000..849246fa04 --- /dev/null +++ b/ejb-txn-remote-call/client/src/main/webapp/WEB-INF/jboss-ejb-client.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + diff --git a/ejb-txn-remote-call/client/src/main/webapp/WEB-INF/web.xml b/ejb-txn-remote-call/client/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..cc5ddeac6b --- /dev/null +++ b/ejb-txn-remote-call/client/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,27 @@ + + + + + + javax.ws.rs.core.Application + /* + + + diff --git a/ejb-txn-remote-call/pom.xml b/ejb-txn-remote-call/pom.xml new file mode 100644 index 0000000000..cc2ded3b54 --- /dev/null +++ b/ejb-txn-remote-call/pom.xml @@ -0,0 +1,47 @@ + + + + 4.0.0 + + org.jboss.eap.quickstarts + quickstart-parent + 7.4.0.GA + ../pom.xml + + + ejb-txn-remote-call + pom + Quickstart: ejb-txn-remote-call + The project demonstrates how to make EJB remote calls from server to server with transaction propagation. + The project also considers how to setup and run this functionality on OpenShift. + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + + + client + + server + + diff --git a/ejb-txn-remote-call/server/.s2i/environment b/ejb-txn-remote-call/server/.s2i/environment new file mode 100644 index 0000000000..37a3a162e1 --- /dev/null +++ b/ejb-txn-remote-call/server/.s2i/environment @@ -0,0 +1 @@ +S2I_IMAGE_SOURCE_MOUNTS=extensions \ No newline at end of file diff --git a/ejb-txn-remote-call/server/configuration/application-roles.properties b/ejb-txn-remote-call/server/configuration/application-roles.properties new file mode 100644 index 0000000000..5686280f4e --- /dev/null +++ b/ejb-txn-remote-call/server/configuration/application-roles.properties @@ -0,0 +1,2 @@ +# For OpenShift: this properties file that will be copied by WildFly s2i scripts under $JBOSS_HOME/configuration directory +quickstartUser=quickstartUser diff --git a/ejb-txn-remote-call/server/configuration/application-users.properties b/ejb-txn-remote-call/server/configuration/application-users.properties new file mode 100644 index 0000000000..a3b6aebfa1 --- /dev/null +++ b/ejb-txn-remote-call/server/configuration/application-users.properties @@ -0,0 +1,2 @@ +# For OpenShift: this properties file that will be copied by WildFly s2i scripts under $JBOSS_HOME/configuration directory +quickstartUser=c2d60ae3c894489fa59196c192e351ca diff --git a/ejb-txn-remote-call/server/extensions/cli.local.properties b/ejb-txn-remote-call/server/extensions/cli.local.properties new file mode 100644 index 0000000000..7d9d8664e2 --- /dev/null +++ b/ejb-txn-remote-call/server/extensions/cli.local.properties @@ -0,0 +1 @@ +serverConfig=standalone-ha.xml diff --git a/ejb-txn-remote-call/server/extensions/cli.openshift.properties b/ejb-txn-remote-call/server/extensions/cli.openshift.properties new file mode 100644 index 0000000000..3a06e2e134 --- /dev/null +++ b/ejb-txn-remote-call/server/extensions/cli.openshift.properties @@ -0,0 +1 @@ +serverConfig=standalone-openshift.xml \ No newline at end of file diff --git a/ejb-txn-remote-call/server/extensions/clustering.cli b/ejb-txn-remote-call/server/extensions/clustering.cli new file mode 100644 index 0000000000..c3c458e2ad --- /dev/null +++ b/ejb-txn-remote-call/server/extensions/clustering.cli @@ -0,0 +1,66 @@ +# setup from cli.*.properties +set serverConfig=${serverConfig} + +embed-server --std-out=echo --server-config=$serverConfig + +echo "Adding jgroups extension and subsystem..." + +# adding jgroups extension for clustering may start use kube ping protocol +batch +/socket-binding-group=standard-sockets/socket-binding=jgroups-tcp:add(port=7600) +/extension=org.jboss.as.clustering.jgroups:add() +/subsystem=jgroups:add() +run-batch +batch +/subsystem=jgroups/stack=tcp:add(transport={type=TCP, socket-binding=jgroups-tcp},protocols=[{type=kubernetes.KUBE_PING},{type=MERGE3},{type=FD_SOCK},{type=FD_ALL},{type=VERIFY_SUSPECT},{type=pbcast.NAKACK2},{type=UNICAST3},{type=pbcast.STABLE},{type=pbcast.GMS},{type=MFC},{type=FRAG3}]) +/subsystem=jgroups/channel=ee:add(stack=tcp,cluster=ejb) +/subsystem=jgroups:write-attribute(name=default-channel, value=ee) +run-batch + +echo "Rewriting infinispan caches configuration to dist..." + +# server cache-container +batch +/subsystem=infinispan/cache-container=server:list-add(name=aliases, value="cluster singleton") +/subsystem=infinispan/cache-container=server/transport=jgroups:add(lock-timeout=60000) +/subsystem=infinispan/cache-container=server/local-cache=default:remove +/subsystem=infinispan/cache-container=server/replicated-cache=default:add +/subsystem=infinispan/cache-container=server/replicated-cache=default/component=transaction:add(mode=BATCH) +run-batch + +# ejb cache-container +batch +/subsystem=infinispan/cache-container=ejb/transport=jgroups:add(lock-timeout=60000) +/subsystem=infinispan/cache-container=ejb/distributed-cache=dist:add() +/subsystem=infinispan/cache-container=ejb/distributed-cache=dist/store=file:add() +/subsystem=infinispan/cache-container=ejb:write-attribute(name=default-cache, value=dist) +run-batch +reload --start-mode=admin-only +batch +/subsystem=infinispan/cache-container=ejb/distributed-cache=dist/component=transaction:write-attribute(name=mode,value=BATCH) +/subsystem=infinispan/cache-container=ejb/distributed-cache=dist/component=locking:write-attribute(name=isolation, value=REPEATABLE_READ) +/subsystem=infinispan/cache-container=ejb/local-cache=passivation:remove +run-batch + +# web cache-container +batch +/subsystem=infinispan/cache-container=web/transport=jgroups:add(lock-timeout=60000) +/subsystem=infinispan/cache-container=web/distributed-cache=dist:add() +/subsystem=infinispan/cache-container=web/distributed-cache=dist/store=file:add(passivation=true, purge=false) +/subsystem=infinispan/cache-container=web:write-attribute(name=default-cache, value=dist) +run-batch +batch +/subsystem=infinispan/cache-container=web/distributed-cache=dist/component=transaction:write-attribute(name=mode,value=BATCH) +/subsystem=infinispan/cache-container=web/distributed-cache=dist/component=locking:write-attribute(name=isolation, value=REPEATABLE_READ) +/subsystem=infinispan/cache-container=web/local-cache=passivation:remove +run-batch + +# needed for ejb client works fine with multiple servers in ha cluster +if (result == undefined) of /socket-binding-group=standard-sockets/socket-binding=http:read-attribute(name=client-mappings) + echo "Configuring server socket binding with client-mappings..." + /socket-binding-group=standard-sockets/socket-binding=http:list-add(name=client-mappings, value={destination-address="${env.HOSTNAME}.${env.STATEFULSET_HEADLESS_SERVICE_NAME}"}) +end-if + +echo "clustering.cli script finished" + +quit diff --git a/ejb-txn-remote-call/server/extensions/install.sh b/ejb-txn-remote-call/server/extensions/install.sh new file mode 100644 index 0000000000..93a9e3d73f --- /dev/null +++ b/ejb-txn-remote-call/server/extensions/install.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# This script (install.sh) will be executed during build 'server-build-artifacts' +# This script copies the CLI scripts to $JBOSS_HOME/extensions to be processed in the post hook +# The post hook part means that on launching of the application server the postconfigure.sh is executed + +set -x +echo "Running ejb-txn-remote-call/server/install.sh" +injected_dir=$1 +# copy any needed files into the target build. +cp -rf ${injected_dir} $JBOSS_HOME/extensions + diff --git a/ejb-txn-remote-call/server/extensions/postconfigure.sh b/ejb-txn-remote-call/server/extensions/postconfigure.sh new file mode 100644 index 0000000000..ea8a5f5e24 --- /dev/null +++ b/ejb-txn-remote-call/server/extensions/postconfigure.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +# This script (postconfigure.sh) is executed during launch of the application server (not during the build) +# This script is expected to be copied to $JBOSS_HOME/extensions/ folder by script install.sh + +STANDALONE_XML='standalone-openshift.xml' +POSTCONFIGURE_PROPERTIES_FILE="${JBOSS_HOME}/extensions/cli.openshift.properties" + +# on JBoss EAP with standalone-openshift.xml, on with WildFly standalone.xml +if [ ! -f "${JBOSS_HOME}/standalone/configuration/${STANDALONE_XML}" ]; then + STANDALONE_XML='standalone.xml' + sed -i "s/serverConfig=.*/serverConfig=${STANDALONE_XML}/" "${POSTCONFIGURE_PROPERTIES_FILE}" +fi + +# container does not provide PostgreSQL driver +if [ ! -f "${JBOSS_HOME}/modules/org/postgresql/jdbc/main/module.xml" ]; then + echo "Creating PostgreSQL JDBC module and driver under ${STANDALONE_XML}" + "${JBOSS_HOME}"/bin/jboss-cli.sh "embed-server --server-config=${STANDALONE_XML},\ + module add --name=org.postgresql.jdbc --module-xml=${JBOSS_HOME}/extensions/postgresql-module.xml" + "${JBOSS_HOME}"/bin/jboss-cli.sh "embed-server --server-config=${STANDALONE_XML},\ + /subsystem=datasources/jdbc-driver=postgresql:add(driver-name=postgresql,driver-module-name=org.postgresql.jdbc,driver-xa-datasource-class-name=org.postgresql.xa.PGXADataSource)" +fi + +echo "Executing ejb-txn-remote-call/server ${JBOSS_HOME}/extensions/clustering.cli file with properties file: ${POSTCONFIGURE_PROPERTIES_FILE}." +[ "x$SCRIPT_DEBUG" = "xtrue" ] && cat "${JBOSS_HOME}/extensions/clustering.cli" +"${JBOSS_HOME}"/bin/jboss-cli.sh --file="${JBOSS_HOME}/extensions/clustering.cli" --properties="${POSTCONFIGURE_PROPERTIES_FILE}" + +echo "Using server.war instead of ROOT.war" +if [ -f "${JBOSS_HOME}"/standalone/deployments/ROOT.war ]; then + mv "${JBOSS_HOME}"/standalone/deployments/ROOT.war "${JBOSS_HOME}"/standalone/deployments/server.war +fi \ No newline at end of file diff --git a/ejb-txn-remote-call/server/extensions/postgresql-module.xml b/ejb-txn-remote-call/server/extensions/postgresql-module.xml new file mode 100644 index 0000000000..f2a5a58797 --- /dev/null +++ b/ejb-txn-remote-call/server/extensions/postgresql-module.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml new file mode 100644 index 0000000000..0e16237aad --- /dev/null +++ b/ejb-txn-remote-call/server/pom.xml @@ -0,0 +1,93 @@ + + + + 4.0.0 + + org.jboss.eap.quickstarts + quickstart-parent + 7.4.0.GA + ../../pom.xml + + + ejb-txn-remote-call-server + war + Quickstart: ejb-txn-remote-call-server + The project is the application to be deployed on the second server to receive the call + + + 5.10.6.Final + + + + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + provided + + + + org.jboss.spec.javax.ejb + jboss-ejb-api_3.2_spec + provided + + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.3_spec + provided + + + + org.jboss.spec.javax.transaction + jboss-transaction-api_1.3_spec + provided + + + + jakarta.persistence + jakarta.persistence-api + provided + + + + org.jboss.logging + jboss-logging + provided + + + + org.jboss.narayana.jts + narayana-jts-idlj + ${version.narayana} + provided + + + + + server + + + maven-war-plugin + + false + + + + + diff --git a/ejb-txn-remote-call/server/server-cr.yaml b/ejb-txn-remote-call/server/server-cr.yaml new file mode 100644 index 0000000000..249aea8099 --- /dev/null +++ b/ejb-txn-remote-call/server/server-cr.yaml @@ -0,0 +1,35 @@ +apiVersion: wildfly.org/v1alpha1 +kind: WildFlyServer +metadata: + name: server +spec: + applicationImage: "image-registry.openshift-image-registry.svc:5000/ejb-txn-remote-call-project/server:latest" + replicas: 2 + env: + - name: DB_SERVICE_PREFIX_MAPPING + value: test-postgresql=TEST + - name: TEST_NONXA + value: 'false' + - name: TEST_JNDI + value: java:jboss/datasources/ejbJtaDs + - name: TEST_POSTGRESQL_SERVICE_HOST + value: postgresql + - name: TEST_POSTGRESQL_SERVICE_PORT + value: '5432' + - name: TEST_DRIVER + value: postgresql + - name: TEST_DATABASE + valueFrom: + secretKeyRef: + name: postgresql + key: database-name + - name: TEST_USERNAME + valueFrom: + secretKeyRef: + name: postgresql + key: username + - name: TEST_PASSWORD + valueFrom: + secretKeyRef: + name: postgresql + key: password diff --git a/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/entity/CalleeUser.java b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/entity/CalleeUser.java new file mode 100644 index 0000000000..c845851051 --- /dev/null +++ b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/entity/CalleeUser.java @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.entity; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +@Entity +public final class CalleeUser { + + @Id + @GeneratedValue + private int id; + + private String firstName, lastName; + + + private CalleeUser() { + // no-op constructor for the Hibernate initiation + } + + public CalleeUser(String firstName, String lastName) { + this.firstName = firstName; + this.lastName = lastName; + } + + public int getId() { + return id; + } + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } +} diff --git a/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/mock/MockXAResource.java b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/mock/MockXAResource.java new file mode 100644 index 0000000000..efabe9fa51 --- /dev/null +++ b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/mock/MockXAResource.java @@ -0,0 +1,233 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.mock; + +import java.io.Serializable; +import java.util.Collection; +import java.util.Vector; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; + +import javax.transaction.xa.XAException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + +import com.arjuna.ats.arjuna.recovery.RecoveryManager; +import com.arjuna.ats.arjuna.recovery.RecoveryModule; +import com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule; +import com.arjuna.ats.jta.recovery.XAResourceRecoveryHelper; +import org.jboss.logging.Logger; + +/** + * Mock {@link XAResource} which can be used for enlisting it to a transaction + * and asking two-phase commit to be run. + * + * Reason of existence: + * A transaction normally uses 1PC optimization when only one resource (e.g. only database perist) + * is part of the transaction. When 1PC optimization is used then only XA commit call is invoked. + * For transaction recovery could be verified we need 2PC which is usually used with two and more + * enlisted resources. + * The other reason for having this XAResource implemented is the fact that it could be used + * for intentionally establishing an error condition during transaction processing, see the {@link TestAction}. + * + * Usability: + * Keep in mind this XAResource is for the demonstration and testing purposes. + * It's not capable to do any persistence over JVM restarts and it's not considered by the recovery processing. + */ +public class MockXAResource implements XAResource, Serializable { + private static final long serialVersionUID = 1L; + private static Logger log = Logger.getLogger(MockXAResource.class); + + private static final Collection preparedXids = ConcurrentHashMap.newKeySet(); + private static final AtomicInteger commitCount = new AtomicInteger(); + + /** + * This is a Narayana initialization of periodic recovery processing for the {@link MockXAResource}. + * The recovery helper ensures that the {@link XAResource} may be processed + * and ensures transactional safety when transaction processing failure happens. + */ + static { + MockXAResource.MockXAResourceRecoveryHelper.getRecoveryModule() + .addXAResourceRecoveryHelper(MockXAResourceRecoveryHelper.INSTANCE); + } + + public enum TestAction { + NONE, + PREPARE_THROW_XAER_RMERR, PREPARE_THROW_XAER_RMFAIL, PREPARE_THROW_UNKNOWN_XA_EXCEPTION, + COMMIT_THROW_XAER_RMERR, COMMIT_THROW_XAER_RMFAIL, COMMIT_THROW_UNKNOWN_XA_EXCEPTION, + PREPARE_JVM_HALT, COMMIT_JVM_HALT + } + + protected TestAction testAction; + private int transactionTimeout; + + public MockXAResource() { + this(TestAction.NONE); + } + + public MockXAResource(TestAction testAction) { + log.debugf("Creating %s with test action %s", this, testAction); + this.testAction = testAction; + } + + @Override + public int prepare(Xid xid) throws XAException { + log.debugf("prepare '%s' xid: [%s]", this, xid); + + switch (testAction) { + case PREPARE_THROW_XAER_RMERR: + log.debugf("at prepare '%s' throws XAException(XAException.XAER_RMERR)", xid); + throw new XAException(XAException.XAER_RMERR); + case PREPARE_THROW_XAER_RMFAIL: + log.debugf("at prepare '%s' throws XAException(XAException.XAER_RMFAIL)", xid); + throw new XAException(XAException.XAER_RMFAIL); + case PREPARE_THROW_UNKNOWN_XA_EXCEPTION: + log.debugf("at prepare '%s' throws XAException(null)", xid); + throw new XAException(null); + case PREPARE_JVM_HALT: + log.debugf("at prepare '%s' halting JVM", xid); + Runtime.getRuntime().halt(1); + case NONE: + default: + preparedXids.add(xid); + return XAResource.XA_OK; + } + } + + @Override + public void commit(Xid xid, boolean onePhase) throws XAException { + log.debugf("commit '%s' xid:[%s], %s one phase", this, xid, onePhase ? "with" : "without"); + + switch (testAction) { + case COMMIT_THROW_XAER_RMERR: + log.debugf("at commit '%s' throws XAException(XAException.XAER_RMERR)", xid); + throw new XAException(XAException.XAER_RMERR); + case COMMIT_THROW_XAER_RMFAIL: + log.debugf("at commit '%s' throws XAException(XAException.XAER_RMFAIL)", xid); + throw new XAException(XAException.XAER_RMFAIL); + case COMMIT_THROW_UNKNOWN_XA_EXCEPTION: + log.debugf("at commit '%s' throws XAException(null)", xid); + throw new XAException(null); + case COMMIT_JVM_HALT: + log.debugf("at commit '%s' halting JVM", xid); + Runtime.getRuntime().halt(1); + case NONE: + default: + preparedXids.remove(xid); + } + + log.tracef("Number of succesful commit for MockXAResource is: %d", + commitCount.incrementAndGet()); + } + + @Override + public void start(Xid xid, int flags) throws XAException { + log.debugf("start '%s' xid: [%s], flags: %s", this, xid, flags); + // currentXid = xid; + } + + @Override + public void end(Xid xid, int flags) throws XAException { + log.debugf("end '%s' xid:[%s], flag: %s", this, xid, flags); + } + + @Override + public void forget(Xid xid) throws XAException { + log.debugf("forget '%s' xid:[%s]", this, xid); + preparedXids.remove(xid); + } + + @Override + public int getTransactionTimeout() throws XAException { + log.debugf("getTransactionTimeout: '%s' returning timeout: %s", this, transactionTimeout); + return transactionTimeout; + } + + @Override + public boolean isSameRM(XAResource xares) throws XAException { + log.tracef("isSameRM returning false to xares: %s", xares); + return false; + } + + @Override + public Xid[] recover(int flag) throws XAException { + log.debugf("recover '%s' with flags: %s, returning list of xids '%s'", this, flag, preparedXids); + return preparedXids.toArray(new Xid[preparedXids.size()]); + } + + @Override + public void rollback(Xid xid) throws XAException { + log.debugf("rollback '%s' xid: [%s]", this, xid); + preparedXids.remove(xid); + } + + @Override + public boolean setTransactionTimeout(int seconds) throws XAException { + log.tracef("setTransactionTimeout: setting timeout: %s", seconds); + this.transactionTimeout = seconds; + return true; + } + + /** + * Returns number of successfully committed {@link MockXAResource}s. + * + * @return number of committed. + */ + public static int getCommitCount() { + return MockXAResource.commitCount.get(); + } + + /** + * Instance of {@link XAResourceRecoveryHelper} which gives a chance to the Narayana recovery manager + * to load the {@link MockXAResource} during recovery. + * + * A note: for this would work fine after deployment to WildFly we need to define + * dependency of jboss transaction module 'org.jboss.jts' for this war module. + * This is done by descriptor jboss-deployment-structure.xml. + */ + static class MockXAResourceRecoveryHelper implements XAResourceRecoveryHelper { + static final MockXAResourceRecoveryHelper INSTANCE = new MockXAResourceRecoveryHelper(); + private static final MockXAResource mockXARecoveringInstance = new MockXAResource(); + + private MockXAResourceRecoveryHelper() { + if(INSTANCE != null) { + throw new IllegalStateException("singleton instance can't be instantiated twice"); + } + } + + @Override + public boolean initialise(String p) throws Exception { + // this is never called during standard processing + return true; + } + + @Override + public XAResource[] getXAResources() throws Exception { + return new XAResource[] { mockXARecoveringInstance }; + } + + static XARecoveryModule getRecoveryModule() { + for (RecoveryModule recoveryModule : ((Vector) RecoveryManager.manager().getModules())) { + if (recoveryModule instanceof XARecoveryModule) { + return (XARecoveryModule) recoveryModule; + } + } + return null; + } + } +} diff --git a/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/InfoUtils.java b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/InfoUtils.java new file mode 100644 index 0000000000..6865591a70 --- /dev/null +++ b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/InfoUtils.java @@ -0,0 +1,102 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.server; + + +import java.net.InetAddress; +import java.net.UnknownHostException; + +import org.jboss.logging.Logger; + +import javax.naming.InitialContext; +import javax.transaction.Status; +import javax.transaction.TransactionManager; + +/** + * Utility class with generic conversions and info getters. + */ +public final class InfoUtils { + private static final Logger log = Logger.getLogger(InfoUtils.class); + + private InfoUtils() throws IllegalAccessException { + throw new IllegalAccessException("utility class, do not instantiate"); + } + + /** + * To get information about hostname and jboss node name. + * + * @return string with information about hostname and jboss node name + */ + public static String getHostInfo() { + String currentIpHost = "<>"; + try { + InetAddress ip = InetAddress.getLocalHost(); + currentIpHost = ip.toString(); + } catch (UnknownHostException e) { + log.warnf("Cannot get current IP and hostname. Cause: %s", e); + } + String jbossNodeName = System.getProperty("jboss.node.name"); + return String.format("host: %s, jboss node name: %s", currentIpHost, jbossNodeName); + } + + /** + * Converting transaction status code as int to string representation, + * see {@link javax.transaction.Status}. + * + * @param status status code as integer + * @return string representation of the transaction status code + */ + public static String transactionStatusAsString(int status) { + switch (status) { + case javax.transaction.Status.STATUS_ACTIVE: + return "javax.transaction.Status.STATUS_ACTIVE"; + case javax.transaction.Status.STATUS_COMMITTED: + return "javax.transaction.Status.STATUS_COMMITTED"; + case javax.transaction.Status.STATUS_MARKED_ROLLBACK: + return "javax.transaction.Status.STATUS_MARKED_ROLLBACK"; + case javax.transaction.Status.STATUS_NO_TRANSACTION: + return "javax.transaction.Status.STATUS_NO_TRANSACTION"; + case javax.transaction.Status.STATUS_PREPARED: + return "javax.transaction.Status.STATUS_PREPARED"; + case javax.transaction.Status.STATUS_PREPARING: + return "javax.transaction.Status.STATUS_PREPARING"; + case javax.transaction.Status.STATUS_ROLLEDBACK: + return "javax.transaction.Status.STATUS_ROLLEDBACK"; + case javax.transaction.Status.STATUS_ROLLING_BACK: + return "javax.transaction.Status.STATUS_ROLLING_BACK"; + case javax.transaction.Status.STATUS_UNKNOWN: + default: + return "javax.transaction.Status.STATUS_UNKNOWN"; + } + } + + public static String getTransactionStatus() { + int statusCode = Status.STATUS_UNKNOWN; + + try { + InitialContext ctx = new InitialContext(); + TransactionManager tm = (TransactionManager) ctx.lookup("java:/TransactionManager"); + statusCode = tm.getStatus(); + } catch (Exception e) { + log.warnf(e, "Cannot get transaction manager at JNDI binding 'java:/TransactionManager'"); + return "error to obtain transaction manager"; + } + + return transactionStatusAsString(statusCode); + } +} diff --git a/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/RemoteBeanInterface.java b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/RemoteBeanInterface.java new file mode 100644 index 0000000000..126b81a4a9 --- /dev/null +++ b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/RemoteBeanInterface.java @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.server; + + +/** + * Interface of the bean that's called from the first server. + * Interface is duplicated at the client side. + */ +public interface RemoteBeanInterface { + /** + * Successful execution is assumed. + */ + String successOnCall(); + + /** + * A failure on call could be expected. + */ + String failOnCall(); +} \ No newline at end of file diff --git a/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/RestEndpoints.java b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/RestEndpoints.java new file mode 100644 index 0000000000..29ec543d79 --- /dev/null +++ b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/RestEndpoints.java @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.server; + +import org.jboss.as.quickstarts.ejb.mock.MockXAResource; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.Arrays; +import java.util.List; + +/** + * REST endpoints to get info on the server processing. + */ +@Path("/") +public class RestEndpoints { + + @GET + @Path("/commits") + @Produces(MediaType.APPLICATION_JSON) + public List numberOfMockXAResourceCommits() { + return Arrays.asList(InfoUtils.getHostInfo(), String.valueOf(MockXAResource.getCommitCount())); + } +} diff --git a/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/StatefulBean.java b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/StatefulBean.java new file mode 100644 index 0000000000..e51ea4b3b2 --- /dev/null +++ b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/StatefulBean.java @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.server; + +import org.jboss.as.quickstarts.ejb.entity.CalleeUser; +import org.jboss.logging.Logger; + +import javax.ejb.Remote; +import javax.ejb.Stateful; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +/** + * Stateful bean to be called. + */ +@Stateful +@Remote(RemoteBeanInterface.class) +public class StatefulBean implements RemoteBeanInterface { + private static final Logger log = Logger.getLogger(StatelessBean.class); + + @PersistenceContext + private EntityManager em; + + /** + * Stateful bean remote method to be called from the client side. + * + * @return information about the host that this EJB resides on + */ + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRED) + public String successOnCall() { + log.debugf("Called '%s.successOnCall()' with transaction status %s", + this.getClass().getName(), InfoUtils.getTransactionStatus()); + + em.persist(new CalleeUser("Thorin", "Oakenshield")); + + return InfoUtils.getHostInfo(); + } + + @Override + public String failOnCall() { + throw new UnsupportedOperationException("not implemented"); + } +} \ No newline at end of file diff --git a/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/StatelessBean.java b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/StatelessBean.java new file mode 100644 index 0000000000..d6332f1cc4 --- /dev/null +++ b/ejb-txn-remote-call/server/src/main/java/org/jboss/as/quickstarts/ejb/server/StatelessBean.java @@ -0,0 +1,94 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2021, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.as.quickstarts.ejb.server; + +import javax.annotation.Resource; +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.transaction.RollbackException; +import javax.transaction.SystemException; +import javax.transaction.TransactionManager; + +import org.jboss.as.quickstarts.ejb.entity.CalleeUser; +import org.jboss.as.quickstarts.ejb.mock.MockXAResource; +import org.jboss.logging.Logger; + +/** + * Stateless bean to be called. + */ +@Stateless +@Remote (RemoteBeanInterface.class) +public class StatelessBean implements RemoteBeanInterface { + private static final Logger log = Logger.getLogger(StatelessBean.class); + + @Resource(lookup = "java:/TransactionManager") + private TransactionManager tm; + + @PersistenceContext + private EntityManager em; + + /** + * Stateless remote ejb method to be called from the client side. + * + * @return information about the host that this EJB resides on + */ + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRED) + public String successOnCall() { + log.debugf("Called '%s.successOnCall()' with transaction status %s", + this.getClass().getName(), InfoUtils.getTransactionStatus()); + + // transaction enlists XAResource #1 + try { + tm.getTransaction().enlistResource(new MockXAResource()); + } catch(SystemException | RollbackException sre) { + throw new IllegalStateException("Cannot enlist a " + MockXAResource.class.getName() + " to the current transaction", sre); + } + // transaction enlists XAResource #2 + em.persist(new CalleeUser("Bard", "The Bowman")); + + return InfoUtils.getHostInfo(); + } + + /** + * Failure during the commit processing does not mean an exception is thrown by transaction manager processing. + * The business method is marked as succesfully finished. + * The uncommitted {@link javax.transaction.xa.XAResource}s will be committed later by periodic recovery. + */ + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRED) + public String failOnCall() { + log.debugf("Called '%s.failOnCall()' with transaction status %s", + this.getClass().getName(), InfoUtils.getTransactionStatus()); + + // transaction enlists XAResource #1 with forcing to fail + try { + tm.getTransaction().enlistResource(new MockXAResource(MockXAResource.TestAction.COMMIT_THROW_XAER_RMFAIL)); + } catch(SystemException | RollbackException sre) { + throw new IllegalStateException("Cannot enlist a " + MockXAResource.class.getName() + " to the current transaction", sre); + } + // transaction enlists XAResource #2 + em.persist(new CalleeUser("Bard", "The Bowman")); + + return InfoUtils.getHostInfo(); + } +} diff --git a/ejb-txn-remote-call/server/src/main/resources/META-INF/persistence.xml b/ejb-txn-remote-call/server/src/main/resources/META-INF/persistence.xml new file mode 100644 index 0000000000..ccb6f85438 --- /dev/null +++ b/ejb-txn-remote-call/server/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,32 @@ + + + + + + + java:jboss/datasources/ejbJtaDs + + + + + + + diff --git a/ejb-txn-remote-call/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/ejb-txn-remote-call/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml new file mode 100644 index 0000000000..b2e9557088 --- /dev/null +++ b/ejb-txn-remote-call/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/ejb-txn-remote-call/server/src/main/webapp/WEB-INF/web.xml b/ejb-txn-remote-call/server/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..35bcb7a97d --- /dev/null +++ b/ejb-txn-remote-call/server/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,26 @@ + + + + + + javax.ws.rs.core.Application + /* + + diff --git a/greeter/README.html b/greeter/README.html index cb3caf8fb5..10af288ca3 100644 --- a/greeter/README.html +++ b/greeter/README.html @@ -773,7 +773,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -782,10 +782,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -794,7 +794,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -803,10 +803,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -816,17 +816,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -869,12 +869,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the greeter source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the greeter source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="greeter-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -913,9 +913,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="greeter-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1000,11 +1000,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1062,7 +1062,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1103,7 +1103,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1114,7 +1114,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/greeter/pom.xml b/greeter/pom.xml index fd412ed59e..3105173f38 100644 --- a/greeter/pom.xml +++ b/greeter/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml greeter diff --git a/ha-singleton-deployment/README.html b/ha-singleton-deployment/README.html index f875eb281b..baf41a711f 100644 --- a/ha-singleton-deployment/README.html +++ b/ha-singleton-deployment/README.html @@ -845,7 +845,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/ha-singleton-deployment/pom.xml b/ha-singleton-deployment/pom.xml index 5d17ca54a4..bfc29e59aa 100644 --- a/ha-singleton-deployment/pom.xml +++ b/ha-singleton-deployment/pom.xml @@ -30,7 +30,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/ha-singleton-service/README.html b/ha-singleton-service/README.html index 05903bae24..112001a8df 100644 --- a/ha-singleton-service/README.html +++ b/ha-singleton-service/README.html @@ -1224,7 +1224,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/ha-singleton-service/pom.xml b/ha-singleton-service/pom.xml index c9576705fd..4dd5e36d2b 100644 --- a/ha-singleton-service/pom.xml +++ b/ha-singleton-service/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/helloworld-html5/README.html b/helloworld-html5/README.html index e46d9020a3..0a265d8fcf 100644 --- a/helloworld-html5/README.html +++ b/helloworld-html5/README.html @@ -874,7 +874,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -883,10 +883,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -895,7 +895,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -904,10 +904,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -917,17 +917,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -970,12 +970,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the helloworld-html5 source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the helloworld-html5 source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="helloworld-html5-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1010,9 +1010,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="helloworld-html5-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1093,11 +1093,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1155,7 +1155,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1196,7 +1196,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1207,7 +1207,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/helloworld-html5/functional-tests/pom.xml b/helloworld-html5/functional-tests/pom.xml index f8948368b9..1358dc1020 100644 --- a/helloworld-html5/functional-tests/pom.xml +++ b/helloworld-html5/functional-tests/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../../pom.xml helloworld-html5-test-webdriver diff --git a/helloworld-html5/functional-tests/src/test/resources/arquillian.xml b/helloworld-html5/functional-tests/src/test/resources/arquillian.xml index 566978211a..eda7b569f1 100644 --- a/helloworld-html5/functional-tests/src/test/resources/arquillian.xml +++ b/helloworld-html5/functional-tests/src/test/resources/arquillian.xml @@ -32,13 +32,8 @@ - - firefox - - + + phantomjs diff --git a/helloworld-html5/pom.xml b/helloworld-html5/pom.xml index 345717c317..5024735e73 100644 --- a/helloworld-html5/pom.xml +++ b/helloworld-html5/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml helloworld-html5 diff --git a/helloworld-jms/README.html b/helloworld-jms/README.html index 3458086fdc..c9cdbb9451 100644 --- a/helloworld-jms/README.html +++ b/helloworld-jms/README.html @@ -501,7 +501,7 @@

    Use of the EAP_HOME and QUICKSTART_HOME Variable

    Add the Authorized Application User

    -

    This quickstart uses secured management interfaces and requires that you create the following application user to access the running application.

    +

    This quickstart uses secured application interfaces and requires that you create the following application user to access the running application.

    @@ -950,7 +950,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml index a08a8fe667..be7b6ae6fa 100644 --- a/helloworld-jms/pom.xml +++ b/helloworld-jms/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA../pom.xmlhelloworld-jms diff --git a/helloworld-mbean/README.html b/helloworld-mbean/README.html index a67dd3e7ff..c1e96b3ae3 100644 --- a/helloworld-mbean/README.html +++ b/helloworld-mbean/README.html @@ -825,7 +825,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/helloworld-mbean/helloworld-mbean-service/pom.xml b/helloworld-mbean/helloworld-mbean-service/pom.xml index 8bccc1625a..96d425cdc5 100644 --- a/helloworld-mbean/helloworld-mbean-service/pom.xml +++ b/helloworld-mbean/helloworld-mbean-service/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts helloworld-mbean - 7.4.0.Beta + 7.4.0.GA ../pom.xml helloworld-mbean-service diff --git a/helloworld-mbean/helloworld-mbean-webapp/pom.xml b/helloworld-mbean/helloworld-mbean-webapp/pom.xml index 47b83b30a3..73a7117661 100644 --- a/helloworld-mbean/helloworld-mbean-webapp/pom.xml +++ b/helloworld-mbean/helloworld-mbean-webapp/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts helloworld-mbean - 7.4.0.Beta + 7.4.0.GA ../pom.xml helloworld-mbean-webapp diff --git a/helloworld-mbean/pom.xml b/helloworld-mbean/pom.xml index 80227ade20..2265b9cb75 100644 --- a/helloworld-mbean/pom.xml +++ b/helloworld-mbean/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA../pom.xml diff --git a/helloworld-mdb-propertysubstitution/README.html b/helloworld-mdb-propertysubstitution/README.html index b8d495bfee..ce71a1ace1 100644 --- a/helloworld-mdb-propertysubstitution/README.html +++ b/helloworld-mdb-propertysubstitution/README.html @@ -863,7 +863,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/helloworld-mdb-propertysubstitution/pom.xml b/helloworld-mdb-propertysubstitution/pom.xml index 06c25473b1..d76ede0fdb 100644 --- a/helloworld-mdb-propertysubstitution/pom.xml +++ b/helloworld-mdb-propertysubstitution/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA../pom.xml diff --git a/helloworld-mdb/README.html b/helloworld-mdb/README.html index 9526af55ae..bf693270f4 100644 --- a/helloworld-mdb/README.html +++ b/helloworld-mdb/README.html @@ -779,7 +779,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -788,10 +788,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -800,7 +800,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -809,10 +809,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -822,17 +822,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -875,12 +875,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the helloworld-mdb source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the helloworld-mdb source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="helloworld-mdb-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -915,9 +915,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="helloworld-mdb-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -998,11 +998,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1060,7 +1060,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1101,7 +1101,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1112,7 +1112,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml index 3950476407..caa079d62e 100644 --- a/helloworld-mdb/pom.xml +++ b/helloworld-mdb/pom.xml @@ -1,30 +1,30 @@ - 4.0.0 org.jboss.eap.quickstarts quickstart-parent - - 7.4.0.Beta + 7.4.0.GA ../pom.xml @@ -57,7 +57,7 @@ jboss-jms-api_2.0_spec provided - org.jboss.spec.javax.servlet diff --git a/helloworld-mutual-ssl-secured/README.html b/helloworld-mutual-ssl-secured/README.html index fe36794b76..3f823c9a97 100644 --- a/helloworld-mutual-ssl-secured/README.html +++ b/helloworld-mutual-ssl-secured/README.html @@ -494,7 +494,7 @@

    Use of the EAP_HOME and QUICKSTART_HOME Variable

    Add the Authorized Application User

    -

    This quickstart uses secured management interfaces and requires that you create the following application user to access the running application.

    +

    This quickstart uses secured application interfaces and requires that you create the following application user to access the running application.

    @@ -1283,7 +1283,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/helloworld-mutual-ssl-secured/pom.xml b/helloworld-mutual-ssl-secured/pom.xml index 2f2dfb10c9..7c693cb499 100644 --- a/helloworld-mutual-ssl-secured/pom.xml +++ b/helloworld-mutual-ssl-secured/pom.xml @@ -1,4 +1,4 @@ - + - 7.4.0.Beta + 7.4.0.GA../pom.xml diff --git a/helloworld-mutual-ssl/README.html b/helloworld-mutual-ssl/README.html index 94428892f5..bd078a0220 100644 --- a/helloworld-mutual-ssl/README.html +++ b/helloworld-mutual-ssl/README.html @@ -1139,7 +1139,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/helloworld-mutual-ssl/pom.xml b/helloworld-mutual-ssl/pom.xml index 889e8d3bda..7344fe453b 100644 --- a/helloworld-mutual-ssl/pom.xml +++ b/helloworld-mutual-ssl/pom.xml @@ -1,4 +1,4 @@ - + - 7.4.0.Beta + 7.4.0.GA../pom.xmlhelloworld-mutual-ssl diff --git a/helloworld-rs/README.html b/helloworld-rs/README.html index c04c00de71..f0108ef6dc 100644 --- a/helloworld-rs/README.html +++ b/helloworld-rs/README.html @@ -726,7 +726,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -735,10 +735,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -747,7 +747,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -756,10 +756,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -769,17 +769,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -822,12 +822,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the helloworld-rs source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the helloworld-rs source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="helloworld-rs-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -862,9 +862,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="helloworld-rs-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -945,11 +945,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1007,7 +1007,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1048,7 +1048,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1059,7 +1059,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/helloworld-rs/pom.xml b/helloworld-rs/pom.xml index 1f2d9e86df..f807599c29 100644 --- a/helloworld-rs/pom.xml +++ b/helloworld-rs/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml helloworld-rs diff --git a/helloworld-singleton/README.html b/helloworld-singleton/README.html index 8579fb6c8a..a1f27d6bd4 100644 --- a/helloworld-singleton/README.html +++ b/helloworld-singleton/README.html @@ -725,7 +725,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -734,10 +734,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -746,7 +746,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -755,10 +755,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -768,17 +768,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -821,12 +821,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the helloworld-singleton source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the helloworld-singleton source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="helloworld-singleton-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -861,9 +861,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="helloworld-singleton-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -944,11 +944,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1006,7 +1006,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1047,7 +1047,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1058,7 +1058,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml index adf2dffa65..d8f6a2c381 100644 --- a/helloworld-singleton/pom.xml +++ b/helloworld-singleton/pom.xml @@ -1,30 +1,30 @@ - 4.0.0 org.jboss.eap.quickstarts quickstart-parent - - 7.4.0.Beta + 7.4.0.GA ../pom.xml helloworld-singleton @@ -47,7 +47,7 @@ jakarta.enterprise.cdi-api provided - org.jboss.spec.javax.ejb diff --git a/helloworld-ssl/README.html b/helloworld-ssl/README.html index 3244256686..aa299c494f 100644 --- a/helloworld-ssl/README.html +++ b/helloworld-ssl/README.html @@ -906,7 +906,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/helloworld-ssl/pom.xml b/helloworld-ssl/pom.xml index 850c8809da..b6073510d1 100644 --- a/helloworld-ssl/pom.xml +++ b/helloworld-ssl/pom.xml @@ -1,4 +1,4 @@ - + - 7.4.0.Beta + 7.4.0.GA ../pom.xml helloworld-ssl diff --git a/helloworld-ws/README.html b/helloworld-ws/README.html index bd4cf46c21..53eb8755c1 100644 --- a/helloworld-ws/README.html +++ b/helloworld-ws/README.html @@ -707,7 +707,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml index 00884817ae..5608d6a1f7 100644 --- a/helloworld-ws/pom.xml +++ b/helloworld-ws/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml helloworld-ws diff --git a/helloworld/README.html b/helloworld/README.html index 7c7b2a3e8e..aeb5cd3582 100644 --- a/helloworld/README.html +++ b/helloworld/README.html @@ -716,7 +716,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -725,10 +725,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -737,7 +737,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -746,10 +746,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -759,17 +759,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -812,12 +812,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the helloworld source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the helloworld source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="helloworld-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -852,9 +852,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="helloworld-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -935,11 +935,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -997,7 +997,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1038,7 +1038,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1049,7 +1049,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/helloworld/pom.xml b/helloworld/pom.xml index 65b0901a34..9461468e19 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -1,4 +1,4 @@ - + - 7.4.0.Beta + 7.4.0.GA ../pom.xml helloworld diff --git a/hibernate/README.html b/hibernate/README.html index 0fc505c09c..8964f21988 100644 --- a/hibernate/README.html +++ b/hibernate/README.html @@ -800,7 +800,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -809,10 +809,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -821,7 +821,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -830,10 +830,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -843,17 +843,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -896,12 +896,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the hibernate source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the hibernate source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="hibernate-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -940,9 +940,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="hibernate-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1027,11 +1027,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1089,7 +1089,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1130,7 +1130,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1141,7 +1141,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/hibernate/pom.xml b/hibernate/pom.xml index 7310c9572c..871540af46 100644 --- a/hibernate/pom.xml +++ b/hibernate/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml hibernate diff --git a/inter-app/README.html b/inter-app/README.html index 5f495c2eee..cc3ef2ae10 100644 --- a/inter-app/README.html +++ b/inter-app/README.html @@ -735,7 +735,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/inter-app/appA/pom.xml b/inter-app/appA/pom.xml index 95115e4688..1a562bc4b6 100644 --- a/inter-app/appA/pom.xml +++ b/inter-app/appA/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts inter-app - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/inter-app/appB/pom.xml b/inter-app/appB/pom.xml index 4de918507c..6c89646694 100644 --- a/inter-app/appB/pom.xml +++ b/inter-app/appB/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts inter-app - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/inter-app/pom.xml b/inter-app/pom.xml index 6d1e927b28..66e51b432a 100644 --- a/inter-app/pom.xml +++ b/inter-app/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml inter-app @@ -55,7 +55,7 @@ ${project.groupId} inter-app-shared - 7.4.0.Beta + 7.4.0.GA ejb diff --git a/inter-app/shared/pom.xml b/inter-app/shared/pom.xml index 0013f04375..c20e24d0ac 100644 --- a/inter-app/shared/pom.xml +++ b/inter-app/shared/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts inter-app - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/jaxrs-client/README.html b/jaxrs-client/README.html index df4ae70fef..3226635d02 100644 --- a/jaxrs-client/README.html +++ b/jaxrs-client/README.html @@ -852,7 +852,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -861,10 +861,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -873,7 +873,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -882,10 +882,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -895,17 +895,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -948,12 +948,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the jaxrs-client source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the jaxrs-client source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="jaxrs-client-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -988,9 +988,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="jaxrs-client-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1071,11 +1071,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1133,7 +1133,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1174,7 +1174,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1185,7 +1185,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 70e84420de..6a11f29722 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml jaxrs-client diff --git a/jaxws-addressing/README.html b/jaxws-addressing/README.html index e6d2bc8b0f..0509d702e7 100644 --- a/jaxws-addressing/README.html +++ b/jaxws-addressing/README.html @@ -725,7 +725,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/jaxws-addressing/client/pom.xml b/jaxws-addressing/client/pom.xml index 288f4ac205..0bb42b2599 100644 --- a/jaxws-addressing/client/pom.xml +++ b/jaxws-addressing/client/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts jaxws-addressing - 7.4.0.Beta + 7.4.0.GA ../pom.xml jaxws-addressing-client diff --git a/jaxws-addressing/pom.xml b/jaxws-addressing/pom.xml index 0081d8d251..1ab4c5e00b 100644 --- a/jaxws-addressing/pom.xml +++ b/jaxws-addressing/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml jaxws-addressing @@ -50,7 +50,7 @@ ${project.groupId} jaxws-addressing-service classes - 7.4.0.Beta + 7.4.0.GA     diff --git a/jaxws-addressing/service/pom.xml b/jaxws-addressing/service/pom.xml index bb9f3d688e..cb6e449ab7 100644 --- a/jaxws-addressing/service/pom.xml +++ b/jaxws-addressing/service/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts jaxws-addressing - 7.4.0.Beta + 7.4.0.GA ../pom.xml jaxws-addressing-service diff --git a/jaxws-ejb/README.html b/jaxws-ejb/README.html index 7102cf103c..d1970b03c3 100644 --- a/jaxws-ejb/README.html +++ b/jaxws-ejb/README.html @@ -722,7 +722,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/jaxws-ejb/client/pom.xml b/jaxws-ejb/client/pom.xml index c77592ec0d..e20826e355 100644 --- a/jaxws-ejb/client/pom.xml +++ b/jaxws-ejb/client/pom.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.jboss.eap.quickstarts jaxws-ejb - 7.4.0.Beta + 7.4.0.GA jaxws-ejb-client jar diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml index d4248007dc..1eb69fa781 100644 --- a/jaxws-ejb/pom.xml +++ b/jaxws-ejb/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml jaxws-ejb diff --git a/jaxws-ejb/service/pom.xml b/jaxws-ejb/service/pom.xml index 7bcc4e976b..13bf71997e 100644 --- a/jaxws-ejb/service/pom.xml +++ b/jaxws-ejb/service/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts jaxws-ejb - 7.4.0.Beta + 7.4.0.GA jaxws-ejb-service war diff --git a/jaxws-pojo/README.html b/jaxws-pojo/README.html index e480f1b7d1..8a6ea7912b 100644 --- a/jaxws-pojo/README.html +++ b/jaxws-pojo/README.html @@ -700,7 +700,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/jaxws-pojo/client/pom.xml b/jaxws-pojo/client/pom.xml index cf6f63a504..dbf520b3f4 100644 --- a/jaxws-pojo/client/pom.xml +++ b/jaxws-pojo/client/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts jaxws-pojo - 7.4.0.Beta + 7.4.0.GA jaxws-pojo-client jar diff --git a/jaxws-pojo/pom.xml b/jaxws-pojo/pom.xml index 4075fcd1e0..577f239c09 100644 --- a/jaxws-pojo/pom.xml +++ b/jaxws-pojo/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml jaxws-pojo diff --git a/jaxws-pojo/service/pom.xml b/jaxws-pojo/service/pom.xml index bc9c25c11a..5ef49768a2 100644 --- a/jaxws-pojo/service/pom.xml +++ b/jaxws-pojo/service/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts jaxws-pojo - 7.4.0.Beta + 7.4.0.GA jaxws-pojo-service war diff --git a/jaxws-retail/README.html b/jaxws-retail/README.html index 9e05d67812..966394ae9e 100644 --- a/jaxws-retail/README.html +++ b/jaxws-retail/README.html @@ -778,7 +778,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/jaxws-retail/client/pom.xml b/jaxws-retail/client/pom.xml index 008199cfa7..b937534250 100644 --- a/jaxws-retail/client/pom.xml +++ b/jaxws-retail/client/pom.xml @@ -15,13 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.jboss.eap.quickstarts jaxws-retail - 7.4.0.Beta + 7.4.0.GA jaxws-retail-client jar diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml index a12bf5da9b..dae4cc0751 100644 --- a/jaxws-retail/pom.xml +++ b/jaxws-retail/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml jaxws-retail diff --git a/jaxws-retail/service/pom.xml b/jaxws-retail/service/pom.xml index e24dfab621..7cad0e83ea 100644 --- a/jaxws-retail/service/pom.xml +++ b/jaxws-retail/service/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts jaxws-retail - 7.4.0.Beta + 7.4.0.GA ../pom.xml jaxws-retail-service @@ -92,7 +92,7 @@ false true false - + -Djavax.xml.accessExternalSchema=all -Dlog4j.configuration=file:${basedir}/src/main/resources/log4j.properties diff --git a/jsonp/README.html b/jsonp/README.html index a126771553..674cab0457 100644 --- a/jsonp/README.html +++ b/jsonp/README.html @@ -735,7 +735,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -744,10 +744,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -756,7 +756,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -765,10 +765,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -778,17 +778,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -831,12 +831,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the jsonp source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the jsonp source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="jsonp-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -871,9 +871,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="jsonp-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -954,11 +954,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1016,7 +1016,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1057,7 +1057,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1068,7 +1068,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/jsonp/pom.xml b/jsonp/pom.xml index cecd136aed..596d5e5aff 100644 --- a/jsonp/pom.xml +++ b/jsonp/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml jsonp diff --git a/jta-crash-rec/README.html b/jta-crash-rec/README.html index 4761aadfe5..cffe3b588b 100644 --- a/jta-crash-rec/README.html +++ b/jta-crash-rec/README.html @@ -899,7 +899,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/jta-crash-rec/pom.xml b/jta-crash-rec/pom.xml index c8b231f620..d5faaa607d 100644 --- a/jta-crash-rec/pom.xml +++ b/jta-crash-rec/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml jta-crash-rec diff --git a/jts-distributed-crash-rec/README.html b/jts-distributed-crash-rec/README.html index 92177b72b0..271054df76 100644 --- a/jts-distributed-crash-rec/README.html +++ b/jts-distributed-crash-rec/README.html @@ -875,7 +875,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/jts/README.html b/jts/README.html index 2b9646cb50..6a779c5ddb 100644 --- a/jts/README.html +++ b/jts/README.html @@ -1086,7 +1086,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/jts/application-component-1/pom.xml b/jts/application-component-1/pom.xml index 0932492abb..d7dc7d69f7 100644 --- a/jts/application-component-1/pom.xml +++ b/jts/application-component-1/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts jts - 7.4.0.Beta + 7.4.0.GA jts-application-component-1 war diff --git a/jts/application-component-2/pom.xml b/jts/application-component-2/pom.xml index c09697a780..6564526db2 100644 --- a/jts/application-component-2/pom.xml +++ b/jts/application-component-2/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts jts - 7.4.0.Beta + 7.4.0.GA jts-application-component-2 Quickstart: jts - application-component-2 diff --git a/jts/pom.xml b/jts/pom.xml index 314c0dd5e8..7d0ffd8367 100644 --- a/jts/pom.xml +++ b/jts/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml @@ -54,7 +54,7 @@ ${project.groupId} jts-application-component-2 - 7.4.0.Beta + 7.4.0.GA client diff --git a/kitchensink-angularjs/README.html b/kitchensink-angularjs/README.html index 20bba9edd9..69d19fc5fd 100644 --- a/kitchensink-angularjs/README.html +++ b/kitchensink-angularjs/README.html @@ -874,7 +874,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -883,10 +883,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -895,7 +895,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -904,10 +904,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -917,17 +917,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -970,12 +970,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the kitchensink-angularjs source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the kitchensink-angularjs source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="kitchensink-angularjs-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1010,9 +1010,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="kitchensink-angularjs-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1093,11 +1093,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1155,7 +1155,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1196,7 +1196,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1207,7 +1207,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/kitchensink-angularjs/functional-tests/pom.xml b/kitchensink-angularjs/functional-tests/pom.xml index 5a9a215c6c..06a394807b 100644 --- a/kitchensink-angularjs/functional-tests/pom.xml +++ b/kitchensink-angularjs/functional-tests/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../../pom.xml kitchensink-angularjs-test-webdriver diff --git a/kitchensink-angularjs/functional-tests/src/test/resources/arquillian.xml b/kitchensink-angularjs/functional-tests/src/test/resources/arquillian.xml index 291b23f5d2..1c7778d830 100644 --- a/kitchensink-angularjs/functional-tests/src/test/resources/arquillian.xml +++ b/kitchensink-angularjs/functional-tests/src/test/resources/arquillian.xml @@ -32,13 +32,8 @@ - - firefox - - + + phantomjs diff --git a/kitchensink-angularjs/pom.xml b/kitchensink-angularjs/pom.xml index 6aa0f9e28e..6bcd258b35 100644 --- a/kitchensink-angularjs/pom.xml +++ b/kitchensink-angularjs/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml kitchensink-angularjs diff --git a/kitchensink-ear/README.html b/kitchensink-ear/README.html index 93f229f7cd..c65f867337 100644 --- a/kitchensink-ear/README.html +++ b/kitchensink-ear/README.html @@ -775,7 +775,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/kitchensink-ear/ear/pom.xml b/kitchensink-ear/ear/pom.xml index 7561f30e41..36f44f9b80 100644 --- a/kitchensink-ear/ear/pom.xml +++ b/kitchensink-ear/ear/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts kitchensink-ear - 7.4.0.Beta + 7.4.0.GA kitchensink-ear-ear ear @@ -64,7 +64,18 @@ are in easy way to package any libraries needed in the ear, and automatically have any modules (EJB-JARs and WARs) use them --> lib - + + + + @{artifactId}@@{dashClassifier?}@.@{extension}@ diff --git a/kitchensink-ear/ejb/pom.xml b/kitchensink-ear/ejb/pom.xml index bd21d8b686..58bca90aa7 100644 --- a/kitchensink-ear/ejb/pom.xml +++ b/kitchensink-ear/ejb/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts kitchensink-ear - 7.4.0.Beta + 7.4.0.GA kitchensink-ear-ejb ejb diff --git a/kitchensink-ear/pom.xml b/kitchensink-ear/pom.xml index daa4f381a1..5c5245ceb1 100644 --- a/kitchensink-ear/pom.xml +++ b/kitchensink-ear/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml kitchensink-ear @@ -54,7 +54,7 @@ ${project.groupId} kitchensink-ear-ejb - 7.4.0.Beta + 7.4.0.GA ejb @@ -63,7 +63,7 @@ ${project.groupId} kitchensink-ear-web - 7.4.0.Beta + 7.4.0.GA war compile diff --git a/kitchensink-ear/web/pom.xml b/kitchensink-ear/web/pom.xml index 1e1fbe70f8..4ee453caed 100644 --- a/kitchensink-ear/web/pom.xml +++ b/kitchensink-ear/web/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts kitchensink-ear - 7.4.0.Beta + 7.4.0.GA kitchensink-ear-web war diff --git a/kitchensink-jsp/README.html b/kitchensink-jsp/README.html index a81bca23fb..af99cbd59e 100644 --- a/kitchensink-jsp/README.html +++ b/kitchensink-jsp/README.html @@ -818,7 +818,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -827,10 +827,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -839,7 +839,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -848,10 +848,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -861,17 +861,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -914,12 +914,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the kitchensink-jsp source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the kitchensink-jsp source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="kitchensink-jsp-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -958,9 +958,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="kitchensink-jsp-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1045,11 +1045,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1107,7 +1107,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1148,7 +1148,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1159,7 +1159,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/kitchensink-jsp/crw-java11-maven-eap.yaml b/kitchensink-jsp/crw-java11-maven-eap.yaml new file mode 100644 index 0000000000..cf8c85ae9b --- /dev/null +++ b/kitchensink-jsp/crw-java11-maven-eap.yaml @@ -0,0 +1,97 @@ +--- +apiVersion: 1.0.0 +metadata: + generateName: java-eap-maven- +projects: + - + name: kitchensink-example + source: + type: git + branch: 7.4.x + sparseCheckoutDir: kitchensink-jsp + location: "https://github.com/jboss-developer/jboss-eap-quickstarts.git" +components: + - + type: chePlugin + id: redhat/java11/latest + - + # NOTE: instead of the old stack-analysis script, should be able to use the latest dependency-analysis plugin instead + type: chePlugin + id: redhat/dependency-analytics/latest + - + type: dockerimage + alias: maven + image: registry.redhat.io/jboss-eap-7/eap74-openjdk11-openshift-rhel8 + env: + - name: MAVEN_OPTS + value: "-Xmx200m -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xms20m -Djava.security.egd=file:/dev/./urandom -Duser.home=/home/jboss" + - name: JAVA_OPTS_APPEND + value: "-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -Dsun.util.logging.disableCallerCheck=true" + - value: '-Dmaven.repo.local=/home/jboss/.m2/repository/repository -Dcom.redhat.xpaas.repo.jbossorg' + name: MVN_ARGS_APPEND + memoryLimit: 1024Mi + endpoints: + - name: 'eap' + port: 8080 + attributes: + path: /index.jsp + - name: 'jgroups' + port: 7600 + attributes: + public: 'false' + mountSources: true + volumes: + - name: m2 + containerPath: /home/jboss/.m2/repository +commands: + - + name: 1. Build + actions: + - workdir: '${CHE_PROJECTS_ROOT}/kitchensink-example/kitchensink-jsp' + type: exec + command: mvn ${MVN_ARGS_APPEND} clean install + component: maven + - name: 2. Configure web server + actions: + - workdir: /opt/eap/bin + type: exec + command: >- + ./jboss-cli.sh --connect --command="data-source add --name=ExampleDS + --jndi-name=java:jboss/datasources/ExampleDS --driver-name=h2 + --connection-url=jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE + --user-name=sa --password=sa" && echo 'Server was configured' + component: maven + - + name: 3. Copy war + actions: + - + type: exec + component: maven + command: cp target/*.war /opt/eap/standalone/deployments/ROOT.war && + echo 'Archive was deployed, click on eap endpoint from Workspace view to open the application' + workdir: ${CHE_PROJECTS_ROOT}/kitchensink-example/kitchensink-jsp + - + name: 4. Hot update + actions: + - + type: exec + component: maven + command: "mvn ${MVN_ARGS_APPEND} clean install && sleep 2 && cp target/*.war /opt/eap/standalone/deployments/ROOT.war" + workdir: ${CHE_PROJECTS_ROOT}/kitchensink-example/kitchensink-jsp + - + name: Debug (Attach) + actions: + - type: vscode-launch + referenceContent: | + { + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "request": "attach", + "name": "Debug (Attach)", + "hostName": "localhost", + "port": 8000 + } + ] + } diff --git a/kitchensink-jsp/crw-java8-maven-eap.yaml b/kitchensink-jsp/crw-java8-maven-eap.yaml new file mode 100644 index 0000000000..0529245b1f --- /dev/null +++ b/kitchensink-jsp/crw-java8-maven-eap.yaml @@ -0,0 +1,99 @@ +--- +apiVersion: 1.0.0 +metadata: + generateName: java-eap-maven- +# Workaround for CRW-1789 +attributes: + extensions.ignoreRecommendations: 'true' +projects: + - name: kitchensink-example + source: + location: 'https://github.com/jboss-developer/jboss-eap-quickstarts.git' + type: git + branch: 7.4.x + sparseCheckoutDir: kitchensink-jsp +components: + - + type: chePlugin + id: redhat/java8/latest + - + # NOTE: instead of the old stack-analysis script, should be able to use the latest dependency-analysis plugin instead + type: chePlugin + id: redhat/dependency-analytics/latest + - + type: dockerimage + alias: maven + image: registry.redhat.io/jboss-eap-7/eap74-openjdk8-openshift-rhel7 + env: + - name: MAVEN_OPTS + value: "-Xmx200m -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xms20m -Djava.security.egd=file:/dev/./urandom -Duser.home=/home/jboss" + - name: JAVA_OPTS_APPEND + value: "-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -Dsun.util.logging.disableCallerCheck=true" + - value: '-Dmaven.repo.local=/home/jboss/.m2/repository -Dcom.redhat.xpaas.repo.jbossorg' + name: MVN_ARGS_APPEND + memoryLimit: 1024Mi + endpoints: + - name: 'eap' + port: 8080 + attributes: + path: /index.jsp + - name: 'jgroups' + port: 7600 + attributes: + public: 'false' + mountSources: true + volumes: + - name: m2 + containerPath: /home/jboss/.m2/repository +commands: + - + name: 1. Build + actions: + - workdir: '${CHE_PROJECTS_ROOT}/kitchensink-example/kitchensink-jsp' + type: exec + command: "source ${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/scl-enable-maven && mvn ${MVN_ARGS_APPEND} clean install" + component: maven + - name: 2. Configure web server + actions: + - workdir: /opt/eap/bin + type: exec + command: >- + ./jboss-cli.sh --connect --command="data-source add --name=ExampleDS + --jndi-name=java:jboss/datasources/ExampleDS --driver-name=h2 + --connection-url=jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE + --user-name=sa --password=sa" && echo 'Server was configured' + component: maven + - + name: 3. Copy war + actions: + - + type: exec + component: maven + command: cp target/*.war /opt/eap/standalone/deployments/ROOT.war && + echo 'Archive was deployed, click on eap endpoint from Workspace view to open the application' + workdir: ${CHE_PROJECTS_ROOT}/kitchensink-example/kitchensink-jsp + - + name: 4. Hot update + actions: + - + type: exec + component: maven + command: "source ${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/scl-enable-maven && mvn ${MVN_ARGS_APPEND} clean install && sleep 2 && cp target/*.war /opt/eap/standalone/deployments/ROOT.war" + workdir: ${CHE_PROJECTS_ROOT}/kitchensink-example/kitchensink-jsp + - + name: Debug (Attach) + actions: + - type: vscode-launch + referenceContent: | + { + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "request": "attach", + "name": "Debug (Attach)", + "hostName": "localhost", + "port": 8000 + } + ] + } diff --git a/kitchensink-jsp/pom.xml b/kitchensink-jsp/pom.xml index 948dfaa380..5830b70960 100644 --- a/kitchensink-jsp/pom.xml +++ b/kitchensink-jsp/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml kitchensink-jsp @@ -40,6 +40,61 @@ + + + + true + never + + + true + never + + jboss-public-repository-group + JBoss Public Repository Group + https://repository.jboss.org/nexus/content/groups/public/ + default + + + + true + never + + + true + never + + jboss-enterprise-maven-repository + JBoss Enterprise Maven Repository + https://maven.repository.redhat.com/ga/ + default + + + + + + true + + + true + + jboss-public-repository-group + JBoss Public Repository Group + https://repository.jboss.org/nexus/content/groups/public/ + + + + true + + + true + + jboss-enterprise-maven-repository + JBoss Enterprise Maven Repository + https://maven.repository.redhat.com/ga/ + + + - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/kitchensink/README.html b/kitchensink/README.html index ad313e027d..a1cdadb522 100644 --- a/kitchensink/README.html +++ b/kitchensink/README.html @@ -806,7 +806,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -815,10 +815,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -827,7 +827,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -836,10 +836,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -849,17 +849,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -902,12 +902,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the kitchensink source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the kitchensink source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="kitchensink-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -946,9 +946,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="kitchensink-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1033,11 +1033,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1095,7 +1095,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1136,7 +1136,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1147,7 +1147,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml index 963a40c86b..547656a540 100644 --- a/kitchensink/pom.xml +++ b/kitchensink/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml kitchensink diff --git a/logging-tools/README.html b/logging-tools/README.html index d062c11da6..57d70ad177 100644 --- a/logging-tools/README.html +++ b/logging-tools/README.html @@ -871,7 +871,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -880,10 +880,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -892,7 +892,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -901,10 +901,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -914,17 +914,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -967,12 +967,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the logging-tools source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the logging-tools source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="logging-tools-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1007,9 +1007,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="logging-tools-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1090,11 +1090,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1152,7 +1152,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1193,7 +1193,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1204,7 +1204,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/logging-tools/pom.xml b/logging-tools/pom.xml index 9e4dbf8f67..82d6f0a129 100644 --- a/logging-tools/pom.xml +++ b/logging-tools/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/logging/README.html b/logging/README.html index c8075ba58a..3a9ac52a2e 100644 --- a/logging/README.html +++ b/logging/README.html @@ -990,7 +990,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/logging/pom.xml b/logging/pom.xml index 5c3455b176..3cbef70f16 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml jboss-logging diff --git a/mail/README.html b/mail/README.html index cdaf3f0909..d0e3131a4f 100644 --- a/mail/README.html +++ b/mail/README.html @@ -862,7 +862,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/mail/pom.xml b/mail/pom.xml index 913808cbe9..99e8b12e02 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/managed-executor-service/README.html b/managed-executor-service/README.html index a7252a82c5..cf20085bc0 100644 --- a/managed-executor-service/README.html +++ b/managed-executor-service/README.html @@ -837,7 +837,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -846,10 +846,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -858,7 +858,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -867,10 +867,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -880,17 +880,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -933,12 +933,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the managed-executor-service source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the managed-executor-service source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="managed-executor-service-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -977,9 +977,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="managed-executor-service-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1064,11 +1064,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1126,7 +1126,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1167,7 +1167,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1178,7 +1178,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/managed-executor-service/pom.xml b/managed-executor-service/pom.xml index 4d13f52f85..16f0bf1a4f 100644 --- a/managed-executor-service/pom.xml +++ b/managed-executor-service/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/messaging-clustering-singleton/README.html b/messaging-clustering-singleton/README.html index 3a4dcbdbb9..b118b5c993 100644 --- a/messaging-clustering-singleton/README.html +++ b/messaging-clustering-singleton/README.html @@ -1422,7 +1422,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/messaging-clustering-singleton/pom.xml b/messaging-clustering-singleton/pom.xml index 1d07085334..9190297b3b 100644 --- a/messaging-clustering-singleton/pom.xml +++ b/messaging-clustering-singleton/pom.xml @@ -1,29 +1,29 @@ - 4.0.0 org.jboss.eap.quickstarts quickstart-parent - - 7.4.0.Beta + 7.4.0.GA ../pom.xml @@ -56,7 +56,7 @@ jboss-jms-api_2.0_spec provided - org.jboss.spec.javax.servlet diff --git a/messaging-clustering/README.html b/messaging-clustering/README.html index de37ccaebe..a9b72e80c7 100644 --- a/messaging-clustering/README.html +++ b/messaging-clustering/README.html @@ -1210,7 +1210,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/numberguess/README.html b/numberguess/README.html index 4cdeec65ad..547150ad29 100644 --- a/numberguess/README.html +++ b/numberguess/README.html @@ -716,7 +716,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -725,10 +725,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -737,7 +737,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -746,10 +746,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -759,17 +759,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -812,12 +812,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the numberguess source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the numberguess source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="numberguess-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -852,9 +852,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="numberguess-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -935,11 +935,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -997,7 +997,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1038,7 +1038,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1049,7 +1049,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/numberguess/pom.xml b/numberguess/pom.xml index 7f12de6643..9403bd4064 100644 --- a/numberguess/pom.xml +++ b/numberguess/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml numberguess diff --git a/payment-cdi-event/README.html b/payment-cdi-event/README.html index 7e18963f5f..131d32bbcd 100644 --- a/payment-cdi-event/README.html +++ b/payment-cdi-event/README.html @@ -801,7 +801,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -810,10 +810,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -822,7 +822,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -831,10 +831,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -844,17 +844,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -897,12 +897,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the payment-cdi-event source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the payment-cdi-event source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="payment-cdi-event-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -937,9 +937,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="payment-cdi-event-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1020,11 +1020,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1082,7 +1082,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1123,7 +1123,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1134,7 +1134,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/payment-cdi-event/pom.xml b/payment-cdi-event/pom.xml index b6925a9743..803452a53a 100644 --- a/payment-cdi-event/pom.xml +++ b/payment-cdi-event/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml payment-cdi-event diff --git a/pom.xml b/pom.xml index 3c936d7ea7..d15ae68ae1 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA pom @@ -50,7 +50,7 @@ ${project.basedir} EAP7_HOME JBoss EAP - 7.4.0.Beta + 7.4.0.GA 2.1.0 2.0.2.Final @@ -74,19 +74,16 @@ ${maven.repository.protocol}://repository.jboss.org/nexus/content/groups/public/ ${maven.repository.protocol}://maven.repository.redhat.com/ga/ - ${maven.repository.protocol}://maven.repository.redhat.com/earlyaccess/all/ - 7.4.0.Beta + 7.4.0.GA 1.2.0.Beta1 - 2.0.0 20150729 1.7.9 - 4.3.14.RELEASE http://rhdp-drupal.stage.redhat.com/ false @@ -134,20 +131,6 @@ ${maven.redhat.repository.url} default - - - true - never - - - true - never - - jboss-enterprise-ea-maven-repository - JBoss Enterprise Early Access Maven Repository - ${maven.redhat.ea.repository.url} - default - @@ -173,17 +156,6 @@ JBoss Enterprise Maven Repository ${maven.redhat.repository.url} - - - true - - - true - - jboss-enterprise-ea-maven-repository - JBoss Enterprise Early Access Maven Repository - ${maven.redhat.ea.repository.url} - @@ -227,56 +199,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - - org.commonjava.maven.plugins - project-sources-maven-plugin - 0.3 - - - project-sources-archive - initialize - - archive - - - - - - com.redhat.rcm.maven.plugin - buildmetadata-maven-plugin - 1.7.0 - - - build-metadata - validate - - provide-buildmetadata - - - - ${session.executionRootDirectory} - - true - false - false - false - true - false - false - false - false - true - false - false - true - false - false - build.metadata - false - - - - @@ -344,41 +266,61 @@ - com.redhat.rcm.maven.plugin - buildmetadata-maven-plugin - [1.7.0,) + + com.redhat.rcm.maven.plugin + + + buildmetadata-maven-plugin + + + [1.7.0,) + - provide-buildmetadata + + provide-buildmetadata + - + - org.commonjava.maven.plugins - project-sources-maven-plugin - [0.3,) + + org.commonjava.maven.plugins + + + project-sources-maven-plugin + + + [0.3,) + archive - + - org.jboss.ws.plugins - jaxws-tools-maven-plugin - [1.2.0.Final,) + + org.jboss.ws.plugins + + + jaxws-tools-maven-plugin + + + [1.2.0.Final,) + wsconsume - + @@ -421,6 +363,7 @@ ejb-security-programmatic-auth ejb-throws-exception ejb-timer + ejb-txn-remote-call greeter ha-singleton-deployment ha-singleton-service @@ -468,6 +411,7 @@ tasks-jsf tasks-rs temperature-converter + todo-backend thread-racing websocket-client websocket-endpoint @@ -779,6 +723,5 @@ - diff --git a/resteasy-jaxrs-client/README.html b/resteasy-jaxrs-client/README.html index 7258020335..550d9a65cb 100644 --- a/resteasy-jaxrs-client/README.html +++ b/resteasy-jaxrs-client/README.html @@ -642,7 +642,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/resteasy-jaxrs-client/pom.xml b/resteasy-jaxrs-client/pom.xml index 5befbf2779..b82cf14010 100644 --- a/resteasy-jaxrs-client/pom.xml +++ b/resteasy-jaxrs-client/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/servlet-async/README.html b/servlet-async/README.html index 4bcb770b88..aaecd71623 100644 --- a/servlet-async/README.html +++ b/servlet-async/README.html @@ -722,7 +722,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -731,10 +731,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -743,7 +743,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -752,10 +752,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -765,17 +765,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -818,12 +818,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the servlet-async source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the servlet-async source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="servlet-async-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -858,9 +858,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="servlet-async-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -941,11 +941,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1003,7 +1003,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1044,7 +1044,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1055,7 +1055,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/servlet-async/pom.xml b/servlet-async/pom.xml index dec13716b0..2c10db9dc2 100644 --- a/servlet-async/pom.xml +++ b/servlet-async/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/servlet-filterlistener/README.html b/servlet-filterlistener/README.html index 4d7397e3f7..e7fa44606f 100644 --- a/servlet-filterlistener/README.html +++ b/servlet-filterlistener/README.html @@ -789,7 +789,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -798,10 +798,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -810,7 +810,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -819,10 +819,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -832,17 +832,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -885,12 +885,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the servlet-filterlistener source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the servlet-filterlistener source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="servlet-filterlistener-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -925,9 +925,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="servlet-filterlistener-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1008,11 +1008,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1070,7 +1070,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1111,7 +1111,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1122,7 +1122,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/servlet-filterlistener/pom.xml b/servlet-filterlistener/pom.xml index 5f0d99de34..221f4306f1 100644 --- a/servlet-filterlistener/pom.xml +++ b/servlet-filterlistener/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/servlet-security/README.html b/servlet-security/README.html index ca6c616f86..b1d8932d60 100644 --- a/servlet-security/README.html +++ b/servlet-security/README.html @@ -993,7 +993,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml index 0b9406a281..036361e2a1 100644 --- a/servlet-security/pom.xml +++ b/servlet-security/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/shopping-cart/README.html b/shopping-cart/README.html index 4014d8d553..15eb4eb2ed 100644 --- a/shopping-cart/README.html +++ b/shopping-cart/README.html @@ -914,7 +914,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/shopping-cart/client/pom.xml b/shopping-cart/client/pom.xml index c47efce6d5..62b714d1ec 100644 --- a/shopping-cart/client/pom.xml +++ b/shopping-cart/client/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts shopping-cart - 7.4.0.Beta + 7.4.0.GA shopping-cart-client jar diff --git a/shopping-cart/pom.xml b/shopping-cart/pom.xml index ab56966b76..791f4af009 100644 --- a/shopping-cart/pom.xml +++ b/shopping-cart/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml @@ -56,7 +56,7 @@ ${project.groupId} shopping-cart-server - 7.4.0.Beta + 7.4.0.GA ejb diff --git a/shopping-cart/server/pom.xml b/shopping-cart/server/pom.xml index 50b863ef94..42253631a2 100644 --- a/shopping-cart/server/pom.xml +++ b/shopping-cart/server/pom.xml @@ -21,7 +21,7 @@ org.jboss.eap.quickstarts shopping-cart - 7.4.0.Beta + 7.4.0.GA shopping-cart-server ejb diff --git a/spring-greeter/README.html b/spring-greeter/README.html index 922c10d9e4..c018e2b6b5 100644 --- a/spring-greeter/README.html +++ b/spring-greeter/README.html @@ -867,7 +867,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -876,10 +876,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -888,7 +888,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -897,10 +897,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -910,17 +910,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -963,12 +963,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the spring-greeter source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the spring-greeter source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="spring-greeter-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1003,9 +1003,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="spring-greeter-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1086,11 +1086,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1148,7 +1148,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1189,7 +1189,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1200,7 +1200,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/spring-greeter/functional-tests/pom.xml b/spring-greeter/functional-tests/pom.xml index 3312796fe5..72098aad44 100644 --- a/spring-greeter/functional-tests/pom.xml +++ b/spring-greeter/functional-tests/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../../pom.xml diff --git a/spring-greeter/functional-tests/src/test/resources/arquillian.xml b/spring-greeter/functional-tests/src/test/resources/arquillian.xml index a7feaa86fe..ad57c4bdd9 100644 --- a/spring-greeter/functional-tests/src/test/resources/arquillian.xml +++ b/spring-greeter/functional-tests/src/test/resources/arquillian.xml @@ -32,13 +32,8 @@ - - firefox - - + + phantomjs diff --git a/spring-greeter/pom.xml b/spring-greeter/pom.xml index 1e6c6ce3cc..14ceeb0008 100644 --- a/spring-greeter/pom.xml +++ b/spring-greeter/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml @@ -41,6 +41,10 @@ + + 5.2.4.RELEASE + + - 7.4.0.Beta + 7.4.0.GA ../../pom.xml diff --git a/spring-kitchensink-basic/functional-tests/src/test/resources/arquillian.xml b/spring-kitchensink-basic/functional-tests/src/test/resources/arquillian.xml index 566978211a..eda7b569f1 100644 --- a/spring-kitchensink-basic/functional-tests/src/test/resources/arquillian.xml +++ b/spring-kitchensink-basic/functional-tests/src/test/resources/arquillian.xml @@ -32,13 +32,8 @@ - - firefox - - + + phantomjs diff --git a/spring-kitchensink-basic/pom.xml b/spring-kitchensink-basic/pom.xml index c398e0410d..2d9f059355 100644 --- a/spring-kitchensink-basic/pom.xml +++ b/spring-kitchensink-basic/pom.xml @@ -24,14 +24,14 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml spring-kitchensink-basic war Quickstart: spring-kitchensink-basic - Getting Started with Spring 4 on JBoss + Getting Started with Spring 5 on JBoss @@ -41,6 +41,10 @@ + + 5.2.4.RELEASE + + - 7.4.0.Beta + 7.4.0.GA ../../pom.xml diff --git a/spring-kitchensink-springmvctest/functional-tests/src/test/resources/arquillian.xml b/spring-kitchensink-springmvctest/functional-tests/src/test/resources/arquillian.xml index 566978211a..eda7b569f1 100644 --- a/spring-kitchensink-springmvctest/functional-tests/src/test/resources/arquillian.xml +++ b/spring-kitchensink-springmvctest/functional-tests/src/test/resources/arquillian.xml @@ -32,13 +32,8 @@ - - firefox - - + + phantomjs diff --git a/spring-kitchensink-springmvctest/pom.xml b/spring-kitchensink-springmvctest/pom.xml index 6caaa9018d..13ceb8996b 100644 --- a/spring-kitchensink-springmvctest/pom.xml +++ b/spring-kitchensink-springmvctest/pom.xml @@ -24,14 +24,14 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml spring-kitchensink-springmvctest war Quickstart: spring-kitchensink-springmvctest - Getting Started with Spring 4 on JBoss - MVC Tests + Getting Started with Spring 5 on JBoss - MVC Tests @@ -41,11 +41,13 @@ + + 5.2.4.RELEASE + 2.0.0 + + - - - com.jayway.jsonpath @@ -66,7 +68,6 @@ - com.fasterxml.jackson.core diff --git a/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/views/index.jsp b/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/views/index.jsp index d729128971..8ca5c13058 100644 --- a/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/views/index.jsp +++ b/spring-kitchensink-springmvctest/src/main/webapp/WEB-INF/views/index.jsp @@ -38,7 +38,7 @@ build.

    - +

    Member Registration

    Enforces annotation-based constraints defined on the model class.

    diff --git a/spring-resteasy/README.html b/spring-resteasy/README.html index 1b4363a03b..e25efc2c15 100644 --- a/spring-resteasy/README.html +++ b/spring-resteasy/README.html @@ -817,7 +817,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -826,10 +826,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -838,7 +838,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -847,10 +847,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -860,17 +860,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -913,12 +913,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the spring-resteasy source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the spring-resteasy source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="spring-resteasy-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -953,9 +953,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="spring-resteasy-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1036,11 +1036,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1098,7 +1098,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1139,7 +1139,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1150,7 +1150,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/spring-resteasy/pom.xml b/spring-resteasy/pom.xml index 848cf0cd5a..d7f549d4eb 100644 --- a/spring-resteasy/pom.xml +++ b/spring-resteasy/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml @@ -41,6 +41,10 @@ + + 5.2.4.RELEASE + + - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/tasks-rs/README.html b/tasks-rs/README.html index 1fc689e006..e50dcb2a69 100644 --- a/tasks-rs/README.html +++ b/tasks-rs/README.html @@ -518,7 +518,7 @@

    Use of the EAP_HOME and QUICKSTART_HOME Variable

    Add the Authorized Application User

    -

    This quickstart uses secured management interfaces and requires that you create the following application user to access the running application.

    +

    This quickstart uses secured application interfaces and requires that you create the following application user to access the running application.

    @@ -1043,7 +1043,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/tasks-rs/pom.xml b/tasks-rs/pom.xml index 662ff3864d..7bd5e3ae95 100644 --- a/tasks-rs/pom.xml +++ b/tasks-rs/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA../pom.xml diff --git a/temperature-converter/README.html b/temperature-converter/README.html index 254c06467b..43ac777246 100644 --- a/temperature-converter/README.html +++ b/temperature-converter/README.html @@ -754,7 +754,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -763,10 +763,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -775,7 +775,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -784,10 +784,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -797,17 +797,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -850,12 +850,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the temperature-converter source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the temperature-converter source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="temperature-converter-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -890,9 +890,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="temperature-converter-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -973,11 +973,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1035,7 +1035,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1076,7 +1076,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1087,7 +1087,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/temperature-converter/pom.xml b/temperature-converter/pom.xml index 5b4fd1f8aa..8a80ebb70e 100644 --- a/temperature-converter/pom.xml +++ b/temperature-converter/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/thread-racing/README.html b/thread-racing/README.html index 1ef865094a..1d487f3633 100644 --- a/thread-racing/README.html +++ b/thread-racing/README.html @@ -798,7 +798,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -807,10 +807,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -819,7 +819,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -828,10 +828,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -841,17 +841,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -894,12 +894,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the thread-racing source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the thread-racing source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="thread-racing-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -938,9 +938,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="thread-racing-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -1025,11 +1025,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1087,7 +1087,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1128,7 +1128,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1139,7 +1139,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/thread-racing/pom.xml b/thread-racing/pom.xml index 37682d60fe..d6498467e6 100644 --- a/thread-racing/pom.xml +++ b/thread-racing/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/todo-backend/README.html b/todo-backend/README.html new file mode 100644 index 0000000000..deafae9a01 --- /dev/null +++ b/todo-backend/README.html @@ -0,0 +1,845 @@ + + + + + + + + +todo-backend: quickstart for backend deployment on OpenShift + + + + + + +
    +
    +
    +
    +
    +The todo-backend quickstart demonstrates how to implement a backend that exposes a HTTP API with JAX-RS +to manage a list of ToDo which are persisted in a database with JPA. +
    +
    +
    +

    This quickstart shows how to deploy a JBoss EAP application on OpenShift that connects +to a PostgreSQL database also hosted on OpenShift.

    +
    +
    +
    +
    +

    What is it?

    +
    +
    +

    The todo-backend quickstart demonstrates how to implement a backend that exposes a HTTP API with JAX-RS +to manage a list of ToDo which are persisted in a database with JPA.

    +
    +
    +
      +
    • +

      The backend exposes a HTTP API to manage a list of todos that complies with the specs defined at todobackend.com.

      +
      • +
    • +

      It requires a connection to a PostgreSQL database to persist the todos.

      +
      • +
    • +

      It can be build with JBoss EAP S2I images for cloud deployment

      +
      • +
    • +

      It is deployed on OpenShift using the Helm Chart for JBoss EAP.

      +
      • +
    +
    +
    +
    +
    +

    System Requirements

    +
    +
    +

    The application this project produces is designed to be run on Red Hat JBoss Enterprise Application Platform 7.4 or later.

    +
    +
    +

    All you need to build this project is Java 8.0 (Java SDK 1.8) or later and Maven 3.3.1 or later. See Configure Maven to Build and Deploy the Quickstarts to make sure you are configured correctly for testing the quickstarts.

    +
    +
    +
    +
    +

    Architecture

    +
    +
    +

    Architecture with S2I

    +
    +

    This backend is built using JBoss EAP S2I Builder and Runtime images. When the image is built, it provisions the JBoss EAP application server and all the feature packs it needs for its features:

    +
    +
    +
    +
    build:
+  s2i:
+    galleonLayers:
+      - cloud-server
+      - postgresql-datasource
    +
    +
    +
    +

    The cloud-server layer provides everything needed to run the backend on OpenShift. This also includes access to +Jakarta EE APIs such as CDI, JAX-RS, JPA, etc. These two layers comes from the JBoss EAP feature pack provided in the +JBoss EAP S2I builder image.

    +
    +
    +
    +

    Connection to the PostgreSQL database

    +
    +

    As mentioned, the JDBC drivers and datasource configuration that the backend uses to connect to the PostgreSQL database +is provided by the org.jboss.eap:eap-datasources-galleon-pack feature pack.

    +
    +
    +

    By default, it exposes a single datasource. +In the backend, the name of this datasource is ToDos and is specified in the persistence.xml to configure JPA:

    +
    +
    +
    +
    <persistence-unit name="primary">
+  <jta-data-source>java:jboss/datasources/ToDos</jta-data-source>
+</persistence-unit>
    +
    +
    +
    +

    At runtime, we only need a few environment variables to establish the connection from JBoss EAP to the external PostgreSQL database:

    +
    +
    +
      +
    • +

      POSTGRESQL_DATABASE - the name of the database (that will be called todos)

      +
      • +
    • +

      POSTGRESQL_SERVICE_HOST - the host to connect to the database

      +
      • +
    • +

      POSTGRESQL_SERVICE_PORT - The port to connect to the database

      +
      • +
    • +

      POSTGRESQL_USER & POSTGRESQL_PASSWORD - the credentials to connect to the database

      +
      • +
    • +

      POSTGRESQL_DATASOURCE - The name of the datasources (as mentioned above, it will be ToDos)

      +
      • +
    +
    +
    +
    +

    Filters for Cross-Origin Resource Sharing (CORS)

    +
    +

    The Web frontend for this quickstart uses JavaScript calls to query the backend’s HTTP API. +We must enable Cross-Origin Resource Sharing (CORS) filters in the undertow subsystem of JBoss EAP to allow +these HTTP requests to succeed.

    +
    +
    +

    Configuration with JBoss EAP S2I

    +
    +

    As we use S2I to build the application, we need to provide environment variables that will be used to configure the CORS filters in Undertow.

    +
    +
    +

    Each filter requires three environment variables (its name, its header key and value) to define them. So to define an +HTTP header such as Access-Control-Allow-Methods: GET, POST, OPTION, PUT, DELETE, PATCH we need three environment variables:

    +
    +
    +
      +
    • +

      acam_FILTER_RESPONSE_HEADER_NAME=Access-Control-Allow-Methods

      +
      • +
    • +

      acam_FILTER_RESPONSE_HEADER_VALUE=GET, POST, OPTION, PUT, DELETE, PATCH

      +
      • +
    • +

      acam_FILTER_REF_NAME=Access-Control-Allow-Methods

      +
      • +
    +
    +
    +

    We need one more environment variable to specify all the filters we want to enabled. The value is the list +of prefixes we used for each individual filter (such as acam in the example above):

    +
    +
    +
      +
    • +

      FILTERS=acao, acam, acah, acac, acma

      +
      • +
    +
    +
    +
    +
    +
    +
    +

    Run the Backend on OpenShift

    +
    +
    +

    Prerequisites

    +
    +
      +
    • +

      You must be logged in OpenShift and have an oc client to connect to OpenShift

      +
      • +
    • +

      Helm must be installed to deploy the backend on OpenShift.

      +
      • +
    +
    +
    +

    Once you have installed Helm, you need to add the repository that provides Helm Charts for JBoss EAP:

    +
    +
    +
    +
    $ helm repo add jboss-eap https://jbossas.github.io/eap-charts/
+"jboss-eap" has been added to your repositories
+$ helm search repo jboss-eap
+NAME                    CHART VERSION   APP VERSION     DESCRIPTION
+jboss-eap/eap74         ...             ...             A Helm chart to build and deploy EAP 7.4 applications
    +
    +
    +
    +
    +

    Deploy a PostgreSQL Database on OpenShift

    +
    +
    +
    $ oc new-app postgresql-ephemeral \
+   -p DATABASE_SERVICE_NAME=todos-db \
+   -p POSTGRESQL_DATABASE=todos
    +
    +
    +
    +

    This will create a PostgreSQL database named todos on OpenShift that can be accessed on the port 5432 on the service todos-db. +We don’t need to copy the credentials to connect to the database as we will retrieve them later using the todos-db secret that was created +when the database is deployed.

    +
    +
    +
    +

    Build and Deploy the Backend on OpenShift with JBoss EAP S2I

    +
    +

    The backend will be built and deployed on OpenShift with a Helm Chart for JBoss EAP.

    +
    +
    +
    +
    $ helm install todo-backend --set build.ref=EAP_7.4.0.Final -f https://raw.githubusercontent.com/jbossas/eap-charts/main/examples/eap74/todo-backend/todo-backend-s2i.yaml jboss-eap/eap74
+NAME: todo-backend
+...
+STATUS: deployed
+REVISION: 1
    +
    +
    +
    +

    The Helm Chart for this quickstart contains all the information to build an image from the source code using S2I:

    +
    +
    +
    +
    build:
+  uri: https://github.com/jboss-developer/jboss-eap-quickstarts.git
+  mode: s2i
+  s2i:
+    galleonLayers:
+      - cloud-server
+      - postgresql-datasource
    +
    +
    +
    +

    Any configuration specified by this chart is described in its README that is displayed in OpenShift Dev console +or using the command:

    +
    +
    +
    +
    $ helm show readme jboss-eap/eap74
    +
    +
    +
    +
    +

    Environment variables for PostgreSQL

    +
    +

    The Helm Chart also contains the environment variables required to connect to the PostgreSQL database. +In local deployment the credentials were passed directly as the values of the environment variables. +For OpenShift, we rely on secrets so that the credentials are never copied outside OpenShift:

    +
    +
    +
    +
    deploy:
+  env:
+    - name: POSTGRESQL_PASSWORD
+      valueFrom:
+        secretKeyRef:
+          key: database-password
+          name: todos-db
    +
    +
    +
    +

    When the application is deployed, the value for the POSTGRESQL_PASSWORD will be taken from the key database-password +in the secret todos-db.

    +
    +
    +

    Let’s wait for the application to be built and deployed:

    +
    +
    +
    +
    $ oc get deployment/todo-backend -w
+NAME           READY   UP-TO-DATE   AVAILABLE   AGE
+todo-backend   0/3     3            0           31s
+...
+todo-backend   3/3     3            3           4m31s
    +
    +
    +
    +
    +

    Use the todobackend Web Frontend

    +
    +

    Once the backend is deployed on OpenShift, it can be accessed from the route todo-backend. +Let’s find the host that we can use to connect to this backend:

    +
    +
    +
    +
    $ oc get route todo-backend -o jsonpath="{.spec.host}"
+todo-backend-jmesnil1-dev.apps.sandbox.x8i5.p1.openshiftapps.com
    +
    +
    +
    +

    This value will be different for every installation of the backend.

    +
    +
    +

    + + + + +
    + + +
    +

    Make sure to prepend the host with https:// to be able to connect to the backend from the ToDo Backend Specs or Client. +The host must also be publicly accessible.

    +
    +
    +
    +
    +

    We can verify that this application is properly working as a ToDo Backend by running its specs on it.

    +
    +
    +

    Once all tests passed, we can use the todobackend client to have a Web application connected to the backend.

    +
    +
    + + + + + +
    + + +
    +

    todobackend.com is an external service used to showcase this quickstart. +It might not always be functional but does not impact the availability of this backend.

    +
    +
    +
    + +
    +

    Clean Up

    +
    +

    Remove the Backend

    +
    +

    The backend can be deleted from OpenShift by running the command:

    +
    +
    +
    +
    $ helm delete todo-backend
+release "todo-backend" uninstalled
    +
    +
    +
    +
    +

    Remove the Database

    +
    +

    The PostresSQL database can be deleted from OpenShift by running the commands:

    +
    +
    +
    +
    $ oc delete all -l template=postgresql-ephemeral-template
+replicationcontroller "todos-db-1" deleted
+service "todos-db" deleted
+deploymentconfig.apps.openshift.io "todos-db" deleted
+$ oc delete secret todos-db
+secret "todos-db" deleted
    +
    +
    +
    +
    + + +
    +

    Conclusion

    +
    +
    +

    This quickstart shows how the datasource feature pack provided by JBoss EAP simplifies the deployment +of a JBoss EAP Jakarta EE backend on OpenShift to connect to an external database and exposes an HTTP API.

    +
    +
    +
    + + + + \ No newline at end of file diff --git a/todo-backend/pom.xml b/todo-backend/pom.xml new file mode 100644 index 0000000000..cbac892c53 --- /dev/null +++ b/todo-backend/pom.xml @@ -0,0 +1,102 @@ + + + + 4.0.0 + + org.jboss.eap.quickstarts + quickstart-parent + + 7.4.0.GA + ../pom.xml + + + todo-backend + war + Quickstart: Todo backend + This project demonstrates how to implement a Todo-Backend application to manage ToDos + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + + + jakarta.enterprise + jakarta.enterprise.cdi-api + provided + + + jakarta.persistence + jakarta.persistence-api + provided + + + org.jboss.spec.javax.ejb + jboss-ejb-api_3.2_spec + provided + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + provided + + + org.jboss.resteasy + resteasy-jackson2-provider + provided + + + junit + junit + test + + + org.jboss.arquillian.junit + arquillian-junit-container + test + + + org.jboss.arquillian.protocol + arquillian-protocol-servlet + test + + + org.jboss.resteasy + resteasy-client + test + + + org.jboss.logging + commons-logging-jboss-logging + test + + + + + + ${project.artifactId} + + + diff --git a/todo-backend/src/main/java/org/wildfly/quickstarts/todos/Resources.java b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/Resources.java new file mode 100644 index 0000000000..19de930299 --- /dev/null +++ b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/Resources.java @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2020, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.wildfly.quickstarts.todos; + +import javax.ejb.Stateful; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.PersistenceContextType; + +@Stateful +@RequestScoped +public class Resources { + + @PersistenceContext(type = PersistenceContextType.EXTENDED) + private EntityManager em; + + @Produces + public EntityManager getEm() { + return em; + } +} \ No newline at end of file diff --git a/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDo.java b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDo.java new file mode 100644 index 0000000000..7b6a078c76 --- /dev/null +++ b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDo.java @@ -0,0 +1,143 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2020, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.wildfly.quickstarts.todos; + +import static java.util.Optional.ofNullable; +import static javax.persistence.GenerationType.IDENTITY; + +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.Objects; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.ws.rs.core.UriBuilder; + +@Entity +public class ToDo { + + @Id + @GeneratedValue(strategy = IDENTITY) + private Long id; + private String title; + private Boolean completed = false; + @Column(name = "\"order\"") + private int order; + private URL url; + + public ToDo() { + + } + + public ToDo(String title) { + this.title = title; + } + + public ToDo(Long id, String title, Boolean completed, int order, URL url) { + this.id = id; + this.title = title; + this.completed = completed; + this.order = order; + this.url = url; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public boolean isCompleted() { + return completed; + } + + public void setCompleted(Boolean completed) { + this.completed = completed; + } + + public Boolean getCompleted(){ + return this.completed == null ? false : this.completed; + } + + public int getOrder() { + return order; + } + + public void setOrder(int order) { + this.order = order; + } + + public URL getUrl() throws MalformedURLException, URISyntaxException { + if (this.id != null) { + return UriBuilder.fromUri(url.toURI()).scheme(url.getProtocol()).path(id.toString()).build().toURL(); + } + return this.url; + } + + public void setUrl(URL url) { + this.url = url; + } + + public void update(ToDo newTodo) { + this.title = ofNullable(newTodo.title).orElse(title); + this.completed = ofNullable(newTodo.completed).orElse(completed); + this.order = ofNullable(newTodo.order).orElse(order); + this.url = ofNullable(newTodo.url).orElse(url); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ToDo toDo = (ToDo) o; + return id == toDo.id; + } + + @Override + public int hashCode() { + return Objects.hash(id); + } + + @Override + public String toString() { + return "ToDo{" + + "id=" + id + + ", title='" + title + '\'' + + ", completed=" + completed + + ", order=" + order + + ", url=" + url + + '}'; + } +} diff --git a/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoBackendApplication.java b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoBackendApplication.java new file mode 100644 index 0000000000..4c8488cae7 --- /dev/null +++ b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoBackendApplication.java @@ -0,0 +1,29 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2020, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.wildfly.quickstarts.todos; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +@ApplicationPath("") +public class ToDoBackendApplication extends Application{ +} diff --git a/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoController.java b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoController.java new file mode 100644 index 0000000000..5d58acfc35 --- /dev/null +++ b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoController.java @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2020, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.wildfly.quickstarts.todos; + +import static javax.ws.rs.core.MediaType.APPLICATION_JSON; + +import java.net.MalformedURLException; +import java.util.List; +import java.util.Optional; + +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import javax.transaction.Transactional; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.NotFoundException; +import javax.ws.rs.PATCH; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriInfo; + +@Path("") +@RequestScoped +public class ToDoController { + + @Inject + private ToDoDAO todoDAO; + + @Context + private UriInfo uriInfo; + + @GET + @Produces(APPLICATION_JSON) + public List getAllTodos(){ + return todoDAO.findAll(); + } + + @GET + @Path("{id}") + @Produces(APPLICATION_JSON) + public ToDo getTodoFrom(@PathParam("id") long id) { + Optional todo = todoDAO.findById(id); + return todo.orElseThrow(() -> new NotFoundException("ToDo does not exist!")); + } + + @DELETE + @Transactional + public void deleteAllTodos(){ + todoDAO.findAll().forEach(todo -> todoDAO.remove(todo)); + } + + @DELETE + @Path("{id}") + @Transactional + public Response deleteTodoFrom(@PathParam("id") long id) { + Optional optional = todoDAO.findById(id); + ToDo todo = optional.orElseThrow(() -> new NotFoundException("ToDo does not exist!")); + todoDAO.remove(todo); + return Response.ok().build(); + } + + @POST + @Consumes(APPLICATION_JSON) + @Produces(APPLICATION_JSON) + @Transactional + public ToDo addTodo(ToDo todo) throws MalformedURLException { + todo.setUrl(uriInfo.getAbsolutePathBuilder().scheme("https").build().toURL()); + todoDAO.insert(todo); + return todo; + } + + @PATCH + @Path("{id}") + @Produces(APPLICATION_JSON) + @Consumes(APPLICATION_JSON) + @Transactional + public ToDo updateTodo(@PathParam("id") long id, ToDo update) { + return todoDAO.update(id, update).orElseThrow(() -> new NotFoundException("ToDo does not exist!")); + } +} \ No newline at end of file diff --git a/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoDAO.java b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoDAO.java new file mode 100644 index 0000000000..1eaff4ab29 --- /dev/null +++ b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoDAO.java @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2020, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.wildfly.quickstarts.todos; + +import java.util.List; +import java.util.Optional; + +import javax.ejb.Local; + +@Local +public interface ToDoDAO { + + List findAll(); + + Optional findById(Long id); + + void remove(ToDo todo); + + void insert(ToDo todo); + + Optional update(Long id, ToDo todo); +} \ No newline at end of file diff --git a/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoDAOImpl.java b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoDAOImpl.java new file mode 100644 index 0000000000..ce219365df --- /dev/null +++ b/todo-backend/src/main/java/org/wildfly/quickstarts/todos/ToDoDAOImpl.java @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2020, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.wildfly.quickstarts.todos; + + +import java.util.List; +import java.util.Optional; + +import javax.ejb.Stateful; +import javax.inject.Inject; +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.UriInfo; + +@Stateful +public class ToDoDAOImpl implements ToDoDAO { + + @Inject + private EntityManager em; + + @Context + UriInfo uriInfo; + + @Override + public List findAll() { + TypedQuery query = em.createQuery("FROM ToDo", ToDo.class); + return query.getResultList(); + } + + public Optional findById(Long id) { + ToDo toDo = em.find(ToDo.class, id); + return Optional.ofNullable(toDo); + } + + @Override + public void remove(ToDo todo) { + em.remove(todo); + } + + @Override + public void insert(ToDo todo) { + em.persist(todo); + } + + @Override + public Optional update(Long id, ToDo newTodo) { + Optional optional = findById(id); + if (optional.isPresent()) { + optional.get().update(newTodo); + return optional; + } + return Optional.empty(); + } +} \ No newline at end of file diff --git a/todo-backend/src/main/resources/META-INF/persistence.xml b/todo-backend/src/main/resources/META-INF/persistence.xml new file mode 100644 index 0000000000..a9d9e54e20 --- /dev/null +++ b/todo-backend/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,31 @@ + + + + + java:jboss/datasources/ToDos + + + + + + + diff --git a/todo-backend/src/main/scripts/cors_filters.cli b/todo-backend/src/main/scripts/cors_filters.cli new file mode 100644 index 0000000000..12b029fbba --- /dev/null +++ b/todo-backend/src/main/scripts/cors_filters.cli @@ -0,0 +1,16 @@ +echo Adding Undertow Filters for CORS +# Access-Control-Allow-Origin +/subsystem=undertow/server=default-server/host=default-host/filter-ref="Access-Control-Allow-Origin":add() +/subsystem=undertow/configuration=filter/response-header="Access-Control-Allow-Origin":add(header-name="Access-Control-Allow-Origin",header-value="${env.CORS_ORIGIN:*}") +# Access-Control-Allow-Methods +/subsystem=undertow/server=default-server/host=default-host/filter-ref="Access-Control-Allow-Methods":add() +/subsystem=undertow/configuration=filter/response-header="Access-Control-Allow-Methods":add(header-name="Access-Control-Allow-Methods",header-value="GET, POST, OPTION, PUT, DELETE, PATCH") +# Access-Control-Allow-Headers +/subsystem=undertow/server=default-server/host=default-host/filter-ref="Access-Control-Allow-Headers":add() +/subsystem=undertow/configuration=filter/response-header="Access-Control-Allow-Headers":add(header-name="Access-Control-Allow-Headers",header-value="accept, authorization, content-type, x-requested-with") +# Access-Control-Allow-Credentials +/subsystem=undertow/server=default-server/host=default-host/filter-ref="Access-Control-Allow-Credentials":add() +/subsystem=undertow/configuration=filter/response-header="Access-Control-Allow-Credentials":add(header-name="Access-Control-Allow-Credentials",header-value="true") +# Access-Control-Max-Age +/subsystem=undertow/server=default-server/host=default-host/filter-ref="Access-Control-Max-Age":add() +/subsystem=undertow/configuration=filter/response-header="Access-Control-Max-Age":add(header-name="Access-Control-Max-Age",header-value="1") \ No newline at end of file diff --git a/todo-backend/src/main/webapp/WEB-INF/beans.xml b/todo-backend/src/main/webapp/WEB-INF/beans.xml new file mode 100644 index 0000000000..d3ddf148e7 --- /dev/null +++ b/todo-backend/src/main/webapp/WEB-INF/beans.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/todo-backend/src/test/java/org/wildfly/quickstarts/todos/ToDoIT.java b/todo-backend/src/test/java/org/wildfly/quickstarts/todos/ToDoIT.java new file mode 100644 index 0000000000..a4c99d0a1b --- /dev/null +++ b/todo-backend/src/test/java/org/wildfly/quickstarts/todos/ToDoIT.java @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.wildfly.quickstarts.todos; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.net.URL; +import java.util.List; + +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.GenericType; +import javax.ws.rs.core.MediaType; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(Arquillian.class) +@RunAsClient +public class ToDoIT { + @Deployment + public static Archive createTestArchive() { + return ShrinkWrap.create(WebArchive.class, "test.war") + .addPackage(ToDo.class.getPackage()) + .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + // Deploy our test datasource + .addAsWebInfResource("test-ds.xml"); + } + + @ArquillianResource + private URL deploymentUrl; + + @Test + public void testCRUD() throws Exception { + + WebTarget client = ClientBuilder.newClient().target(deploymentUrl.toURI()); + + GenericType> todosListType = new GenericType>() {}; + List allTodos = client.request().get(todosListType); + assertEquals(0, allTodos.size()); + + ToDo toDo = new ToDo(); + toDo.setTitle("My First ToDo"); + toDo.setOrder(1); + ToDo persistedTodo = client.request().post(Entity.entity(toDo, MediaType.APPLICATION_JSON_TYPE), ToDo.class); + assertNotNull(persistedTodo.getId()); + + allTodos = client.request().get(todosListType); + assertEquals(1, allTodos.size()); + ToDo fetchedToDo = allTodos.get(0); + assertEquals(toDo.getTitle(), fetchedToDo.getTitle()); + + client.request().delete(); + + allTodos = client.request().get(todosListType); + assertEquals(0, allTodos.size()); + } + +} diff --git a/todo-backend/src/test/resources/META-INF/test-persistence.xml b/todo-backend/src/test/resources/META-INF/test-persistence.xml new file mode 100644 index 0000000000..c3cd935b1b --- /dev/null +++ b/todo-backend/src/test/resources/META-INF/test-persistence.xml @@ -0,0 +1,34 @@ + + + + + + java:jboss/datasources/ToDos + + + + + + + diff --git a/todo-backend/src/test/resources/arquillian.xml b/todo-backend/src/test/resources/arquillian.xml new file mode 100644 index 0000000000..fdeb809fee --- /dev/null +++ b/todo-backend/src/test/resources/arquillian.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/todo-backend/src/test/resources/test-ds.xml b/todo-backend/src/test/resources/test-ds.xml new file mode 100644 index 0000000000..ff71e25bcb --- /dev/null +++ b/todo-backend/src/test/resources/test-ds.xml @@ -0,0 +1,38 @@ + + + + + + + jdbc:h2:mem:todo-backend;DB_CLOSE_DELAY=-1 + h2 + + sa + sa + + + + diff --git a/websocket-client/README.html b/websocket-client/README.html index 3ee60cdb64..d809644dfe 100644 --- a/websocket-client/README.html +++ b/websocket-client/README.html @@ -757,7 +757,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -766,10 +766,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -778,7 +778,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -787,10 +787,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -800,17 +800,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -853,12 +853,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the websocket-client source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the websocket-client source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="websocket-client-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -893,9 +893,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="websocket-client-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -976,11 +976,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1038,7 +1038,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1079,7 +1079,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1090,7 +1090,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/websocket-client/pom.xml b/websocket-client/pom.xml index edd5869277..08023ef99d 100644 --- a/websocket-client/pom.xml +++ b/websocket-client/pom.xml @@ -25,7 +25,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/websocket-endpoint/README.html b/websocket-endpoint/README.html index d82968b043..c32e757a8e 100644 --- a/websocket-endpoint/README.html +++ b/websocket-endpoint/README.html @@ -734,7 +734,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -743,10 +743,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -755,7 +755,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -764,10 +764,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -777,17 +777,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -830,12 +830,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the websocket-endpoint source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the websocket-endpoint source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="websocket-endpoint-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -870,9 +870,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="websocket-endpoint-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -953,11 +953,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1015,7 +1015,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1056,7 +1056,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1067,7 +1067,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/websocket-endpoint/pom.xml b/websocket-endpoint/pom.xml index 41238983d3..4239bf4bd2 100644 --- a/websocket-endpoint/pom.xml +++ b/websocket-endpoint/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/websocket-hello/README.html b/websocket-hello/README.html index a645a11a21..0cd5dcff23 100644 --- a/websocket-hello/README.html +++ b/websocket-hello/README.html @@ -765,7 +765,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -774,10 +774,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -786,7 +786,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -795,10 +795,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -808,17 +808,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -861,12 +861,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the websocket-hello source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the websocket-hello source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="websocket-hello-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -901,9 +901,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="websocket-hello-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -984,11 +984,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1046,7 +1046,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1087,7 +1087,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1098,7 +1098,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/websocket-hello/pom.xml b/websocket-hello/pom.xml index d89e9102f3..e38796adc3 100644 --- a/websocket-hello/pom.xml +++ b/websocket-hello/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/wsat-simple/README.html b/wsat-simple/README.html index 3020592e89..f1d2beb441 100644 --- a/wsat-simple/README.html +++ b/wsat-simple/README.html @@ -849,7 +849,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/wsat-simple/pom.xml b/wsat-simple/pom.xml index 881f6de491..171e94bc10 100644 --- a/wsat-simple/pom.xml +++ b/wsat-simple/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml @@ -111,7 +111,7 @@ maven-war-plugin - + org.jboss.xts diff --git a/wsba-coordinator-completion-simple/README.html b/wsba-coordinator-completion-simple/README.html index d10a56b16d..41d45a26ab 100644 --- a/wsba-coordinator-completion-simple/README.html +++ b/wsba-coordinator-completion-simple/README.html @@ -824,7 +824,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/wsba-coordinator-completion-simple/pom.xml b/wsba-coordinator-completion-simple/pom.xml index 6bb6099f99..b84009eb72 100644 --- a/wsba-coordinator-completion-simple/pom.xml +++ b/wsba-coordinator-completion-simple/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/wsba-participant-completion-simple/README.html b/wsba-participant-completion-simple/README.html index c4ccb306e6..460f63ef38 100644 --- a/wsba-participant-completion-simple/README.html +++ b/wsba-participant-completion-simple/README.html @@ -821,7 +821,7 @@

    JBoss EAP for OpenShift Incompatibility

    diff --git a/wsba-participant-completion-simple/pom.xml b/wsba-participant-completion-simple/pom.xml index bef2d50c9f..27dd86d394 100644 --- a/wsba-participant-completion-simple/pom.xml +++ b/wsba-participant-completion-simple/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml diff --git a/xml-jaxp/README.html b/xml-jaxp/README.html index 0f30d24daf..0f53207224 100644 --- a/xml-jaxp/README.html +++ b/xml-jaxp/README.html @@ -777,7 +777,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 8 image streams:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk8-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk8-image-stream.json
    @@ -786,10 +786,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 8 builder imagestream: jboss-eap74-beta-openjdk8-openshift

      +

      The JDK 8 builder imagestream: jboss-eap74-openjdk8-openshift

    • -

      The JDK 8 runtime imagestream: jboss-eap74-beta-openjdk8-runtime-openshift

      +

      The JDK 8 runtime imagestream: jboss-eap74-openjdk8-runtime-openshift

    @@ -798,7 +798,7 @@

    Import the Latest JBoss EAP for OpenShift

    Import JDK 11 image stream:

    -
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/eap74-beta-openjdk11-image-stream.json
    +
    oc replace --force -f https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/eap74-openjdk11-image-stream.json
    @@ -807,10 +807,10 @@

    Import the Latest JBoss EAP for OpenShift
    • -

      The JDK 11 builder imagestream: jboss-eap74-beta-openjdk11-openshift

      +

      The JDK 11 builder imagestream: jboss-eap74-openjdk11-openshift

    • -

      The JDK 11 runtime imagestream: jboss-eap74-beta-openjdk11-runtime-openshift

      +

      The JDK 11 runtime imagestream: jboss-eap74-openjdk11-runtime-openshift

    @@ -820,17 +820,17 @@

    Import the Latest JBoss EAP for OpenShift 
    for resource in \
-  eap74-beta-amq-persistent-s2i.json \
-  eap74-beta-amq-s2i.json \
-  eap74-beta-basic-s2i.json \
-  eap74-beta-https-s2i.json \
-  eap74-beta-sso-s2i.json \
-  eap74-beta-starter-s2i.json \
-  eap74-beta-third-party-db-s2i.json \
-  eap74-beta-tx-recovery-s2i.json
+  eap74-amq-persistent-s2i.json \
+  eap74-amq-s2i.json \
+  eap74-basic-s2i.json \
+  eap74-https-s2i.json \
+  eap74-sso-s2i.json \
+  eap74-starter-s2i.json \
+  eap74-third-party-db-s2i.json \
+  eap74-tx-recovery-s2i.json
 do
   oc replace --force -f \
-https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74-beta/templates/${resource}
+https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/templates/${resource}
 done
    @@ -873,12 +873,12 @@

    Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
    Procedure
    1. -

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-beta-basic-s2i template with the JDK 8 images and the xml-jaxp source code on GitHub.

      +

      Create a new OpenShift application using the JBoss EAP for OpenShift image and the quickstart’s source code. Use the following command to use the eap74-basic-s2i template with the JDK 8 images and the xml-jaxp source code on GitHub.

      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk8-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk8-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk8-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk8-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="xml-jaxp-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -913,9 +913,9 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc new-app --template=eap74-beta-basic-s2i \
- -p EAP_IMAGE_NAME=jboss-eap74-beta-openjdk11-openshift:latest \
- -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-beta-openjdk11-runtime-openshift:latest \
+
      $ oc new-app --template=eap74-basic-s2i \
+ -p EAP_IMAGE_NAME=jboss-eap74-openjdk11-openshift:latest \
+ -p EAP_RUNTIME_IMAGE_NAME=jboss-eap74-openjdk11-runtime-openshift:latest \
  -p IMAGE_STREAM_NAMESPACE="xml-jaxp-project" \
  -p SOURCE_REPOSITORY_URL="https://github.com/jboss-developer/jboss-eap-quickstarts" \
  -p SOURCE_REPOSITORY_REF="7.4.x" \
@@ -996,11 +996,11 @@ 
      Deploy the JBoss EAP Source-to-Image (S2I) Quickstart to
      -
      $ oc logs -f bc/eap74-beta-basic-app-build-artifacts
+
      $ oc logs -f bc/eap74-basic-app-build-artifacts
 
 …
 Push successful
-$ oc logs -f bc/eap74-beta-basic-app
+$ oc logs -f bc/eap74-basic-app
 …
 Push successful
      @@ -1058,7 +1058,7 @@

      OpenShift Post Deployment Tasks

      -
      $ oc expose service/eap74-beta-basic-app --port=8080
      +
      $ oc expose service/eap74-basic-app --port=8080
      2. @@ -1099,7 +1099,7 @@

      OpenShift Post Deployment Tasks

    -
    $ oc scale deploymentconfig/eap74-beta-basic-app --replicas=3
    +
    $ oc scale deploymentconfig/eap74-basic-app --replicas=3
    @@ -1110,7 +1110,7 @@

    OpenShift Post Deployment Tasks

    diff --git a/xml-jaxp/pom.xml b/xml-jaxp/pom.xml index 3141c93b92..df9bfea659 100644 --- a/xml-jaxp/pom.xml +++ b/xml-jaxp/pom.xml @@ -24,7 +24,7 @@ Maintain separation between the artifact id and the version to help prevent merge conflicts between commits changing the GA and those changing the V. --> - 7.4.0.Beta + 7.4.0.GA ../pom.xml