From 62f5a656358da9d8607687bc270bd93b79948258 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Tue, 28 Jun 2016 14:50:08 -0700 Subject: [PATCH] App Engine standard env uses Java Servlets 2.5. According to: https://cloud.google.com/appengine/docs/java/runtime#Java_Introduction "App Engine uses the Java Servlet 2.5 standard for web applications." This updates these samples to use version 2.5. Annotations are not supported. I see that the SendGrid servlet already has a web.xml defined, so the annotation were redundant, anyway (and not functional). --- appengine/analytics/pom.xml | 4 ++-- appengine/mailgun/pom.xml | 4 ++-- appengine/mailjet/pom.xml | 4 ++-- appengine/memcache/pom.xml | 4 ++-- appengine/remote/remote-server/pom.xml | 4 ++-- appengine/sendgrid/pom.xml | 4 ++-- .../java/com/example/appengine/sendgrid/SendEmailServlet.java | 2 -- appengine/twilio/pom.xml | 4 ++-- .../java/com/example/appengine/twilio/SendSmsServlet.java | 2 -- 9 files changed, 14 insertions(+), 18 deletions(-) diff --git a/appengine/analytics/pom.xml b/appengine/analytics/pom.xml index 57c775a3b73..d89ce5e467a 100644 --- a/appengine/analytics/pom.xml +++ b/appengine/analytics/pom.xml @@ -39,8 +39,8 @@ javax.servlet - javax.servlet-api - 3.1.0 + servlet-api + 2.5 jar provided diff --git a/appengine/mailgun/pom.xml b/appengine/mailgun/pom.xml index 417bbb92225..794c8431010 100644 --- a/appengine/mailgun/pom.xml +++ b/appengine/mailgun/pom.xml @@ -28,8 +28,8 @@ javax.servlet - javax.servlet-api - 3.1.0 + servlet-api + 2.5 jar provided diff --git a/appengine/mailjet/pom.xml b/appengine/mailjet/pom.xml index 46a3c91d259..f7587bcf348 100644 --- a/appengine/mailjet/pom.xml +++ b/appengine/mailjet/pom.xml @@ -35,8 +35,8 @@ javax.servlet - javax.servlet-api - 3.1.0 + servlet-api + 2.5 jar provided diff --git a/appengine/memcache/pom.xml b/appengine/memcache/pom.xml index b10bb793e3d..c77483c4c29 100644 --- a/appengine/memcache/pom.xml +++ b/appengine/memcache/pom.xml @@ -30,8 +30,8 @@ Copyright 2015 Google Inc. All Rights Reserved. javax.servlet - javax.servlet-api - 3.1.0 + servlet-api + 2.5 jar provided diff --git a/appengine/remote/remote-server/pom.xml b/appengine/remote/remote-server/pom.xml index 4dd421113dc..54b5364fa93 100644 --- a/appengine/remote/remote-server/pom.xml +++ b/appengine/remote/remote-server/pom.xml @@ -39,8 +39,8 @@ javax.servlet - javax.servlet-api - 3.1.0 + servlet-api + 2.5 jar provided diff --git a/appengine/sendgrid/pom.xml b/appengine/sendgrid/pom.xml index e3566810891..4e8f7e34c26 100644 --- a/appengine/sendgrid/pom.xml +++ b/appengine/sendgrid/pom.xml @@ -30,8 +30,8 @@ Copyright 2015 Google Inc. All Rights Reserved. javax.servlet - javax.servlet-api - 3.1.0 + servlet-api + 2.5 jar provided diff --git a/appengine/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java b/appengine/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java index 63a9cbd5434..421543ac98b 100644 --- a/appengine/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java +++ b/appengine/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java @@ -22,14 +22,12 @@ import java.io.IOException; import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; // [START example] @SuppressWarnings("serial") -@WebServlet(name = "sendemail", value = "/send/email") public class SendEmailServlet extends HttpServlet { @Override diff --git a/appengine/twilio/pom.xml b/appengine/twilio/pom.xml index b24c86b2d99..7db6abaab1e 100644 --- a/appengine/twilio/pom.xml +++ b/appengine/twilio/pom.xml @@ -37,8 +37,8 @@ Copyright 2015 Google Inc. All Rights Reserved. javax.servlet - javax.servlet-api - 3.1.0 + servlet-api + 2.5 jar provided diff --git a/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java b/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java index 5270acb5a84..da6ecb0c941 100644 --- a/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java +++ b/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java @@ -29,14 +29,12 @@ import java.util.List; import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; // [START example] @SuppressWarnings("serial") -@WebServlet(name = "sendsms", value = "/sms/send") public class SendSmsServlet extends HttpServlet { @Override