pull base content,head:MicrosoftDocs:main,into:wwlpublishsync

Author: wwlpublish

learn-pr/advocates/create-java-webapp-to-app-service-linux/1-introduction.yml

@@ -1,18 +1,14 @@
 ### YamlMime:ModuleUnit
-uid: learn.azure.build-webapp-java-tomcat.1
+uid: learn.azure.build-tomcat-java-appservice.1
 title: Introduction
 metadata:
-  adobe-target: true
-  prefetch-feature-rollout: true
   title: Introduction
-  description: Module introduction
-  author: yoshioterada
-  ms.author: yoterada
-  ms.date: 05/03/2023
+  description: Introduces a training module that shows you how to deploy Java-based web apps.
+  ms.date: 02/20/2025
+  author: KarlErickson
+  ms.author: ayangupta
   ms.topic: unit
-  ms.custom: team=cloud_advocates, devx-track-extended-java, linux-related-content
-  ms.contributors: yoterada-12142020
+  ms.custom: team=cloud_advocates, devx-track-extended-java, devx-track-java, linux-related-content
 durationInMinutes: 2
 content: |
   [!include[](includes/1-introduction.md)]
-

learn-pr/advocates/create-java-webapp-to-app-service-linux/2-azure-app-service-explanation.yml

@@ -0,0 +1,14 @@
+### YamlMime:ModuleUnit
+uid: learn.azure.build-tomcat-java-appservice.2
+title: Introduction to Azure App Service
+metadata:
+  title: Introduction to Azure App Service
+  description: Describes Azure App Service.
+  ms.date: 02/20/2025
+  author: KarlErickson
+  ms.author: ayangupta
+  ms.topic: unit
+  ms.custom: team=cloud_advocates, devx-track-extended-java, devx-track-java, linux-related-content
+durationInMinutes: 2
+content: |
+  [!include[](includes/2-azure-app-service-explanation.md)]

learn-pr/advocates/create-java-webapp-to-app-service-linux/2-javaserver-faces-explanation.yml

@@ -0,0 +1,14 @@
+### YamlMime:ModuleUnit
+uid: learn.azure.build-tomcat-java-appservice.3
+title: Exercise - Create a simple Tomcat Java web app 
+metadata:
+  title: Exercise - Create a Simple Tomcat Java Web App
+  description: Shows you how to create a simple Java web app and deploy it locally.
+  ms.date: 02/20/2025
+  author: KarlErickson
+  ms.author: ayangupta
+  ms.topic: unit
+  ms.custom: team=cloud_advocates, devx-track-extended-java, devx-track-java, linux-related-content
+durationInMinutes: 10
+content: |
+  [!include[](includes/3-exercise-create-simple-java-app.md)]

learn-pr/advocates/create-java-webapp-to-app-service-linux/3-exercise-create-javaserver-faces-app.yml

@@ -1,18 +1,14 @@
 ### YamlMime:ModuleUnit
-uid: learn.azure.build-webapp-java-tomcat.4
-title: Exercise - Deploy a Java web app to Azure App Service
+uid: learn.azure.build-tomcat-java-appservice.4
+title: Exercise - Deploy a web app to Azure App Service
 metadata:
-  adobe-target: true
-  prefetch-feature-rollout: true
-  title: Exercise - Deploy a Java web app to Azure App Service
-  description: Package your Java web application and deploy it to Azure App Service.
-  author: yoshioterada
-  ms.author: yoterada
-  ms.date: 05/03/2023
+  title: Exercise - Deploy a Web App to Azure App Service
+  description: Shows you how to deploy a simple Tomcat Java web app to Azure App Service.
+  ms.date: 02/20/2025
+  author: KarlErickson
+  ms.author: ayangupta
   ms.topic: unit
-  ms.custom: team=cloud_advocates, devx-track-extended-java, linux-related-content
-  ms.contributors: yoterada-12142020
-durationInMinutes: 6
+  ms.custom: team=cloud_advocates, devx-track-extended-java, devx-track-java, linux-related-content
+durationInMinutes: 7
 content: |
   [!include[](includes/4-exercise-deploy-to-app-service.md)]
-

learn-pr/advocates/create-java-webapp-to-app-service-linux/3-exercise-create-simple-java-app.yml

@@ -1,59 +1,62 @@
 ### YamlMime:ModuleUnit
-uid: learn.azure.build-webapp-java-tomcat.5
+uid: learn.azure.build-tomcat-java-appservice.5
 title: Knowledge check
 metadata:
-  adobe-target: true
-  prefetch-feature-rollout: true
-  title: Knowledge check
-  description: Knowledge check
-  author: yoshioterada
-  ms.author: yoterada
-  ms.date: 05/03/2023
+  title: Knowledge Check
+  description: Check your knowledge of creating and deploying Java web apps to Azure App Service.
+  ms.date: 02/20/2025
+  author: KarlErickson
+  ms.author: ayangupta
   ms.topic: unit
