Sample deploy improvements

samples/02.echo-bot/README.md

@@ -59,23 +59,18 @@ Replace the values for `<appid>`, `<appsecret>`, `<botname>`, and `<groupname>`
 #### To an existing Resource Group
 `az group deployment create --name "echoBotDeploy" --resource-group "<groupname>" --template-file ".\deploymentTemplates\template-with-preexisting-rg.json" --parameters botId="<botname>" appId="<appid>" appSecret="<appsecret>"`
 
-### 5. Update the pom.xml
-In pom.xml update the following nodes under azure-webapp-maven-plugin
-- `resourceGroup` using the `<groupname>` used above
-- `appName` using the `<botname>` used above
-
-### 6. Update app id and password
+### 5. Update app id and password
 In src/main/resources/application.properties update 
   - `MicrosoftAppPassword` with the botsecret value
   - `MicrosoftAppId` with the appid from the first step
 
-### 7. Deploy the code
+### 6. Deploy the code
 - Execute `mvn clean package` 
-- Execute `mvn azure-webapp:deploy`
+- Execute `mvn azure-webapp:deploy -Dgroupname="<groupname>" -Dbotname="<botname>"`
 
 If the deployment is successful, you will be able to test it via "Test in Web Chat" from the Azure Portal using the "Bot Channel Registration" for the bot.
 
-After the bot is deployed, you only need to execute #7 if you make changes to the bot.
+After the bot is deployed, you only need to execute #6 if you make changes to the bot.
 
 
 ## Further reading

samples/02.echo-bot/pom.xml

@@ -143,8 +143,8 @@
                   <version>1.7.0</version>
                   <configuration>
                       <schemaVersion>V2</schemaVersion>
-                      <resourceGroup>{groupname}</resourceGroup>
-                      <appName>{botname}</appName>
+                      <resourceGroup>${groupname}</resourceGroup>
+                      <appName>${botname}</appName>
                       <appSettings>
                           <property>
                               <name>JAVA_OPTS</name>

samples/03.welcome-user/README.md

@@ -59,23 +59,18 @@ Replace the values for `<appid>`, `<appsecret>`, `<botname>`, and `<groupname>`
 #### To an existing Resource Group
 `az group deployment create --name "stateBotDeploy" --resource-group "<groupname>" --template-file ".\deploymentTemplates\template-with-preexisting-rg.json" --parameters botId="<botname>" appId="<appid>" appSecret="<appsecret>"`
 
-### 5. Update the pom.xml
-In pom.xml update the following nodes under azure-webapp-maven-plugin
-- `resourceGroup` using the `<groupname>` used above
-- `appName` using the `<botname>` used above
-
-### 6. Update app id and password
+### 5. Update app id and password
 In src/main/resources/application.properties update 
   - `MicrosoftAppPassword` with the botsecret value
   - `MicrosoftAppId` with the appid from the first step
 
-### 7. Deploy the code
+### 6. Deploy the code
 - Execute `mvn clean package` 
-- Execute `mvn azure-webapp:deploy`
+- Execute `mvn azure-webapp:deploy -Dgroupname="<groupname>" -Dbotname="<botname>"`
 
 If the deployment is successful, you will be able to test it via "Test in Web Chat" from the Azure Portal using the "Bot Channel Registration" for the bot.
 
-After the bot is deployed, you only need to execute #7 if you make changes to the bot.
+After the bot is deployed, you only need to execute #6 if you make changes to the bot.
 
 
 ## Further reading

samples/03.welcome-user/pom.xml

@@ -143,8 +143,8 @@
                   <version>1.7.0</version>
                   <configuration>
                       <schemaVersion>V2</schemaVersion>
-                      <resourceGroup>{groupname}</resourceGroup>
-                      <appName>{botname}</appName>
+                      <resourceGroup>${groupname}</resourceGroup>
+                      <appName>${botname}</appName>
                       <appSettings>
                           <property>
                               <name>JAVA_OPTS</name>

samples/08.suggested-actions/README.md

@@ -59,23 +59,18 @@ Replace the values for `<appid>`, `<appsecret>`, `<botname>`, and `<groupname>`
 #### To an existing Resource Group
 `az group deployment create --name "echoBotDeploy" --resource-group "<groupname>" --template-file ".\deploymentTemplates\template-with-preexisting-rg.json" --parameters botId="<botname>" appId="<appid>" appSecret="<appsecret>"`
 
