From a4111dd92322743414236da83018126867ca5a81 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Mon, 14 Dec 2015 11:24:24 -0800
Subject: [PATCH] Changed App Identity sample to use Managed VMs.

---
 appengine/appidentity/README.md                   | 15 +++++++++------
 appengine/appidentity/pom.xml                     |  4 ++--
 .../src/main/webapp/WEB-INF/appengine-web.xml     |  1 +
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/appengine/appidentity/README.md b/appengine/appidentity/README.md
index 89a32c48402..95f7dfd1ff2 100644
--- a/appengine/appidentity/README.md
+++ b/appengine/appidentity/README.md
@@ -2,26 +2,29 @@
 This sample demonstrates how to use the App Identity APIs on Google App Engine
 
 ## Running locally
-    $ mvn appengine:devserver
+This example uses the
+[Maven gcloud plugin](https://cloud.google.com/appengine/docs/java/managed-vms/maven).
+To run this sample locally:
+
+    $ mvn gcloud:run
 
 ## Deploying
 In the following command, replace YOUR-PROJECT-ID with your
 [Google Cloud Project ID](https://developers.google.com/console/help/new/#projectnumber)
 and YOUR-VERSION with a suitable version identifier.
 
-    $ mvn appengine:update -Dappengine.appId=YOUR-PROJECT-ID -Dappengine.version=YOUR-VERSION
+    $ mvn gcloud:deploy -Dversion=YOUR-VERSION -Dgcloud_project=YOUR-PROJECT-ID
 
 ## Setup
 To save your project settings so that you don't need to enter the
-`-Dappengine.appId=YOUR-CLOUD-PROJECT-ID` or
-`-Dappengine.version=YOUR-VERSION-NAME` parameters, you can make the following
-changes:
+`-Dgcloud_project=YOUR-CLOUD-PROJECT-ID` or `-Dversion=YOUR-VERSION-NAME`
+parameters, you can make the following changes:
 
 1. Update the <application> tag in src/main/webapp/WEB-INF/appengine-web.xml with your project name
 1. Update the <version> tag in src/main/webapp/WEB-INF/appengine-web.xml with your version name
 
 You will now be able to run
 
-    $ mvn appengine:update
+    $ mvn gcloud:deploy
 
 without the need for any additional paramters.
diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml
index d212b44fc33..27559481a88 100644
--- a/appengine/appidentity/pom.xml
+++ b/appengine/appidentity/pom.xml
@@ -94,8 +94,8 @@ Copyright 2015 Google Inc. All Rights Reserved.
       </plugin>
       <plugin>
         <groupId>com.google.appengine</groupId>
-        <artifactId>appengine-maven-plugin</artifactId>
-        <version>${appengine.target.version}</version>
+        <artifactId>gcloud-maven-plugin</artifactId>
+        <version>2.0.9.90.v20151210</version>
       </plugin>
     </plugins>
   </build>
diff --git a/appengine/appidentity/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/appidentity/src/main/webapp/WEB-INF/appengine-web.xml
index c9e245399bf..c3df08fec7d 100644
--- a/appengine/appidentity/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/appidentity/src/main/webapp/WEB-INF/appengine-web.xml
@@ -3,4 +3,5 @@
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
   <threadsafe>true</threadsafe>
+  <vm>true</vm>
 </appengine-web-app>