From 21e16af76557a0dc56837ced218032279afed3f2 Mon Sep 17 00:00:00 2001
From: tinehinene <123732964+tinehinene@users.noreply.github.com>
Date: Fri, 27 Jan 2023 14:05:49 +0100
Subject: [PATCH 1/2] Add or update the Azure App Service build and deployment
 workflow config

---
 .github/workflows/tomcat_appjavatina.yml | 53 ++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 .github/workflows/tomcat_appjavatina.yml

diff --git a/.github/workflows/tomcat_appjavatina.yml b/.github/workflows/tomcat_appjavatina.yml
new file mode 100644
index 000000000..b2bd97e3d
--- /dev/null
+++ b/.github/workflows/tomcat_appjavatina.yml
@@ -0,0 +1,53 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy WAR app to Azure Web App - AppJavaTina
+
+on:
+  push:
+    branches:
+      - tomcat
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Java version
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+
+      - name: Build with Maven
+        run: mvn clean install
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v2
+        with:
+          name: java-app
+          path: '${{ github.workspace }}/target/*.war'
+
+  deploy:
+    runs-on: windows-latest
+    needs: build
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: java-app
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: 'AppJavaTina'
+          slot-name: 'Production'
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_3A4C7131983B475CA7E3A738825E8F3C }}
+          package: '*.war'

From 40e2aed8ac86ff39516d13ffc4b469fd79feea2d Mon Sep 17 00:00:00 2001
From: tinehinene <123732964+tinehinene@users.noreply.github.com>
Date: Fri, 27 Jan 2023 14:35:14 +0100
Subject: [PATCH 2/2] Update DemoApplication.java

---
 src/main/java/com/example/demo/DemoApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java
index 1c5eba242..eee0e9836 100644
--- a/src/main/java/com/example/demo/DemoApplication.java
+++ b/src/main/java/com/example/demo/DemoApplication.java
@@ -16,6 +16,6 @@ public static void main(String[] args) {
 
 	@RequestMapping("/")
 	String sayHello() {
-		return "Hello World!";
+		return "Hello and Welcome to My World!";
 	}
 }