-### 5. Update the pom.xml
-In pom.xml update the following nodes under azure-webapp-maven-plugin
-- `resourceGroup` using the `<groupname>` used above
-- `appName` using the `<botname>` used above
-
-### 6. Update app id and password
+### 5. Update app id and password
 In src/main/resources/application.properties update 
   - `MicrosoftAppPassword` with the botsecret value
   - `MicrosoftAppId` with the appid from the first step
 
-### 7. Deploy the code
+### 6. Deploy the code
 - Execute `mvn clean package` 
-- Execute `mvn azure-webapp:deploy`
+- Execute `mvn azure-webapp:deploy -Dgroupname="<groupname>" -Dbotname="<botname>"`
 
 If the deployment is successful, you will be able to test it via "Test in Web Chat" from the Azure Portal using the "Bot Channel Registration" for the bot.
 
-After the bot is deployed, you only need to execute #7 if you make changes to the bot.
+After the bot is deployed, you only need to execute #6 if you make changes to the bot.
 
 
 ## Further reading

samples/08.suggested-actions/pom.xml

@@ -143,8 +143,8 @@
                   <version>1.7.0</version>
                   <configuration>
                       <schemaVersion>V2</schemaVersion>
-                      <resourceGroup>{groupname}</resourceGroup>
-                      <appName>{botname}</appName>
+                      <resourceGroup>${groupname}</resourceGroup>
+                      <appName>${botname}</appName>
                       <appSettings>
                           <property>
                               <name>JAVA_OPTS</name>

samples/16.proactive-messages/README.md

@@ -68,23 +68,18 @@ Replace the values for `<appid>`, `<appsecret>`, `<botname>`, and `<groupname>`
 #### To an existing Resource Group
 `az group deployment create --name "echoBotDeploy" --resource-group "<groupname>" --template-file ".\deploymentTemplates\template-with-preexisting-rg.json" --parameters botId="<botname>" appId="<appid>" appSecret="<appsecret>"`
 
-### 5. Update the pom.xml
-In pom.xml update the following nodes under azure-webapp-maven-plugin
-- `resourceGroup` using the `<groupname>` used above
-- `appName` using the `<botname>` used above
-
-### 6. Update app id and password
+### 5. Update app id and password
 In src/main/resources/application.properties update 
   - `MicrosoftAppPassword` with the botsecret value
   - `MicrosoftAppId` with the appid from the first step
 
-### 7. Deploy the code
+### 6. Deploy the code
 - Execute `mvn clean package` 
-- Execute `mvn azure-webapp:deploy`
+- Execute `mvn azure-webapp:deploy -Dgroupname="<groupname>" -Dbotname="<botname>"`
 
 If the deployment is successful, you will be able to test it via "Test in Web Chat" from the Azure Portal using the "Bot Channel Registration" for the bot.
 
-After the bot is deployed, you only need to execute #7 if you make changes to the bot.
+After the bot is deployed, you only need to execute #6 if you make changes to the bot.
 
 
 ## Further reading

samples/16.proactive-messages/pom.xml

@@ -143,8 +143,8 @@
                   <version>1.7.0</version>
                   <configuration>
                       <schemaVersion>V2</schemaVersion>
-                      <resourceGroup>{groupname}</resourceGroup>
-                      <appName>{botname}</appName>
+                      <resourceGroup>${groupname}</resourceGroup>
+                      <appName>${botname}</appName>
                       <appSettings>
                           <property>
                               <name>JAVA_OPTS</name>

samples/45.state-management/README.md

@@ -62,23 +62,18 @@ Replace the values for `<appid>`, `<appsecret>`, `<botname>`, and `<groupname>`
 #### To an existing Resource Group
 `az group deployment create --name "stateBotDeploy" --resource-group "<groupname>" --template-file ".\deploymentTemplates\template-with-preexisting-rg.json" --parameters botId="<botname>" appId="<appid>" appSecret="<appsecret>"`
 
-### 5. Update the pom.xml
-In pom.xml update the following nodes under azure-webapp-maven-plugin
-- `resourceGroup` using the `<groupname>` used above
-- `appName` using the `<botname>` used above
-
-### 6. Update app id and password
+### 5. Update app id and password
 In src/main/resources/application.properties update 
   - `MicrosoftAppPassword` with the botsecret value
   - `MicrosoftAppId` with the appid from the first step
 
-### 7. Deploy the code
+### 6. Deploy the code
 - Execute `mvn clean package` 
-- Execute `mvn azure-webapp:deploy`
+- Execute `mvn azure-webapp:deploy -Dgroupname="<groupname>" -Dbotname="<botname>"`
 
 If the deployment is successful, you will be able to test it via "Test in Web Chat" from the Azure Portal using the "Bot Channel Registration" for the bot.
 
