diff --git a/appengine-java8/logs/README.md b/appengine-java8/logs/README.md deleted file mode 100644 index 8e8f2d5ea59..00000000000 --- a/appengine-java8/logs/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Users Authentication sample for Google App Engine - - -Open in Cloud Shell - -This sample demonstrates how to use the [Logs API][log-docs] on [Google App -Engine][ae-docs]. - -[log-docs]: https://cloud.google.com/appengine/docs/java/logs/ -[ae-docs]: https://cloud.google.com/appengine/docs/java/ - -## Running locally - -The Logs API only generates output for deployed apps, so this program should not be run locally. - -## Deploying - -This example uses the -[Cloud SDK maven plugin](https://cloud.google.com/appengine/docs/java/tools/using-maven). - - mvn appengine:deploy diff --git a/appengine-java8/logs/pom.xml b/appengine-java8/logs/pom.xml deleted file mode 100644 index ba613c504a5..00000000000 --- a/appengine-java8/logs/pom.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - 4.0.0 - war - 1.0-SNAPSHOT - com.example.appengine - appengine-logs-j8 - - - - com.google.cloud.samples - shared-configuration - 1.0.8 - - - - 1.8 - 1.8 - - - - - com.google.appengine - appengine-api-1.0-sdk - 1.9.62 - - - com.google.guava - guava - 20.0 - - - - javax.servlet - javax.servlet-api - 3.1.0 - jar - provided - - - - org.json - json - 20180130 - - - joda-time - joda-time - 2.9.9 - - - - - ${project.build.directory}/${project.build.finalName}/WEB-INF/classes - - - - com.google.cloud.tools - appengine-maven-plugin - 1.3.1 - - true - true - - - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 - - - - 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 deleted file mode 100644 index 8b45542fb26..00000000000 --- a/appengine-java8/logs/src/main/java/com/example/appengine/logs/LogsServlet.java +++ /dev/null @@ -1,100 +0,0 @@ -/* Copyright 2016 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// [START logs_API_example] - -package com.example.appengine.logs; - -import com.google.appengine.api.log.AppLogLine; -import com.google.appengine.api.log.LogQuery; -import com.google.appengine.api.log.LogServiceFactory; -import com.google.appengine.api.log.RequestLogs; -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; -import org.joda.time.DateTime; - -// 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. -// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required. -@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) throws IOException { - - resp.setContentType("text/html"); - PrintWriter writer = resp.getWriter(); - writer.println(""); - writer.println(""); - writer.println("App Engine Logs Sample"); - - // We use this to break out of our iteration loop, limiting record - // display to 5 request logs at a time. - int limit = 5; - - // This retrieves the offset from the Next link upon user click. - String offset = req.getParameter("offset"); - - // We want the App logs for each request log - LogQuery query = LogQuery.Builder.withDefaults(); - query.includeAppLogs(true); - - // Set the offset value retrieved from the Next link click. - if (offset != null) { - query.offset(offset); - } - - // This gets filled from the last request log in the iteration - String lastOffset = null; - int count = 0; - - // Display a few properties of each request log. - for (RequestLogs record : LogServiceFactory.getLogService().fetch(query)) { - writer.println("
REQUEST LOG
"); - DateTime reqTime = new DateTime(record.getStartTimeUsec() / 1000); - writer.println("IP: " + record.getIp() + "
"); - writer.println("Method: " + record.getMethod() + "
"); - writer.println("Resource " + record.getResource() + "
"); - writer.println(String.format("
Date: %s", reqTime.toString())); - - lastOffset = record.getOffset(); - - // Display all the app logs for each request log. - for (AppLogLine appLog : record.getAppLogLines()) { - writer.println("
" + "APPLICATION LOG" + "
"); - DateTime appTime = new DateTime(appLog.getTimeUsec() / 1000); - writer.println(String.format("
Date: %s", appTime.toString())); - writer.println("
Level: " + appLog.getLogLevel() + "
"); - writer.println("Message: " + appLog.getLogMessage() + "

"); - } - - if (++count >= limit) { - break; - } - } - - // When the user clicks this link, the offset is processed in the - // GET handler and used to cycle through to the next 5 request logs. - writer.println(String.format("
Next", lastOffset)); - } -} -// [END logs_API_example] diff --git a/appengine-java8/logs/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/logs/src/main/webapp/WEB-INF/appengine-web.xml deleted file mode 100644 index 202e048ae2e..00000000000 --- a/appengine-java8/logs/src/main/webapp/WEB-INF/appengine-web.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - java8 - true - - - - diff --git a/appengine-java8/logs/src/main/webapp/WEB-INF/logging.properties b/appengine-java8/logs/src/main/webapp/WEB-INF/logging.properties deleted file mode 100644 index 3e7f85b9dc1..00000000000 --- a/appengine-java8/logs/src/main/webapp/WEB-INF/logging.properties +++ /dev/null @@ -1,14 +0,0 @@ -# A default java.util.logging configuration. -# (All App Engine logging is through java.util.logging by default). -# -# To use this configuration, copy it into your application's WEB-INF -# folder and add the following to your appengine-web.xml: -# -# -# -# -# - -# Set the default logging level for all loggers to WARNING -.level = WARNING - diff --git a/appengine-java8/pom.xml b/appengine-java8/pom.xml index 8b96e8d923d..99c3c1dcb0a 100644 --- a/appengine-java8/pom.xml +++ b/appengine-java8/pom.xml @@ -57,7 +57,6 @@ guestbook-cloud-datastore guestbook-objectify images - logs mailgun mailjet memcache