Merge pull request #66 from GoogleCloudPlatform/mvm-update

Fix helloWorld
GoogleCloudPlatform · Jan 28, 2016 · 7f7e0a1 · 7f7e0a1
2 parents 28e7d84 + 3f6f9a7
commit 7f7e0a1
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 32 deletions.
diff --git a/managed_vms/helloworld/README.md b/managed_vms/helloworld/README.md
@@ -2,7 +2,7 @@
 This sample demonstrates how to deploy an application on Google App Engine
 
 ## Running locally
-    $ mvn gcloud:run
+    $ mvn jetty:run
 
 ## Deploying
     $ 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,10 +17,18 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
+
   <build>
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
+
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>9.3.7.v20160115</version>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
@@ -27,20 +37,23 @@
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <version>3.3</version>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>gcloud-maven-plugin</artifactId>
-        <version>2.0.9.90.v20151210</version>
+        <version>2.0.9.92.v20160118</version>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -55,6 +68,7 @@
           <execution><goals><goal>check</goal></goals></execution>
         </executions>
       </plugin>
+
     </plugins>
   </build>
 </project>
diff --git a/managed_vms/helloworld/src/main/appengine/app.yaml b/managed_vms/helloworld/src/main/appengine/app.yaml
@@ -0,0 +1,2 @@
+vm:      true
+runtime: java
diff --git a/managed_vms/helloworld/src/main/webapp/WEB-INF/appengine-web.xml b/managed_vms/helloworld/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/managed_vms/helloworld/src/main/webapp/WEB-INF/web.xml b/managed_vms/helloworld/src/main/webapp/WEB-INF/web.xml
@@ -5,23 +5,15 @@
   version="2.5">
   <!-- turn security on by default -->
   <security-constraint>
-      <web-resource-collection>
-          <web-resource-name>profile</web-resource-name>
-          <url-pattern>/profile/*</url-pattern>
-      </web-resource-collection>
-      <auth-constraint>
-          <role-name>*</role-name>
-      </auth-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>
-
-  <security-constraint>
-      <web-resource-collection>
-          <web-resource-name>admin</web-resource-name>
-          <url-pattern>/admin/*</url-pattern>
-      </web-resource-collection>
-      <auth-constraint>
-          <role-name>admin</role-name>
-      </auth-constraint>
-  </security-constraint>
-
 </web-app>