Merge pull request GoogleCloudPlatform#303 from sepehre/master

ludoch · web-flow · commit a9ba2575353c · 2016-08-16T19:35:53.000-07:00
Make Endpoints Java sample work end to end
diff --git a/managed_vms/endpoints/README.md b/managed_vms/endpoints/README.md
@@ -1,8 +1,16 @@
 # Google Cloud Endpoints on App Engine flexible environment
 This sample demonstrates how to use Google Cloud Endpoints on Google App Engine Flexible Environment using Java.
 
+## Edit the Swagger API specification
+
+Open the [src/main/appengine/swagger.yaml](src/main/appengine/swagger.yaml) file in your favorite editor, and replace the YOUR-PROJECT-ID `host` line with your actual Google Cloud Platform project Id.
+
 ## Running locally
     $ mvn jetty:run
 
 ## Deploying
     $ mvn gcloud:deploy
+
+## Calling your API
+
+Please refer to the Google Cloud Endpoints [documentation](https://cloud.google.com/endpoints/docs/app-engine/) for App Engine Flexible Environment to learn about creating an API Key and calling your API.
diff --git a/managed_vms/endpoints/pom.xml b/managed_vms/endpoints/pom.xml
@@ -39,7 +39,10 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.111.v20160527</version>
+        <version>2.0.9.121.v20160815</version>
+        <configuration>
+          <gcloud_app_prefix>beta</gcloud_app_prefix>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/managed_vms/endpoints/src/main/appengine/Dockerfile b/managed_vms/endpoints/src/main/appengine/Dockerfile
@@ -1,3 +1,4 @@
 FROM gcr.io/google_appengine/jetty9
 
+ADD managed-vms-endpoints-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war
 ADD . /app

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`FROM gcr.io/google_appengine/jetty9`
`2`	`2`
	`3`	`+ADD managed-vms-endpoints-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war`
`3`	`4`	`ADD . /app`