Merge pull request #64 from GoogleCloudPlatform/fix-helloworld

Extra servlet in Helloworld
GoogleCloudPlatform · Jan 28, 2016 · 0431be7 · 0431be7
2 parents 621a07d + 14a5e93
commit 0431be7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 44 deletions.
diff --git a/managed_vms/helloworld/src/main/java/com/example/appengine/helloworld/HelloServlet.java b/managed_vms/helloworld/src/main/java/com/example/appengine/helloworld/HelloServlet.java
diff --git a/managed_vms/helloworld/src/main/webapp/WEB-INF/web.xml b/managed_vms/helloworld/src/main/webapp/WEB-INF/web.xml
@@ -3,12 +3,25 @@
   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">
-  <servlet>
-    <servlet-name>hello</servlet-name>
-    <servlet-class>com.example.appengine.helloworld.HelloServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>hello</servlet-name>
-    <url-pattern>/</url-pattern>
-  </servlet-mapping>
+  <!-- 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>
+  </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>