-After the bot is deployed, you only need to execute #7 if you make changes to the bot.
+After the bot is deployed, you only need to execute #6 if you make changes to the bot.
 
 
 ## Further reading

samples/45.state-management/pom.xml

@@ -142,8 +142,8 @@
                   <version>1.7.0</version>
                   <configuration>
                       <schemaVersion>V2</schemaVersion>
-                      <resourceGroup>{groupname}</resourceGroup>
-                      <appName>{botname}</appName>
+                      <resourceGroup>${groupname}</resourceGroup>
+                      <appName>${botname}</appName>
                       <appSettings>
                           <property>
                               <name>JAVA_OPTS</name>

samples/47.inspection/README.md

@@ -74,23 +74,18 @@ Replace the values for `<appid>`, `<appsecret>`, `<botname>`, and `<groupname>`
 #### To an existing Resource Group
 `az group deployment create --name "echoBotDeploy" --resource-group "<groupname>" --template-file ".\deploymentTemplates\template-with-preexisting-rg.json" --parameters botId="<botname>" appId="<appid>" appSecret="<appsecret>"`
 
-### 5. Update the pom.xml
-In pom.xml update the following nodes under azure-webapp-maven-plugin
-- `resourceGroup` using the `<groupname>` used above
-- `appName` using the `<botname>` used above
-
-### 6. Update app id and password
+### 5. Update app id and password
 In src/main/resources/application.properties update 
   - `MicrosoftAppPassword` with the botsecret value
   - `MicrosoftAppId` with the appid from the first step
 
-### 7. Deploy the code
+### 6. Deploy the code
 - Execute `mvn clean package` 
-- Execute `mvn azure-webapp:deploy`
+- Execute `mvn azure-webapp:deploy -Dgroupname="<groupname>" -Dbotname="<botname>"`
 
 If the deployment is successful, you will be able to test it via "Test in Web Chat" from the Azure Portal using the "Bot Channel Registration" for the bot.
 
-After the bot is deployed, you only need to execute #7 if you make changes to the bot.
+After the bot is deployed, you only need to execute #6 if you make changes to the bot.
 
 
 ## Further reading

samples/47.inspection/pom.xml

@@ -143,8 +143,8 @@
                   <version>1.7.0</version>
                   <configuration>
                       <schemaVersion>V2</schemaVersion>
-                      <resourceGroup>{groupname}</resourceGroup>
-                      <appName>{botname}</appName>
+                      <resourceGroup>${groupname}</resourceGroup>
+                      <appName>${botname}</appName>
                       <appSettings>
                           <property>
                               <name>JAVA_OPTS</name>

samples/servlet-echo/README.md

@@ -41,23 +41,18 @@ Replace the values for `<appid>`, `<appsecret>`, `<botname>`, and `<groupname>`
 #### To an existing Resource Group
 `az group deployment create --name "echoBotDeploy" --resource-group "<groupname>" --template-file ".\deploymentTemplates\template-with-preexisting-rg.json" --parameters botId="<botname>" appId="<appid>" appSecret="<appsecret>"`
 
-### 5. Update the pom.xml
-In pom.xml update the following nodes under azure-webapp-maven-plugin
-- `resourceGroup` using the `<groupname>` used above
-- `appName` using the `<botname>` used above
-
-### 6. Update app id and password
+### 5. Update app id and password
 In src/main/resources/application.properties update 
   - `MicrosoftAppPassword` with the appsecret value
   - `MicrosoftAppId` with the appid from the first step
 
-### 7. Deploy the code
+### 6. Deploy the code
 - Execute `mvn clean package` 
-- Execute `mvn azure-webapp:deploy`
+- Execute `mvn azure-webapp:deploy -Dgroupname="<groupname>" -Dbotname="<botname>"`
 
 If the deployment is successful, you will be able to test it via "Test in Web Chat" from the Azure Portal using the "Bot Channel Registration" for the bot.
 
-After the bot is deployed, you only need to execute #7 if you make changes to the bot.
+After the bot is deployed, you only need to execute #6 if you make changes to the bot.
 
 
 ## Reference

samples/servlet-echo/pom.xml

@@ -141,8 +141,8 @@
                   <version>1.7.0</version>
                   <configuration>
                       <schemaVersion>V2</schemaVersion>
-                      <resourceGroup>{groupname}</resourceGroup>
-                      <appName>{botname}</appName>
+                      <resourceGroup>${groupname}</resourceGroup>
+                      <appName>${botname}</appName>
                       <appSettings>
                           <property>
                               <name>JAVA_OPTS</name>