Merge pull request #265758 from MicrosoftDocs/main

2/8/2024 AM Publish

Author: Taojunshen

articles/active-directory-b2c/media/client-credentials-grant-flow/copy-application-secret.png

@@ -645,12 +645,13 @@ In active-active configuration, both instances of the VPN gateway establish S2S
 
 Learn more about [Virtual network gateway - VNetGatewayActiveActive (Enable Active-Active gateways for redundancy)](https://aka.ms/aa_vpnha_learnmore).
 
+<!--
 ### Use HEAD health probes
 
 For health probes, it’s a good practice to use the HEAD method, which reduces the amount of traffic load on your origins.
 
 Learn more about [Front Door - Use HEAD health probes](https://aka.ms/afd-use-health-probes).
-
+-->
 ### Use managed TLS certificates
 
 Front Door management of your TLS certificates reduces your operational costs and helps you to avoid costly outages caused by forgetting to renew a certificate.
@@ -663,6 +664,12 @@ If you only have a single origin, Front Door always routes traffic to that origi
 
 Learn more about [Health probe best practices](https://aka.ms/afd-disable-health-probes).
 
+### Use the same domain name on Azure Front Door and your origin
+
+We recommend that you preserve the original HTTP host name when you use a reverse proxy in front of a web application. Having a different host name at the reverse proxy than the one that's provided to the back-end application server can lead to cookies or redirect URLs that don't work properly. For example, session state can get lost, authentication can fail, or back-end URLs can inadvertently be exposed to end users. You can avoid these problems by preserving the host name of the initial request so that the application server sees the same domain as the web browser.
+
+Learn more about [Use the same domain name on Azure Front Door and your origin](https://aka.ms/afd-same-domain-origin).
+
 ## SAP for Azure
 
 ### Enable the 'concurrent-fencing' parameter in Pacemaker cofiguration in ASCS HA setup in SAP workloads

articles/active-directory-b2c/media/find-help-and-submit-support-ticket/find-help-and-submit-support-ticket-1.png

@@ -27,7 +27,7 @@ Enhancements let you incorporate other Azure AI services (such as Azure AI Visio
 **Object grounding**: Azure AI Vision complements GPT-4 Turbo with Vision’s text response by identifying and locating salient objects in the input images. This lets the chat model give more accurate and detailed responses about the contents of the image.
 
 > [!IMPORTANT]
-> To use Vision enhancement, you need a Computer Vision resource. It must be in the paid (S0) tier and in the same Azure region as your GPT-4 Turbo with Vision resource.
+> To use Vision enhancement, you need a Computer Vision resource. It must be in the paid (S1) tier and in the same Azure region as your GPT-4 Turbo with Vision resource.
 
 :::image type="content" source="../media/concepts/gpt-v/object-grounding.png" alt-text="Screenshot of an image with object grounding applied. Objects have bounding boxes with labels.":::
 

articles/active-directory-b2c/media/find-help-and-submit-support-ticket/find-help-and-submit-support-ticket-2.png

@@ -3,18 +3,30 @@ author: cephalin
 ms.service: app-service
 ms.devlang: java
 ms.topic: include
-ms.date: 08/30/2023
+ms.date: 02/10/2024
 ms.author: cephalin
 ---
 
-In this quickstart, you'll use the [Maven Plugin for Azure App Service Web Apps](https://github.com/microsoft/azure-maven-plugins/blob/develop/azure-webapp-maven-plugin/README.md) to deploy a Java web application with an embedded server to [Azure App Service](/azure/app-service/). App Service provides a highly scalable, self-patching web app hosting service. Use the tabs to switch between Tomcat, JBoss, or embedded server (Java SE) instructions.
+In this quickstart, you use the [Maven Plugin for Azure App Service Web Apps](https://github.com/microsoft/azure-maven-plugins/blob/develop/azure-webapp-maven-plugin/README.md) to deploy a Java web application with an embedded server to [Azure App Service](/azure/app-service/). App Service provides a highly scalable, self-patching web app hosting service. Use the tabs to switch between Tomcat, JBoss, or embedded server (Java SE) instructions.
 
-The quickstart uses a [Quarkus](https://quarkus.io) sample, which comes with a bundled web server. You can deploy your own application and server bundle in a single JAR file to App Service instead of the using the Tomcat or JBoss hosting options. If you want, you can also embed a Tomcat server in the JAR file and run that in App Service.
+The quickstart deploys either a Spring Boot app, embedded Tomcat, or Quarkus app using the [azure-webapp-maven-plugin](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Web-App) plugin.
 
 > [!NOTE]
-> For Spring apps that requires all the Spring services, try [Azure Spring Apps](../../../spring-apps/enterprise/quickstart.md) instead. However, you can deploy Spring Boot apps to App Service.
+> App Service can host Spring apps. For Spring apps that require all the Spring services, try [Azure Spring Apps](../../../spring-apps/quickstart.md) instead.
 
-:::image type="content" source="../../media/quickstart-java/quarkus-hello-world-in-browser-azure-app-service.png" alt-text="Screenshot of Maven Hellow World web app running in Azure App Service in introduction.":::
+### [Spring Boot](#tab/springboot)
+
+:::image type="content" source="../../media/quickstart-java/springboot-hello-world-in-browser-azure-app-service.png" alt-text="Screenshot of Spring Boot Hello World web app running in Azure App Service in introduction.":::
+
+### [Embedded Tomcat](#tab/embeddedtomcat)
+
+:::image type="content" source="../../media/quickstart-java/embedded-tomcat-hello-world-in-browser-azure-app-service.png" alt-text="Screenshot of embedded Tomcat Hello World web app running in Azure App Service in introduction.":::
+
+### [Quarkus](#tab/quarkus)
+
+:::image type="content" source="../../media/quickstart-java/quarkus-hello-world-in-browser-azure-app-service.png" alt-text="Screenshot of Quarkus Hello World web app running in Azure App Service in introduction.":::
+
+-----
 
 If Maven isn't your preferred development tool, check out our similar tutorials for Java developers:
 + [Gradle](../../configure-language-java.md?pivots=platform-linux#gradle)
@@ -28,22 +40,56 @@ If Maven isn't your preferred development tool, check out our similar tutorials
 
 [!INCLUDE [cloud-shell-try-it-no-header.md](../../../../includes/cloud-shell-try-it-no-header.md)]
 
-## 2 - Create a Java app
+## 2 - Get the sample app
 
-Execute the following Maven command in the Cloud Shell prompt to create a new app named `quarkus-hello-azure`:
+### [Spring Boot](#tab/springboot)
 
-```azurecli-interactive
-   mvn io.quarkus.platform:quarkus-maven-plugin:3.2.2.Final:create \
-     -DprojectGroupId=org.acme \
-     -DprojectArtifactId=quarkus-hello-azure  \
-     -Dextensions='resteasy-reactive'
-```
+1. Download and extract the [default Spring Boot web application template](https://github.com/rd-1-2022/rest-service). This repository is cloned for you when you run the [Spring CLI](https://docs.spring.io/spring-cli/reference/creating-new-projects.html) command `spring boot new my-webapp`.
 
-Then change your working directory to the project folder:
+    ```bash
+    git clone https://github.com/rd-1-2022/rest-service my-webapp
+    ```
 
-```azurecli-interactive
-cd quarkus-hello-azure
-```
+1. Change your working directory to the project folder:
+
+    ```azurecli-interactive
+    cd my-webapp
+    ```
+
+### [Embedded Tomcat](#tab/embeddedtomcat)
+
+1. Download and extract the [embeddedTomcatExample](https://github.com/Azure-Samples/java-docs-embedded-tomcat) repository, or clone it locally by running `git clone`:
+
+    ```bash
+    git clone https://github.com/Azure-Samples/java-docs-embedded-tomcat
+    ```
+
+1. Change your working directory to the project folder:
+
+    ```azurecli-interactive
+    cd java-docs-embedded-tomcat
+    ```
+
+    The application is run using the standard [Tomcat](https://tomcat.apache.org/tomcat-9.0-doc/api/org/apache/catalina/startup/Tomcat.html) class (see [Main.java](https://github.com/Azure-Samples/java-docs-embedded-tomcat/blob/main/src/main/java/com/microsoft/azure/appservice/examples/embeddedtomcat/Main.java) in the sample). 
+
+### [Quarkus](#tab/quarkus)
+
+1. Generate a new Quarkus app named `quarkus-hello-azure` with the following Maven command:
+
+    ```azurecli-interactive
+    mvn io.quarkus.platform:quarkus-maven-plugin:3.2.2.Final:create \
+        -DprojectGroupId=org.acme \
+        -DprojectArtifactId=quarkus-hello-azure  \
+        -Dextensions='resteasy-reactive'
+    ```
+
+1. Change your working directory to the project folder:
+
+    ```azurecli-interactive
+    cd quarkus-hello-azure
+    ```
+
+-----
 
 ## 3 - Configure the Maven plugin
 
@@ -52,7 +98,7 @@ The deployment process to Azure App Service uses your Azure credentials from the
 Run the Maven command shown next to configure the deployment. This command helps you to set up the App Service operating system, Java version, and Tomcat version.
 
 ```azurecli-interactive
-mvn com.microsoft.azure:azure-webapp-maven-plugin:2.12.0:config
+mvn com.microsoft.azure:azure-webapp-maven-plugin:2.13.0:config
 ```
 
 1. For **Create new run configuration**, type **Y**, then **Enter**.
@@ -63,8 +109,8 @@ mvn com.microsoft.azure:azure-webapp-maven-plugin:2.12.0:config
 
     ```
     Please confirm webapp properties
-    AppName : quarkus-hello-azure-1690375364238
-    ResourceGroup : quarkus-hello-azure-1690375364238-rg
+    AppName : <generated-app-name>
+    ResourceGroup : <generated-app-name>-rg
     Region : centralus
     PricingTier : P1v2
     OS : Linux
@@ -81,7 +127,7 @@ mvn com.microsoft.azure:azure-webapp-maven-plugin:2.12.0:config
     [INFO] ------------------------------------------------------------------------
     ```
 
-After you've confirmed your choices, the plugin adds the above plugin element and requisite settings to your project's `pom.xml` file that configure your web app to run in Azure App Service.
+After you confirm your choices, the plugin adds the above plugin element and requisite settings to your project's `pom.xml` file that configure your web app to run in Azure App Service.
 
 The relevant portion of the `pom.xml` file should look similar to the following example.
 
@@ -118,13 +164,36 @@ Property | Required | Description | Version
 
 For the complete list of configurations, see the plugin reference documentation. All the Azure Maven Plugins share a common set of configurations. For these configurations see [Common Configurations](https://github.com/microsoft/azure-maven-plugins/wiki/Common-Configuration). For configurations specific to App Service, see [Azure Web App: Configuration Details](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Web-App:-Configuration-Details).
 
-Be careful about the values of `<appName>` and `<resourceGroup>` (`quarkus-hello-azure-1690375364238` and `quarkus-hello-azure-1690375364238-rg` accordingly in the demo). They're used later.
+Be careful about the values of `<appName>` and `<resourceGroup>`. They're used later.
 
 ## 4 - Deploy the app
 
-With all the configuration ready in your *pom.xml* file, you can deploy your Java app to Azure with one single command.
+With all the configuration ready in your [pom.xml](https://github.com/Azure-Samples/java-docs-embedded-tomcat/blob/main/pom.xml) file, you can deploy your Java app to Azure with one single command.
+
+1. Build the JAR file using the following command:
+
+    ### [Spring Boot](#tab/springboot)
+    
+    ```bash
+    mvn clean package
+    ```
+
+    ### [Embedded Tomcat](#tab/embeddedtomcat)
+    
+    ```bash
+    mvn clean package
+    ```
+
+    To make the application it deployable using [azure-webapp-maven-plugin](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Web-App), and running on Azure App Service, the sample configures the `package` goal as follows:
+    
+    - Build a single uber JAR file, which contains everything the application needs to run.
+    - Create an [executable JAR](https://en.wikipedia.org/wiki/JAR_(file_format)#Executable_JAR_files) by specifying the Tomcat class as the start-up class.
+    - Replace the original artifact with the uber JAR to ensure that the deploy step deploys the right file.
 
-1. Rebuild the JAR file using the following command:
+    > [!TIP]
+    > Quarkus and Spring Boot both produce two JAR files with `mvn clean package`, but `azure-webapp-maven-plugin` picks the right JAR file to deploy automatically.
+    
+    ### [Quarkus](#tab/quarkus)
 
     ```bash
     mvn clean package -Dquarkus.package.type=uber-jar -D%prod.quarkus.http.port=80 
@@ -137,6 +206,8 @@ With all the configuration ready in your *pom.xml* file, you can deploy your Jav
 
     You can configure these properties by using other means, but they're added to `mvn package` command here for simplicity.
 
+    -----
+
 2. Deploy to Azure by using the following command:
 
    ```bash
@@ -146,7 +217,7 @@ With all the configuration ready in your *pom.xml* file, you can deploy your Jav
     If the deployment succeeds, you see the following output:
 
     ```output
-    [INFO] Successfully deployed the artifact to https://quarkus-hello-azure-1690375364238.azurewebsites.net
+    [INFO] Successfully deployed the artifact to https://<app-name>.azurewebsites.net
     [INFO] ------------------------------------------------------------------------
     [INFO] BUILD SUCCESS
     [INFO] ------------------------------------------------------------------------
@@ -155,11 +226,27 @@ With all the configuration ready in your *pom.xml* file, you can deploy your Jav
     [INFO] ------------------------------------------------------------------------
     ```
 
-Once deployment is completed, your application is ready at `http://<appName>.azurewebsites.net/` (`http://quarkus-hello-azure-1690375364238.azurewebsites.net` in the demo). Open the url with your local web browser, you should see
+### [Spring Boot](#tab/springboot)
+
+Once deployment is completed, your application is ready at `http://<appName>.azurewebsites.net/`. Open the URL `http://<appName>.azurewebsites.net/greeting` with your local web browser (note the `/greeting` path), and you should see:
+
+:::image type="content" source="../../media/quickstart-java/springboot-hello-world-in-browser-azure-app-service.png" alt-text="Screenshot of Spring Boot Hello World web app running in Azure App Service.":::
+
+### [Embedded Tomcat](#tab/embeddedtomcat)
+
+Once deployment is completed, your application is ready at `http://<appName>.azurewebsites.net/`. Open the url with your local web browser, and you should see:
+
+:::image type="content" source="../../media/quickstart-java/embedded-tomcat-hello-world-in-browser-azure-app-service.png" alt-text="Screenshot of embedded Tomcat web app running in Azure App Service.":::
+
+### [Quarkus](#tab/quarkus)
+
+Once deployment is completed, your application is ready at `http://<appName>.azurewebsites.net/`. Open the url with your local web browser, and you should see:
+
+:::image type="content" source="../../media/quickstart-java/quarkus-hello-world-in-browser-azure-app-service.png" alt-text="Screenshot of Quarkus web app running in Azure App Service.":::
 
-:::image type="content" source="../../media/quickstart-java/quarkus-hello-world-in-browser-azure-app-service.png" alt-text="Screenshot of Maven Hellow World web app running in Azure App Service.":::
+-----
 
-**Congratulations!** You've deployed your first Java app to App Service.
+**Congratulations!** You deployed your first Java app to App Service.
 
 ## 5 - Clean up resources
 
@@ -169,4 +256,4 @@ In the preceding steps, you created Azure resources in a resource group. If you
 az group delete --name <your resource group name; for example: quarkus-hello-azure-1690375364238-rg> --yes
 ```
 
-This command may take a minute to run.
+This command might take a minute to run.