Merge branch 'master' into java8

Shun Fan · Shun Fan · commit 86ec40ab87ee · 2016-01-28T15:04:39.000-08:00
diff --git a/managed_vms/cloudstorage/pom.xml b/managed_vms/cloudstorage/pom.xml
@@ -14,11 +14,13 @@
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
+    <!-- [START dependencies] -->
     <dependency>
       <groupId>com.google.gcloud</groupId>
       <artifactId>gcloud-java-storage</artifactId>
       <version>0.1.3</version>
     </dependency>
+    <!-- [END dependencies] -->
   </dependencies>
   <build>
     <!-- for hot reload of the web application -->
diff --git a/managed_vms/helloworld/README.md b/managed_vms/helloworld/README.md
@@ -1,11 +1,8 @@
 # Appengine Helloworld sample for Google App Engine
 This sample demonstrates how to deploy an application on Google App Engine
-## Setup
-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
 
 ## Running locally
-    $ mvn appengine:devserver
+    $ mvn jetty:run
 
 ## Deploying
-    $ mvn appengine:update
+    $ mvn gcloud:deploy
diff --git a/managed_vms/helloworld/pom.xml b/managed_vms/helloworld/pom.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.managedvms</groupId>
-  <artifactId>appengine-helloworld-mvm</artifactId>
+  <artifactId>managedvms-helloworld-mvm</artifactId>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -15,6 +17,7 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
+
   <build>
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
diff --git a/managed_vms/helloworld/src/main/webapp/WEB-INF/web.xml b/managed_vms/helloworld/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  version="2.5">
+  <!-- turn security on by default -->
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>secured-resource</web-resource-name>
+      <url-pattern>/*</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>*</role-name>
+    </auth-constraint>
+    <user-data-constraint>
+         <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+    </user-data-constraint>
+  </security-constraint>
+</web-app>
diff --git a/managed_vms/memcache/pom.xml b/managed_vms/memcache/pom.xml
@@ -14,11 +14,13 @@
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
+    <!-- [START dependencies] -->
     <dependency>
       <groupId>com.googlecode.xmemcached</groupId>
       <artifactId>xmemcached</artifactId>
       <version>2.0.0</version>
     </dependency>
+    <!-- [END dependencies] -->
   </dependencies>
   <build>
     <!-- for hot reload of the web application -->