-  ms.custom: team=cloud_advocates, devx-track-extended-java, linux-related-content
-  ms.contributors: yoterada-12142020
-durationInMinutes: 2
+  ms.custom: team=cloud_advocates, devx-track-extended-java, devx-track-java, linux-related-content
+durationInMinutes: 5
 quiz:
+  title: Check your knowledge
   questions:
-    - content: Which file format do you use for Facelets?
+    - content: What's the primary purpose of using Apache Maven in Java web application development?
       choices:
-        - content: "Hypertext Markup Language (HTML)"
+        - content: To provide a web server for hosting the application.
           isCorrect: false
-          explanation: "HTML is used for creating static web pages."
-        - content: "Extensible Hypertext Markup Language (XHTML)"
-          isCorrect: true
-          explanation: "Because JavaServer Faces 2.0, Facelets has been used as the default view declaration language."
-        - content: "JavaServer Pages (JSP)"
+          explanation: Incorrect. Maven is a build automation tool, not a web server.
+        - content: To design the user interface of the web application.
           isCorrect: false
-          explanation: "In the past, you could write JavaServer Faces (JSF) tags in JSP pages. Facelets is the new view declaration language since JSF 2.0. We recommend that you use the XHTML instead of JSP."
-    - content: Which methods allow you to access the application logs in Azure App Service?
+          explanation: Incorrect. Maven focuses on project management and build automation, not UI design.
+        - content: To manage project dependencies and automate the build process.
+          isCorrect: true
+          explanation: Correct! Maven helps manage dependencies and automates the build and deployment processes, streamlining development.
+
+    - content: How does deploying a Java web application to Azure App Service benefit developers?
       choices:
-        - content: SSH in Advanced Tools in the Azure portal
+        - content: It automatically converts Java code to a faster language.
           isCorrect: false
-          explanation: This method is a correct option, but it isn't the only way to access the logs.
-        - content: Access the log stream in Advanced Tools in the Azure portal
+          explanation: Incorrect. Azure App Service doesn't convert code. It hosts applications as they are.
+        - content: It eliminates the need for a build automation tool like Maven.
           isCorrect: false
-          explanation: This method is a correct option, but it isn't the only way to access the logs.
-        - content: The Azure CLI command-line tool
-          isCorrect: false
-          explanation: This method is a correct option, but it isn't the only way to access the logs.
-        - content: All of the above
+          explanation: Incorrect. Build automation tools are still needed for compiling and packaging the application before deployment.
+        - content: It provides a scalable, managed hosting environment without the need to manage infrastructure.
           isCorrect: true
-          explanation: Correct!
-
+          explanation: Correct! Azure App Service enables developers to deploy applications easily, handling scaling and infrastructure management.
 
-    - content: Which tasks can you do with the Maven Plugin for Azure App Service?
+    - content: What is the primary role of a servlet in a Java web application?
       choices:
-        - content: Compile the source code
-          isCorrect: false
-          explanation: The Maven Compiler Plugin compiles your source code.
-        - content: Configure your Azure App Service instance
+        - content: To manage database connections and queries.
           isCorrect: false
-          explanation: This choice is a correct option, but it isn't its only feature.
-        - content: Deploy to your Azure App Service instance
-          isCorrect: false
-          explanation: This choice is a correct option, but it isn't its only feature.
-        - content: Both configure and deploy to your Azure App Service instance
+          explanation: Incorrect. Servlets can interact with databases, but their main role is handling web requests and generating dynamic content.
+        - content: To handle client requests and generate dynamic content on the server side.
           isCorrect: true
-          explanation: Correct!
+          explanation: Correct! The main role of a servlet is to handle client requests and generate server-side responses.
+        - content: To define the application's user interface.
+          isCorrect: false
+          explanation: Incorrect. Servlets work on the server side and don't manage the user interface, which is handled by client-side components.
 
+    - content: Why is Apache Tomcat used in Java web application development?
+      choices:
+        - content: It serves as a servlet container that implements Java Servlet and JSP specifications.
+          isCorrect: true
+          explanation: Correct! Tomcat provides an environment to run Java servlets and JSPs, which is essential for Java web applications.
+        - content: It's a front-end framework for designing responsive web interfaces.
+          isCorrect: false
+          explanation: Incorrect. Tomcat is a server-side technology and doesn't deal with front-end design.
+        - content: It's a database system used for storing application data.
+          isCorrect: false
+          explanation: Incorrect. Tomcat is a web server and servlet container, not a database system.

learn-pr/advocates/create-java-webapp-to-app-service-linux/4-exercise-deploy-to-app-service.yml

@@ -1,18 +1,14 @@
 ### YamlMime:ModuleUnit
