From 99d9dd31f7302d1c07c537ff3830cad87355359d Mon Sep 17 00:00:00 2001
From: Tracy Boehrer <tracy.boehrer@gmail.com>
Date: Thu, 5 Sep 2019 14:44:55 -0500
Subject: [PATCH] Adjusted ARM template for Servlet sample to run on Windows.

---
 .../new-rg-parameters.json                    | 42 -------------------
 .../preexisting-rg-parameters.json            | 39 -----------------
 .../template-with-new-rg.json                 |  7 ++--
 .../template-with-preexisting-rg.json         |  8 ++--
 samples/servlet-echo/pom.xml                  |  4 +-
 5 files changed, 8 insertions(+), 92 deletions(-)
 delete mode 100644 samples/servlet-echo/deploymentTemplates/new-rg-parameters.json
 delete mode 100644 samples/servlet-echo/deploymentTemplates/preexisting-rg-parameters.json

diff --git a/samples/servlet-echo/deploymentTemplates/new-rg-parameters.json b/samples/servlet-echo/deploymentTemplates/new-rg-parameters.json
deleted file mode 100644
index ead33909..00000000
--- a/samples/servlet-echo/deploymentTemplates/new-rg-parameters.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "groupLocation": {
-            "value": ""
-        },
-        "groupName": {
-            "value": ""
-        },
-        "appId": {
-            "value": ""
-        },
-        "appSecret": {
-            "value": ""
-        },
-        "botId": {
-            "value": ""
-        },
-        "botSku": {
-            "value": ""
-        },
-        "newAppServicePlanName": {
-            "value": ""
-        },
-        "newAppServicePlanSku": {
-            "value": {
-                "name": "S1",
-                "tier": "Standard",
-                "size": "S1",
-                "family": "S",
-                "capacity": 1
-            }
-        },
-        "newAppServicePlanLocation": {
-            "value": ""
-        },
-        "newWebAppName": {
-            "value": ""
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/servlet-echo/deploymentTemplates/preexisting-rg-parameters.json b/samples/servlet-echo/deploymentTemplates/preexisting-rg-parameters.json
deleted file mode 100644
index b6f5114f..00000000
--- a/samples/servlet-echo/deploymentTemplates/preexisting-rg-parameters.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "appId": {
-            "value": ""
-        },
-        "appSecret": {
-            "value": ""
-        },
-        "botId": {
-            "value": ""
-        },
-        "botSku": {
-            "value": ""
-        },
-        "newAppServicePlanName": {
-            "value": ""
-        },
-        "newAppServicePlanSku": {
-            "value": {
-                "name": "S1",
-                "tier": "Standard",
-                "size": "S1",
-                "family": "S",
-                "capacity": 1
-            }
-        },
-        "appServicePlanLocation": {
-            "value": ""
-        },
-        "existingAppServicePlan": {
-            "value": ""
-        },
-        "newWebAppName": {
-            "value": ""
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/servlet-echo/deploymentTemplates/template-with-new-rg.json b/samples/servlet-echo/deploymentTemplates/template-with-new-rg.json
index dcd6260a..b12b7056 100644
--- a/samples/servlet-echo/deploymentTemplates/template-with-new-rg.json
+++ b/samples/servlet-echo/deploymentTemplates/template-with-new-rg.json
@@ -116,10 +116,9 @@
                             "apiVersion": "2018-02-01",
                             "location": "[variables('effectivePlanLocation')]",
                             "sku": "[parameters('newAppServicePlanSku')]",
-                            "kind": "linux",
+                            "kind": "app",
                             "properties": {
-                                "name": "[variables('appServicePlanName')]",
-                                "reserved":true
+                                "name": "[variables('appServicePlanName')]"
                             }
                         },
                         {
@@ -188,4 +187,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/samples/servlet-echo/deploymentTemplates/template-with-preexisting-rg.json b/samples/servlet-echo/deploymentTemplates/template-with-preexisting-rg.json
index b790d2bd..5f5b6fba 100644
--- a/samples/servlet-echo/deploymentTemplates/template-with-preexisting-rg.json
+++ b/samples/servlet-echo/deploymentTemplates/template-with-preexisting-rg.json
@@ -87,10 +87,9 @@
             "apiVersion": "2018-02-01",
             "location": "[variables('resourcesLocation')]",
             "sku": "[parameters('newAppServicePlanSku')]",
-            "kind": "linux",
+            "kind": "app",
             "properties": {
-                "name": "[variables('servicePlanName')]",
-                "reserved":true
+                "name": "[variables('servicePlanName')]"
             }
         },
         {
@@ -107,7 +106,6 @@
                 "name": "[variables('webAppName')]",
                 "serverFarmId": "[variables('servicePlanName')]",
                 "siteConfig": {
-                    "linuxFxVersion": "JAVA|8-jre8",
                     "appSettings": [
                         {
                             "name": "JAVA_OPTS",
@@ -155,4 +153,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/samples/servlet-echo/pom.xml b/samples/servlet-echo/pom.xml
index 36f020ab..8a01391e 100644
--- a/samples/servlet-echo/pom.xml
+++ b/samples/servlet-echo/pom.xml
@@ -137,8 +137,8 @@
                         </property>
                     </appSettings>
                     <runtime>
-                        <os>linux</os>
-                        <javaVersion>jre8</javaVersion>
+                        <os>windows</os>
+                        <javaVersion>1.8</javaVersion>
                         <webContainer>tomcat 9.0</webContainer>
                     </runtime>
                     <deployment>