From web.xml -> @WebServlet (#675)

1. remove web.xml 2. add @WebServlet 3. Fixup many pom.xml to add maven plugin 4. Rename a few index.html / index.jsp files.
GoogleCloudPlatform · May 23, 2017 · 8ebf743 · 8ebf743
1 parent 6e8c925
commit 8ebf743
Show file tree

Hide file tree

Showing 46 changed files with 368 additions and 642 deletions.
diff --git a/appengine-java8/images/pom.xml b/appengine-java8/images/pom.xml
@@ -52,6 +52,7 @@ Copyright 2015 Google Inc.
       <scope>provided</scope>
     </dependency>
   </dependencies>
+
   <build>
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
@@ -65,6 +66,12 @@ Copyright 2015 Google Inc.
           <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/appengine-java8/images/src/main/java/com/example/appengine/images/ImagesServlet.java b/appengine-java8/images/src/main/java/com/example/appengine/images/ImagesServlet.java
@@ -15,6 +15,7 @@
  */
 
 package com.example.appengine.images;
+
 import com.google.appengine.api.blobstore.BlobKey;
 import com.google.appengine.api.blobstore.BlobstoreService;
 import com.google.appengine.api.blobstore.BlobstoreServiceFactory;
@@ -35,12 +36,16 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
+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 = "images",
+    description = "Images: Write an image to a bucket and display it in various sizes",
+    urlPatterns = "/images")
 public class ImagesServlet extends HttpServlet {
   final String bucket = "YOUR-BUCKETNAME-HERE";
 
@@ -59,7 +64,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
     // Read the image.jpg resource into a ByteBuffer.
     FileInputStream fileInputStream = new FileInputStream(new File("WEB-INF/image.jpg"));
     FileChannel fileChannel = fileInputStream.getChannel();
-    ByteBuffer byteBuffer = ByteBuffer.allocate((int)fileChannel.size());
+    ByteBuffer byteBuffer = ByteBuffer.allocate((int) fileChannel.size());
     fileChannel.read(byteBuffer);
 
     byte[] imageBytes = byteBuffer.array();

diff --git a/appengine-java8/images/src/main/webapp/WEB-INF/web.xml b/appengine-java8/images/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/logs/pom.xml b/appengine-java8/logs/pom.xml
@@ -15,62 +15,68 @@
  limitations under the License.
 -->
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>war</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <groupId>com.example.appengine</groupId>
-  <artifactId>appengine-logs-j8</artifactId>
-  <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
-  <parent>
-    <groupId>com.google.cloud</groupId>
-    <artifactId>appengine-java8-samples</artifactId>
-    <version>1.0.0</version>
-    <relativePath>..</relativePath>
-  </parent>
-  <dependencies>
-   <dependency>
-      <groupId>com.google.appengine</groupId>
-      <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>${appengine.sdk.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>20.0</version>
-    </dependency>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>war</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <groupId>com.example.appengine</groupId>
+    <artifactId>appengine-logs-j8</artifactId>
+    <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
+    <parent>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>appengine-java8-samples</artifactId>
+        <version>1.0.0</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>com.google.appengine</groupId>
+            <artifactId>appengine-api-1.0-sdk</artifactId>
+            <version>${appengine.sdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>20.0</version>
+        </dependency>
 
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <type>jar</type>
-      <scope>provided</scope>
-    </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
 
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-      <version>20160810</version>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>2.9.9</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <!-- for hot reload of the web application -->
-    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
-    <plugins>
-      <plugin>
-        <groupId>com.google.cloud.tools</groupId>
-        <artifactId>appengine-maven-plugin</artifactId>
-        <version>1.3.1</version>
-        <configuration>
-          <deploy.promote>true</deploy.promote>
-          <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20160810</version>
+        </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.9.9</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <!-- for hot reload of the web application -->
+        <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes
+        </outputDirectory>
+        <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>appengine-maven-plugin</artifactId>
+                <version>1.3.1</version>
+                <configuration>
+                    <deploy.promote>true</deploy.promote>
+                    <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/appengine-java8/logs/src/main/java/com/example/appengine/logs/LogsServlet.java b/appengine-java8/logs/src/main/java/com/example/appengine/logs/LogsServlet.java
@@ -25,13 +25,16 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 
 // Get request logs along with their app log lines and display them 5 at
 // a time, using a Next link to cycle through to the next 5.
+@WebServlet(name = "logs", description = "Logs: Display 5 lines of the request log",
+    urlPatterns = "/logs")
 public class LogsServlet extends HttpServlet {
   @Override
   public void doGet(HttpServletRequest req, HttpServletResponse resp)

diff --git a/appengine-java8/logs/src/main/webapp/WEB-INF/web.xml b/appengine-java8/logs/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/memcache/pom.xml b/appengine-java8/memcache/pom.xml
@@ -63,6 +63,13 @@ Copyright 2015 Google Inc.
           <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
+
     </plugins>
   </build>
 </project>
diff --git a/...ava8/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java b/...ava8/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java
@@ -27,11 +27,14 @@
 import java.util.logging.Level;
 
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
+@WebServlet(name = "MemcacheAsync", description = "Memcache: Async Access",
+    urlPatterns = "/memcache/async")
 public class MemcacheAsyncCacheServlet extends HttpServlet {
 
   @Override

diff --git a/...a8/memcache/src/main/java/com/example/appengine/memcache/MemcacheBestPracticeServlet.java b/...a8/memcache/src/main/java/com/example/appengine/memcache/MemcacheBestPracticeServlet.java
@@ -24,12 +24,15 @@
 import java.util.logging.Level;
 
 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 = "memcache", description = "Memcache: Best Practices",
+    urlPatterns = "/memcache")
 public class MemcacheBestPracticeServlet extends HttpServlet {
 
   @Override

diff --git a/...ava8/memcache/src/main/java/com/example/appengine/memcache/MemcacheConcurrentServlet.java b/...ava8/memcache/src/main/java/com/example/appengine/memcache/MemcacheConcurrentServlet.java
@@ -24,12 +24,15 @@
 import java.math.BigInteger;
 
 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 = "MemcacheConcurrent", description = "Memcache: Concurrent",
+    urlPatterns = "/memcache/concurrent")
 public class MemcacheConcurrentServlet extends HttpServlet {
 
   @Override

diff --git a/...java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheSyncCacheServlet.java b/...java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheSyncCacheServlet.java
@@ -25,12 +25,15 @@
 import java.util.logging.Level;
 
 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 = "MemcacheSync", description = "Memcache: Synchronous",
+    urlPatterns = "/memcache/sync")
 public class MemcacheSyncCacheServlet extends HttpServlet {
 
   @Override

diff --git a/appengine-java8/memcache/src/main/webapp/WEB-INF/web.xml b/appengine-java8/memcache/src/main/webapp/WEB-INF/web.xml