-uid: learn.azure.build-webapp-java-tomcat.6
+uid: learn.azure.build-tomcat-java-appservice.6
 title: Summary
 metadata:
-  adobe-target: true
-  prefetch-feature-rollout: true
   title: Summary
-  description: Summary and cleanup of Azure resources.
-  author: yoshioterada
-  ms.author: yoterada
-  ms.date: 05/03/2023
+  description: Summarizes the module and provides instructions for the cleanup of Azure resources.
+  ms.date: 02/20/2025
+  author: KarlErickson
+  ms.author: ayangupta
   ms.topic: unit
-  ms.custom: team=cloud_advocates, devx-track-extended-java, linux-related-content
-  ms.contributors: yoterada-12142020
+  ms.custom: team=cloud_advocates, devx-track-extended-java, devx-track-java, linux-related-content
 durationInMinutes: 2
 content: |
   [!include[](includes/6-summary.md)]
-

learn-pr/advocates/create-java-webapp-to-app-service-linux/5-knowledge-check.yml

@@ -1,20 +1,19 @@
-Web applications are used for accounting, inventory, and online web portals. Typically, your application accepts input from users, searches data for the input contents, displays a list, and updates it.
+Web applications play an essential role in managing tasks like accounting, inventory tracking, and providing online portals for users to access and update information. In these applications, users typically submit inputs, which the system processes to search, display, and update relevant data.
 
-In this module, you'll deploy a Java web application to Tomcat on Azure App Service.
-
-:::image type="content" source="../media/primefaces-todo-list.png" alt-text="Screenshot that shows the Java ToDo application sample.":::
+In this module, you tackle the challenge of deploying a Java-based web application. You learn how to create and deploy a simple Tomcat web application using Maven. First you run the app on your local machine, and then you deploy to Azure App Service, where it can be accessed remotely. By the end of this module, you'll have the skills to deploy a Tomcat Java web application, equipping you to deploy web apps in the cloud.
 
 ## Learning objectives
 
-By the end of this module, you will be able to:
+By the end of this module, you'll be able to do the following things:
 
-- Create a Java web application.
-- Run the application locally.
-- Deploy your application to Azure App Service.
+- Create a Tomcat web app using Maven.
+- Deploy the Tomcat app locally to your machine.
+- Deploy the Tomcat app to Azure App Service.
 
 ## Prerequisites
 
-- Your own Azure subscription
-- The [Azure CLI](/cli/azure/install-azure-cli?WT.mc_id=java-9121-yoterada) installed on your computer
-- [JDK 8](https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html)
-- [Tomcat 9.0.x](https://tomcat.apache.org/download-90.cgi) installed on your computer
+- Your own Azure subscription. [Create one for free.](https://azure.microsoft.com/free/).
+- [Azure CLI](/cli/azure/install-azure-cli)
+- [JDK 17](https://www.oracle.com/java/technologies/downloads/)
+- [Apache Tomcat 10.1.x](https://tomcat.apache.org/download-10.cgi)
+- [Maven 3.9.9](https://maven.apache.org/download.cgi?.=)

learn-pr/advocates/create-java-webapp-to-app-service-linux/6-summary.yml

@@ -0,0 +1,16 @@
+## What is Azure App Service?
+
+Azure App Service is a fully managed platform for building, deploying, and scaling web apps. It supports multiple programming languages and frameworks and enables developers to focus on coding, while Azure manages the infrastructure and scaling automatically. Azure App Service offers built-in integration with popular development tools, continuous integration, and deployment capabilities, making it easier to create web and mobile applications with minimal setup.
+
+:::image type="content" source="../media/azure-app-service.png" alt-text="Screenshot of the Azure portal that shows the Azure App Service page." lightbox="../media/azure-app-service.png":::
+
+## Key features of Azure App Service
+
+Azure App Service provides the following key features:
+
+- Multiple language support. Azure App Service supports a wide variety of programming languages and frameworks, including ASP.NET, Java, Python, Node.js, PHP, and Ruby. This flexibility enables developers to choose the best tools for their projects.
+- Built-in DevOps. Azure App Service offers seamless integration with CI/CD pipelines using GitHub, Bitbucket, Azure DevOps, and other popular services. This integration ensures continuous deployment and automated testing in your app's lifecycle.
+- Global scaling. Azure App Service enables developers to scale their applications globally with a few clicks. It offers automatic scaling based on demand, ensuring that your apps can handle traffic spikes without manual intervention.
+- Security and compliance. With Azure App Service, TLS/SSL automatically secures applications, providing secure connections. The platform also complies with various industry standards such as ISO, SOC, and PCI DSS, which are crucial for sensitive applications.
+
+In this unit, you learned about Azure App Service. In the next unit, you run a simple Tomcat web app locally.