Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# Getting started with Java on Google Cloud Platform
# Getting started with Java® on Google Cloud Platform

The code for the samples is contained in individual folders on this repository.
Follow the instructions at [Java Getting Started on Google Cloud Platform](http://cloud.google.com/java/getting-started) for instructions on how to run locally and deploy.
Expand All@@ -15,3 +15,5 @@ Follow the instructions at [Java Getting Started on Google Cloud Platform](http:
## Licensing

* See [LICENSE](LICENSE)

Java is a registered trademark of Oracle Corporation and/or its affiliates.
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletResponse;

@SuppressWarnings("serial")
// [START example]
public class RootServlet extends HttpServlet {

@Override
Expand DownExpand Up@@ -61,3 +62,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "login", value = "/login")
@SuppressWarnings("serial")
public class LoginServlet extends HttpServlet {
Expand DownExpand Up@@ -71,3 +72,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
resp.sendRedirect(url);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "logout", value = "/logout")
@SuppressWarnings("serial")
public class LogoutServlet extends HttpServlet {
Expand All@@ -38,3 +39,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "oauth2callback", value = "/oauth2callback")
@SuppressWarnings("serial")
public class Oauth2CallbackServlet extends HttpServlet {
Expand DownExpand Up@@ -99,3 +100,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getSession().getAttribute("loginDestination").toString()).forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "create", value = "/create")
Expand DownExpand Up@@ -80,3 +81,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "delete", value = "/delete")
public class DeleteBookServlet extends HttpServlet {
Expand All@@ -43,3 +44,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "list", value = "/books")
public class ListBookServlet extends HttpServlet {
Expand DownExpand Up@@ -60,3 +61,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "listbyuser", value = "/books/mine")
public class ListByUserServlet extends HttpServlet {
Expand DownExpand Up@@ -59,3 +60,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "read", value = "/read")
public class ReadBookServlet extends HttpServlet {
Expand All@@ -53,3 +54,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "update", value = "/update")
Expand DownExpand Up@@ -76,3 +77,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,8 @@
import com.example.appengine.gettingstartedjava.objects.Book;
import com.example.appengine.gettingstartedjava.objects.Result;

// [START example]
public interface BookDao {

public Long createBook(Book book) throws Exception;

public Book readBook(Long bookId) throws Exception;
Expand All@@ -33,3 +33,4 @@ public interface BookDao {

public Result<Book> listBooksByUser(String userId, String startCursor) throws Exception;
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class CloudSqlDao implements BookDao {

private static final BasicDataSource dataSource = new BasicDataSource();
Expand DownExpand Up@@ -203,3 +204,4 @@ public Result<Book> listBooksByUser(String userId, String startCursor) throws Ex
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class DatastoreDao implements BookDao {

private Datastore datastore;
Expand DownExpand Up@@ -189,3 +190,4 @@ public Result<Book> listBooksByUser(String userId, String startCursorString) thr
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

package com.example.appengine.gettingstartedjava.objects;

// [START example]
public class Book {

private String title;
Expand DownExpand Up@@ -173,3 +174,4 @@ public String toString() {
+ ", Added by: " + createdBy;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import java.util.List;

// [START example]
public class Result<K> {

public String cursor;
Expand All@@ -33,3 +34,4 @@ public Result(List<K> result) {
this.cursor = null;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;

// [START example]
public class CloudStorageHelper {

private final Logger logger =
Expand DownExpand Up@@ -92,3 +93,4 @@ public String getImageUrl(HttpServletRequest req, HttpServletResponse resp) thro
return imageUrl;
}
}
// [END example]
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<sessions-enabled>true</sessions-enabled>
<threadsafe>true</threadsafe>
Expand All@@ -37,3 +38,4 @@ Copyright 2015 Google Inc. All Rights Reserved.
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties" />
</system-properties>
</appengine-web-app>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<datastore-indexes
autoGenerate="true">
<datastore-index kind="Book" ancestor="false">
<property name="createdById" direction="asc" />
<property name="title" direction="asc" />
</datastore-index>
</datastore-indexes>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/web.xml
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -14,6 +15,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<-- [END_EXCLUDE] -->
<servlet>
<servlet-name>root</servlet-name>
<servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/base.jsp
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!DOCTYPE html>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -16,6 +17,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<html lang="en">
<head>
<title>Bookshelf - Java on Google Cloud Platform</title>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/form.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>
<c:out value="${action}" />
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/list.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Books</h3>
<a href="/create" class="btn btn-success btn-sm">
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/view.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Book</h3>
<div class="btn-group">
Expand Down
2 changes: 2 additions & 0 deletions helloworld/pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,11 +51,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
<target>1.7</target>
</configuration>
</plugin>
<!-- START plugin -->
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>gcloud-maven-plugin</artifactId>
<version>2.0.9.89.v20151202</version>
</plugin>
<!-- END plugin -->
</plugins>
</build>
</project>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# Getting started with Java on Google Cloud Platform
# Getting started with Java® on Google Cloud Platform

The code for the samples is contained in individual folders on this repository.
Follow the instructions at [Java Getting Started on Google Cloud Platform](http://cloud.google.com/java/getting-started) for instructions on how to run locally and deploy.
Expand All@@ -15,3 +15,5 @@ Follow the instructions at [Java Getting Started on Google Cloud Platform](http:
## Licensing

* See [LICENSE](LICENSE)

Java is a registered trademark of Oracle Corporation and/or its affiliates.
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletResponse;

@SuppressWarnings("serial")
// [START example]
public class RootServlet extends HttpServlet {

@Override
Expand DownExpand Up@@ -61,3 +62,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "login", value = "/login")
@SuppressWarnings("serial")
public class LoginServlet extends HttpServlet {
Expand DownExpand Up@@ -71,3 +72,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
resp.sendRedirect(url);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "logout", value = "/logout")
@SuppressWarnings("serial")
public class LogoutServlet extends HttpServlet {
Expand All@@ -38,3 +39,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "oauth2callback", value = "/oauth2callback")
@SuppressWarnings("serial")
public class Oauth2CallbackServlet extends HttpServlet {
Expand DownExpand Up@@ -99,3 +100,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getSession().getAttribute("loginDestination").toString()).forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "create", value = "/create")
Expand DownExpand Up@@ -80,3 +81,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "delete", value = "/delete")
public class DeleteBookServlet extends HttpServlet {
Expand All@@ -43,3 +44,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "list", value = "/books")
public class ListBookServlet extends HttpServlet {
Expand DownExpand Up@@ -60,3 +61,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "listbyuser", value = "/books/mine")
public class ListByUserServlet extends HttpServlet {
Expand DownExpand Up@@ -59,3 +60,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "read", value = "/read")
public class ReadBookServlet extends HttpServlet {
Expand All@@ -53,3 +54,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "update", value = "/update")
Expand DownExpand Up@@ -76,3 +77,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,8 @@
import com.example.appengine.gettingstartedjava.objects.Book;
import com.example.appengine.gettingstartedjava.objects.Result;

// [START example]
public interface BookDao {

public Long createBook(Book book) throws Exception;

public Book readBook(Long bookId) throws Exception;
Expand All@@ -33,3 +33,4 @@ public interface BookDao {

public Result<Book> listBooksByUser(String userId, String startCursor) throws Exception;
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class CloudSqlDao implements BookDao {

private static final BasicDataSource dataSource = new BasicDataSource();
Expand DownExpand Up@@ -203,3 +204,4 @@ public Result<Book> listBooksByUser(String userId, String startCursor) throws Ex
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class DatastoreDao implements BookDao {

private Datastore datastore;
Expand DownExpand Up@@ -189,3 +190,4 @@ public Result<Book> listBooksByUser(String userId, String startCursorString) thr
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

package com.example.appengine.gettingstartedjava.objects;

// [START example]
public class Book {

private String title;
Expand DownExpand Up@@ -173,3 +174,4 @@ public String toString() {
+ ", Added by: " + createdBy;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import java.util.List;

// [START example]
public class Result<K> {

public String cursor;
Expand All@@ -33,3 +34,4 @@ public Result(List<K> result) {
this.cursor = null;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;

// [START example]
public class CloudStorageHelper {

private final Logger logger =
Expand DownExpand Up@@ -92,3 +93,4 @@ public String getImageUrl(HttpServletRequest req, HttpServletResponse resp) thro
return imageUrl;
}
}
// [END example]
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<sessions-enabled>true</sessions-enabled>
<threadsafe>true</threadsafe>
Expand All@@ -37,3 +38,4 @@ Copyright 2015 Google Inc. All Rights Reserved.
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties" />
</system-properties>
</appengine-web-app>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<datastore-indexes
autoGenerate="true">
<datastore-index kind="Book" ancestor="false">
<property name="createdById" direction="asc" />
<property name="title" direction="asc" />
</datastore-index>
</datastore-indexes>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/web.xml
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -14,6 +15,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<-- [END_EXCLUDE] -->
<servlet>
<servlet-name>root</servlet-name>
<servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/base.jsp
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!DOCTYPE html>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -16,6 +17,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<html lang="en">
<head>
<title>Bookshelf - Java on Google Cloud Platform</title>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/form.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>
<c:out value="${action}" />
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/list.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Books</h3>
<a href="/create" class="btn btn-success btn-sm">
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/view.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Book</h3>
<div class="btn-group">
Expand Down
2 changes: 2 additions & 0 deletions helloworld/pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,11 +51,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
<target>1.7</target>
</configuration>
</plugin>
<!-- START plugin -->
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>gcloud-maven-plugin</artifactId>
<version>2.0.9.89.v20151202</version>
</plugin>
<!-- END plugin -->
</plugins>
</build>
</project>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# Getting started with Java on Google Cloud Platform
# Getting started with Java® on Google Cloud Platform

The code for the samples is contained in individual folders on this repository.
Follow the instructions at [Java Getting Started on Google Cloud Platform](http://cloud.google.com/java/getting-started) for instructions on how to run locally and deploy.
Expand All@@ -15,3 +15,5 @@ Follow the instructions at [Java Getting Started on Google Cloud Platform](http:
## Licensing

* See [LICENSE](LICENSE)

Java is a registered trademark of Oracle Corporation and/or its affiliates.
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletResponse;

@SuppressWarnings("serial")
// [START example]
public class RootServlet extends HttpServlet {

@Override
Expand DownExpand Up@@ -61,3 +62,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "login", value = "/login")
@SuppressWarnings("serial")
public class LoginServlet extends HttpServlet {
Expand DownExpand Up@@ -71,3 +72,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
resp.sendRedirect(url);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "logout", value = "/logout")
@SuppressWarnings("serial")
public class LogoutServlet extends HttpServlet {
Expand All@@ -38,3 +39,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "oauth2callback", value = "/oauth2callback")
@SuppressWarnings("serial")
public class Oauth2CallbackServlet extends HttpServlet {
Expand DownExpand Up@@ -99,3 +100,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getSession().getAttribute("loginDestination").toString()).forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "create", value = "/create")
Expand DownExpand Up@@ -80,3 +81,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "delete", value = "/delete")
public class DeleteBookServlet extends HttpServlet {
Expand All@@ -43,3 +44,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "list", value = "/books")
public class ListBookServlet extends HttpServlet {
Expand DownExpand Up@@ -60,3 +61,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "listbyuser", value = "/books/mine")
public class ListByUserServlet extends HttpServlet {
Expand DownExpand Up@@ -59,3 +60,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "read", value = "/read")
public class ReadBookServlet extends HttpServlet {
Expand All@@ -53,3 +54,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "update", value = "/update")
Expand DownExpand Up@@ -76,3 +77,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,8 @@
import com.example.appengine.gettingstartedjava.objects.Book;
import com.example.appengine.gettingstartedjava.objects.Result;

// [START example]
public interface BookDao {

public Long createBook(Book book) throws Exception;

public Book readBook(Long bookId) throws Exception;
Expand All@@ -33,3 +33,4 @@ public interface BookDao {

public Result<Book> listBooksByUser(String userId, String startCursor) throws Exception;
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class CloudSqlDao implements BookDao {

private static final BasicDataSource dataSource = new BasicDataSource();
Expand DownExpand Up@@ -203,3 +204,4 @@ public Result<Book> listBooksByUser(String userId, String startCursor) throws Ex
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class DatastoreDao implements BookDao {

private Datastore datastore;
Expand DownExpand Up@@ -189,3 +190,4 @@ public Result<Book> listBooksByUser(String userId, String startCursorString) thr
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

package com.example.appengine.gettingstartedjava.objects;

// [START example]
public class Book {

private String title;
Expand DownExpand Up@@ -173,3 +174,4 @@ public String toString() {
+ ", Added by: " + createdBy;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import java.util.List;

// [START example]
public class Result<K> {

public String cursor;
Expand All@@ -33,3 +34,4 @@ public Result(List<K> result) {
this.cursor = null;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;

// [START example]
public class CloudStorageHelper {

private final Logger logger =
Expand DownExpand Up@@ -92,3 +93,4 @@ public String getImageUrl(HttpServletRequest req, HttpServletResponse resp) thro
return imageUrl;
}
}
// [END example]
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<sessions-enabled>true</sessions-enabled>
<threadsafe>true</threadsafe>
Expand All@@ -37,3 +38,4 @@ Copyright 2015 Google Inc. All Rights Reserved.
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties" />
</system-properties>
</appengine-web-app>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<datastore-indexes
autoGenerate="true">
<datastore-index kind="Book" ancestor="false">
<property name="createdById" direction="asc" />
<property name="title" direction="asc" />
</datastore-index>
</datastore-indexes>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/web.xml
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -14,6 +15,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<-- [END_EXCLUDE] -->
<servlet>
<servlet-name>root</servlet-name>
<servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/base.jsp
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!DOCTYPE html>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -16,6 +17,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<html lang="en">
<head>
<title>Bookshelf - Java on Google Cloud Platform</title>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/form.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>
<c:out value="${action}" />
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/list.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Books</h3>
<a href="/create" class="btn btn-success btn-sm">
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/view.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Book</h3>
<div class="btn-group">
Expand Down
2 changes: 2 additions & 0 deletions helloworld/pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,11 +51,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
<target>1.7</target>
</configuration>
</plugin>
<!-- START plugin -->
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>gcloud-maven-plugin</artifactId>
<version>2.0.9.89.v20151202</version>
</plugin>
<!-- END plugin -->
</plugins>
</build>
</project>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# Getting started with Java on Google Cloud Platform
# Getting started with Java® on Google Cloud Platform

The code for the samples is contained in individual folders on this repository.
Follow the instructions at [Java Getting Started on Google Cloud Platform](http://cloud.google.com/java/getting-started) for instructions on how to run locally and deploy.
Expand All@@ -15,3 +15,5 @@ Follow the instructions at [Java Getting Started on Google Cloud Platform](http:
## Licensing

* See [LICENSE](LICENSE)

Java is a registered trademark of Oracle Corporation and/or its affiliates.
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletResponse;

@SuppressWarnings("serial")
// [START example]
public class RootServlet extends HttpServlet {

@Override
Expand DownExpand Up@@ -61,3 +62,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "login", value = "/login")
@SuppressWarnings("serial")
public class LoginServlet extends HttpServlet {
Expand DownExpand Up@@ -71,3 +72,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
resp.sendRedirect(url);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "logout", value = "/logout")
@SuppressWarnings("serial")
public class LogoutServlet extends HttpServlet {
Expand All@@ -38,3 +39,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "oauth2callback", value = "/oauth2callback")
@SuppressWarnings("serial")
public class Oauth2CallbackServlet extends HttpServlet {
Expand DownExpand Up@@ -99,3 +100,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getSession().getAttribute("loginDestination").toString()).forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "create", value = "/create")
Expand DownExpand Up@@ -80,3 +81,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "delete", value = "/delete")
public class DeleteBookServlet extends HttpServlet {
Expand All@@ -43,3 +44,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "list", value = "/books")
public class ListBookServlet extends HttpServlet {
Expand DownExpand Up@@ -60,3 +61,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "listbyuser", value = "/books/mine")
public class ListByUserServlet extends HttpServlet {
Expand DownExpand Up@@ -59,3 +60,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "read", value = "/read")
public class ReadBookServlet extends HttpServlet {
Expand All@@ -53,3 +54,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "update", value = "/update")
Expand DownExpand Up@@ -76,3 +77,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,8 @@
import com.example.appengine.gettingstartedjava.objects.Book;
import com.example.appengine.gettingstartedjava.objects.Result;

// [START example]
public interface BookDao {

public Long createBook(Book book) throws Exception;

public Book readBook(Long bookId) throws Exception;
Expand All@@ -33,3 +33,4 @@ public interface BookDao {

public Result<Book> listBooksByUser(String userId, String startCursor) throws Exception;
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class CloudSqlDao implements BookDao {

private static final BasicDataSource dataSource = new BasicDataSource();
Expand DownExpand Up@@ -203,3 +204,4 @@ public Result<Book> listBooksByUser(String userId, String startCursor) throws Ex
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class DatastoreDao implements BookDao {

private Datastore datastore;
Expand DownExpand Up@@ -189,3 +190,4 @@ public Result<Book> listBooksByUser(String userId, String startCursorString) thr
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

package com.example.appengine.gettingstartedjava.objects;

// [START example]
public class Book {

private String title;
Expand DownExpand Up@@ -173,3 +174,4 @@ public String toString() {
+ ", Added by: " + createdBy;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import java.util.List;

// [START example]
public class Result<K> {

public String cursor;
Expand All@@ -33,3 +34,4 @@ public Result(List<K> result) {
this.cursor = null;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;

// [START example]
public class CloudStorageHelper {

private final Logger logger =
Expand DownExpand Up@@ -92,3 +93,4 @@ public String getImageUrl(HttpServletRequest req, HttpServletResponse resp) thro
return imageUrl;
}
}
// [END example]
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<sessions-enabled>true</sessions-enabled>
<threadsafe>true</threadsafe>
Expand All@@ -37,3 +38,4 @@ Copyright 2015 Google Inc. All Rights Reserved.
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties" />
</system-properties>
</appengine-web-app>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<datastore-indexes
autoGenerate="true">
<datastore-index kind="Book" ancestor="false">
<property name="createdById" direction="asc" />
<property name="title" direction="asc" />
</datastore-index>
</datastore-indexes>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/web.xml
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -14,6 +15,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<-- [END_EXCLUDE] -->
<servlet>
<servlet-name>root</servlet-name>
<servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/base.jsp
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!DOCTYPE html>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -16,6 +17,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<html lang="en">
<head>
<title>Bookshelf - Java on Google Cloud Platform</title>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/form.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>
<c:out value="${action}" />
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/list.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Books</h3>
<a href="/create" class="btn btn-success btn-sm">
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/view.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Book</h3>
<div class="btn-group">
Expand Down
2 changes: 2 additions & 0 deletions helloworld/pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,11 +51,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
<target>1.7</target>
</configuration>
</plugin>
<!-- START plugin -->
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>gcloud-maven-plugin</artifactId>
<version>2.0.9.89.v20151202</version>
</plugin>
<!-- END plugin -->
</plugins>
</build>
</project>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# Getting started with Java on Google Cloud Platform
# Getting started with Java® on Google Cloud Platform

The code for the samples is contained in individual folders on this repository.
Follow the instructions at [Java Getting Started on Google Cloud Platform](http://cloud.google.com/java/getting-started) for instructions on how to run locally and deploy.
Expand All@@ -15,3 +15,5 @@ Follow the instructions at [Java Getting Started on Google Cloud Platform](http:
## Licensing

* See [LICENSE](LICENSE)

Java is a registered trademark of Oracle Corporation and/or its affiliates.
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletResponse;

@SuppressWarnings("serial")
// [START example]
public class RootServlet extends HttpServlet {

@Override
Expand DownExpand Up@@ -61,3 +62,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "login", value = "/login")
@SuppressWarnings("serial")
public class LoginServlet extends HttpServlet {
Expand DownExpand Up@@ -71,3 +72,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
resp.sendRedirect(url);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "logout", value = "/logout")
@SuppressWarnings("serial")
public class LogoutServlet extends HttpServlet {
Expand All@@ -38,3 +39,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "oauth2callback", value = "/oauth2callback")
@SuppressWarnings("serial")
public class Oauth2CallbackServlet extends HttpServlet {
Expand DownExpand Up@@ -99,3 +100,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getSession().getAttribute("loginDestination").toString()).forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "create", value = "/create")
Expand DownExpand Up@@ -80,3 +81,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "delete", value = "/delete")
public class DeleteBookServlet extends HttpServlet {
Expand All@@ -43,3 +44,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "list", value = "/books")
public class ListBookServlet extends HttpServlet {
Expand DownExpand Up@@ -60,3 +61,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "listbyuser", value = "/books/mine")
public class ListByUserServlet extends HttpServlet {
Expand DownExpand Up@@ -59,3 +60,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "read", value = "/read")
public class ReadBookServlet extends HttpServlet {
Expand All@@ -53,3 +54,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "update", value = "/update")
Expand DownExpand Up@@ -76,3 +77,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,8 @@
import com.example.appengine.gettingstartedjava.objects.Book;
import com.example.appengine.gettingstartedjava.objects.Result;

// [START example]
public interface BookDao {

public Long createBook(Book book) throws Exception;

public Book readBook(Long bookId) throws Exception;
Expand All@@ -33,3 +33,4 @@ public interface BookDao {

public Result<Book> listBooksByUser(String userId, String startCursor) throws Exception;
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class CloudSqlDao implements BookDao {

private static final BasicDataSource dataSource = new BasicDataSource();
Expand DownExpand Up@@ -203,3 +204,4 @@ public Result<Book> listBooksByUser(String userId, String startCursor) throws Ex
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class DatastoreDao implements BookDao {

private Datastore datastore;
Expand DownExpand Up@@ -189,3 +190,4 @@ public Result<Book> listBooksByUser(String userId, String startCursorString) thr
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

package com.example.appengine.gettingstartedjava.objects;

// [START example]
public class Book {

private String title;
Expand DownExpand Up@@ -173,3 +174,4 @@ public String toString() {
+ ", Added by: " + createdBy;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import java.util.List;

// [START example]
public class Result<K> {

public String cursor;
Expand All@@ -33,3 +34,4 @@ public Result(List<K> result) {
this.cursor = null;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;

// [START example]
public class CloudStorageHelper {

private final Logger logger =
Expand DownExpand Up@@ -92,3 +93,4 @@ public String getImageUrl(HttpServletRequest req, HttpServletResponse resp) thro
return imageUrl;
}
}
// [END example]
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<sessions-enabled>true</sessions-enabled>
<threadsafe>true</threadsafe>
Expand All@@ -37,3 +38,4 @@ Copyright 2015 Google Inc. All Rights Reserved.
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties" />
</system-properties>
</appengine-web-app>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<datastore-indexes
autoGenerate="true">
<datastore-index kind="Book" ancestor="false">
<property name="createdById" direction="asc" />
<property name="title" direction="asc" />
</datastore-index>
</datastore-indexes>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/web.xml
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -14,6 +15,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<-- [END_EXCLUDE] -->
<servlet>
<servlet-name>root</servlet-name>
<servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/base.jsp
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!DOCTYPE html>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -16,6 +17,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<html lang="en">
<head>
<title>Bookshelf - Java on Google Cloud Platform</title>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/form.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>
<c:out value="${action}" />
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/list.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Books</h3>
<a href="/create" class="btn btn-success btn-sm">
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/view.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Book</h3>
<div class="btn-group">
Expand Down
2 changes: 2 additions & 0 deletions helloworld/pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,11 +51,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
<target>1.7</target>
</configuration>
</plugin>
<!-- START plugin -->
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>gcloud-maven-plugin</artifactId>
<version>2.0.9.89.v20151202</version>
</plugin>
<!-- END plugin -->
</plugins>
</build>
</project>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# Getting started with Java on Google Cloud Platform
# Getting started with Java® on Google Cloud Platform

The code for the samples is contained in individual folders on this repository.
Follow the instructions at [Java Getting Started on Google Cloud Platform](http://cloud.google.com/java/getting-started) for instructions on how to run locally and deploy.
Expand All@@ -15,3 +15,5 @@ Follow the instructions at [Java Getting Started on Google Cloud Platform](http:
## Licensing

* See [LICENSE](LICENSE)

Java is a registered trademark of Oracle Corporation and/or its affiliates.
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletResponse;

@SuppressWarnings("serial")
// [START example]
public class RootServlet extends HttpServlet {

@Override
Expand DownExpand Up@@ -61,3 +62,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "login", value = "/login")
@SuppressWarnings("serial")
public class LoginServlet extends HttpServlet {
Expand DownExpand Up@@ -71,3 +72,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
resp.sendRedirect(url);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "logout", value = "/logout")
@SuppressWarnings("serial")
public class LogoutServlet extends HttpServlet {
Expand All@@ -38,3 +39,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "oauth2callback", value = "/oauth2callback")
@SuppressWarnings("serial")
public class Oauth2CallbackServlet extends HttpServlet {
Expand DownExpand Up@@ -99,3 +100,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getSession().getAttribute("loginDestination").toString()).forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "create", value = "/create")
Expand DownExpand Up@@ -80,3 +81,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "delete", value = "/delete")
public class DeleteBookServlet extends HttpServlet {
Expand All@@ -43,3 +44,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "list", value = "/books")
public class ListBookServlet extends HttpServlet {
Expand DownExpand Up@@ -60,3 +61,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "listbyuser", value = "/books/mine")
public class ListByUserServlet extends HttpServlet {
Expand DownExpand Up@@ -59,3 +60,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "read", value = "/read")
public class ReadBookServlet extends HttpServlet {
Expand All@@ -53,3 +54,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "update", value = "/update")
Expand DownExpand Up@@ -76,3 +77,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,8 @@
import com.example.appengine.gettingstartedjava.objects.Book;
import com.example.appengine.gettingstartedjava.objects.Result;

// [START example]
public interface BookDao {

public Long createBook(Book book) throws Exception;

public Book readBook(Long bookId) throws Exception;
Expand All@@ -33,3 +33,4 @@ public interface BookDao {

public Result<Book> listBooksByUser(String userId, String startCursor) throws Exception;
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class CloudSqlDao implements BookDao {

private static final BasicDataSource dataSource = new BasicDataSource();
Expand DownExpand Up@@ -203,3 +204,4 @@ public Result<Book> listBooksByUser(String userId, String startCursor) throws Ex
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class DatastoreDao implements BookDao {

private Datastore datastore;
Expand DownExpand Up@@ -189,3 +190,4 @@ public Result<Book> listBooksByUser(String userId, String startCursorString) thr
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

package com.example.appengine.gettingstartedjava.objects;

// [START example]
public class Book {

private String title;
Expand DownExpand Up@@ -173,3 +174,4 @@ public String toString() {
+ ", Added by: " + createdBy;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import java.util.List;

// [START example]
public class Result<K> {

public String cursor;
Expand All@@ -33,3 +34,4 @@ public Result(List<K> result) {
this.cursor = null;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;

// [START example]
public class CloudStorageHelper {

private final Logger logger =
Expand DownExpand Up@@ -92,3 +93,4 @@ public String getImageUrl(HttpServletRequest req, HttpServletResponse resp) thro
return imageUrl;
}
}
// [END example]
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<sessions-enabled>true</sessions-enabled>
<threadsafe>true</threadsafe>
Expand All@@ -37,3 +38,4 @@ Copyright 2015 Google Inc. All Rights Reserved.
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties" />
</system-properties>
</appengine-web-app>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<datastore-indexes
autoGenerate="true">
<datastore-index kind="Book" ancestor="false">
<property name="createdById" direction="asc" />
<property name="title" direction="asc" />
</datastore-index>
</datastore-indexes>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/web.xml
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -14,6 +15,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<-- [END_EXCLUDE] -->
<servlet>
<servlet-name>root</servlet-name>
<servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/base.jsp
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!DOCTYPE html>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -16,6 +17,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<html lang="en">
<head>
<title>Bookshelf - Java on Google Cloud Platform</title>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/form.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>
<c:out value="${action}" />
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/list.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Books</h3>
<a href="/create" class="btn btn-success btn-sm">
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/view.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Book</h3>
<div class="btn-group">
Expand Down
2 changes: 2 additions & 0 deletions helloworld/pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,11 +51,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
<target>1.7</target>
</configuration>
</plugin>
<!-- START plugin -->
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>gcloud-maven-plugin</artifactId>
<version>2.0.9.89.v20151202</version>
</plugin>
<!-- END plugin -->
</plugins>
</build>
</project>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# Getting started with Java on Google Cloud Platform
# Getting started with Java® on Google Cloud Platform

The code for the samples is contained in individual folders on this repository.
Follow the instructions at [Java Getting Started on Google Cloud Platform](http://cloud.google.com/java/getting-started) for instructions on how to run locally and deploy.
Expand All@@ -15,3 +15,5 @@ Follow the instructions at [Java Getting Started on Google Cloud Platform](http:
## Licensing

* See [LICENSE](LICENSE)

Java is a registered trademark of Oracle Corporation and/or its affiliates.
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletResponse;

@SuppressWarnings("serial")
// [START example]
public class RootServlet extends HttpServlet {

@Override
Expand DownExpand Up@@ -61,3 +62,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "login", value = "/login")
@SuppressWarnings("serial")
public class LoginServlet extends HttpServlet {
Expand DownExpand Up@@ -71,3 +72,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
resp.sendRedirect(url);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "logout", value = "/logout")
@SuppressWarnings("serial")
public class LogoutServlet extends HttpServlet {
Expand All@@ -38,3 +39,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "oauth2callback", value = "/oauth2callback")
@SuppressWarnings("serial")
public class Oauth2CallbackServlet extends HttpServlet {
Expand DownExpand Up@@ -99,3 +100,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getSession().getAttribute("loginDestination").toString()).forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "create", value = "/create")
Expand DownExpand Up@@ -80,3 +81,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "delete", value = "/delete")
public class DeleteBookServlet extends HttpServlet {
Expand All@@ -43,3 +44,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "list", value = "/books")
public class ListBookServlet extends HttpServlet {
Expand DownExpand Up@@ -60,3 +61,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "listbyuser", value = "/books/mine")
public class ListByUserServlet extends HttpServlet {
Expand DownExpand Up@@ -59,3 +60,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "read", value = "/read")
public class ReadBookServlet extends HttpServlet {
Expand All@@ -53,3 +54,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "update", value = "/update")
Expand DownExpand Up@@ -76,3 +77,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,8 @@
import com.example.appengine.gettingstartedjava.objects.Book;
import com.example.appengine.gettingstartedjava.objects.Result;

// [START example]
public interface BookDao {

public Long createBook(Book book) throws Exception;

public Book readBook(Long bookId) throws Exception;
Expand All@@ -33,3 +33,4 @@ public interface BookDao {

public Result<Book> listBooksByUser(String userId, String startCursor) throws Exception;
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class CloudSqlDao implements BookDao {

private static final BasicDataSource dataSource = new BasicDataSource();
Expand DownExpand Up@@ -203,3 +204,4 @@ public Result<Book> listBooksByUser(String userId, String startCursor) throws Ex
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class DatastoreDao implements BookDao {

private Datastore datastore;
Expand DownExpand Up@@ -189,3 +190,4 @@ public Result<Book> listBooksByUser(String userId, String startCursorString) thr
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

package com.example.appengine.gettingstartedjava.objects;

// [START example]
public class Book {

private String title;
Expand DownExpand Up@@ -173,3 +174,4 @@ public String toString() {
+ ", Added by: " + createdBy;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import java.util.List;

// [START example]
public class Result<K> {

public String cursor;
Expand All@@ -33,3 +34,4 @@ public Result(List<K> result) {
this.cursor = null;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;

// [START example]
public class CloudStorageHelper {

private final Logger logger =
Expand DownExpand Up@@ -92,3 +93,4 @@ public String getImageUrl(HttpServletRequest req, HttpServletResponse resp) thro
return imageUrl;
}
}
// [END example]
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<sessions-enabled>true</sessions-enabled>
<threadsafe>true</threadsafe>
Expand All@@ -37,3 +38,4 @@ Copyright 2015 Google Inc. All Rights Reserved.
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties" />
</system-properties>
</appengine-web-app>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<datastore-indexes
autoGenerate="true">
<datastore-index kind="Book" ancestor="false">
<property name="createdById" direction="asc" />
<property name="title" direction="asc" />
</datastore-index>
</datastore-indexes>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/web.xml
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -14,6 +15,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<-- [END_EXCLUDE] -->
<servlet>
<servlet-name>root</servlet-name>
<servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/base.jsp
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!DOCTYPE html>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -16,6 +17,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<html lang="en">
<head>
<title>Bookshelf - Java on Google Cloud Platform</title>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/form.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>
<c:out value="${action}" />
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/list.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Books</h3>
<a href="/create" class="btn btn-success btn-sm">
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/view.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Book</h3>
<div class="btn-group">
Expand Down
2 changes: 2 additions & 0 deletions helloworld/pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,11 +51,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
<target>1.7</target>
</configuration>
</plugin>
<!-- START plugin -->
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>gcloud-maven-plugin</artifactId>
<version>2.0.9.89.v20151202</version>
</plugin>
<!-- END plugin -->
</plugins>
</build>
</project>
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
# Getting started with Java on Google Cloud Platform
# Getting started with Java® on Google Cloud Platform

The code for the samples is contained in individual folders on this repository.
Follow the instructions at [Java Getting Started on Google Cloud Platform](http://cloud.google.com/java/getting-started) for instructions on how to run locally and deploy.
Expand All@@ -15,3 +15,5 @@ Follow the instructions at [Java Getting Started on Google Cloud Platform](http:
## Licensing

* See [LICENSE](LICENSE)

Java is a registered trademark of Oracle Corporation and/or its affiliates.
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletResponse;

@SuppressWarnings("serial")
// [START example]
public class RootServlet extends HttpServlet {

@Override
Expand DownExpand Up@@ -61,3 +62,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "login", value = "/login")
@SuppressWarnings("serial")
public class LoginServlet extends HttpServlet {
Expand DownExpand Up@@ -71,3 +72,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
resp.sendRedirect(url);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "logout", value = "/logout")
@SuppressWarnings("serial")
public class LogoutServlet extends HttpServlet {
Expand All@@ -38,3 +39,4 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
req.getRequestDispatcher("/books").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@WebServlet(name = "oauth2callback", value = "/oauth2callback")
@SuppressWarnings("serial")
public class Oauth2CallbackServlet extends HttpServlet {
Expand DownExpand Up@@ -99,3 +100,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getSession().getAttribute("loginDestination").toString()).forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "create", value = "/create")
Expand DownExpand Up@@ -80,3 +81,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "delete", value = "/delete")
public class DeleteBookServlet extends HttpServlet {
Expand All@@ -43,3 +44,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws Servl
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "list", value = "/books")
public class ListBookServlet extends HttpServlet {
Expand DownExpand Up@@ -60,3 +61,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "listbyuser", value = "/books/mine")
public class ListByUserServlet extends HttpServlet {
Expand DownExpand Up@@ -59,3 +60,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
req.getRequestDispatcher("/base.jsp").forward(req, resp);
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@WebServlet(name = "read", value = "/read")
public class ReadBookServlet extends HttpServlet {
Expand All@@ -53,3 +54,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

// [START example]
@SuppressWarnings("serial")
@MultipartConfig
@WebServlet(name = "update", value = "/update")
Expand DownExpand Up@@ -76,3 +77,4 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,8 @@
import com.example.appengine.gettingstartedjava.objects.Book;
import com.example.appengine.gettingstartedjava.objects.Result;

// [START example]
public interface BookDao {

public Long createBook(Book book) throws Exception;

public Book readBook(Long bookId) throws Exception;
Expand All@@ -33,3 +33,4 @@ public interface BookDao {

public Result<Book> listBooksByUser(String userId, String startCursor) throws Exception;
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class CloudSqlDao implements BookDao {

private static final BasicDataSource dataSource = new BasicDataSource();
Expand DownExpand Up@@ -203,3 +204,4 @@ public Result<Book> listBooksByUser(String userId, String startCursor) throws Ex
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import java.util.ArrayList;
import java.util.List;

// [START example]
public class DatastoreDao implements BookDao {

private Datastore datastore;
Expand DownExpand Up@@ -189,3 +190,4 @@ public Result<Book> listBooksByUser(String userId, String startCursorString) thr
}
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@

package com.example.appengine.gettingstartedjava.objects;

// [START example]
public class Book {

private String title;
Expand DownExpand Up@@ -173,3 +174,4 @@ public String toString() {
+ ", Added by: " + createdBy;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@

import java.util.List;

// [START example]
public class Result<K> {

public String cursor;
Expand All@@ -33,3 +34,4 @@ public Result(List<K> result) {
this.cursor = null;
}
}
// [END example]
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;

// [START example]
public class CloudStorageHelper {

private final Logger logger =
Expand DownExpand Up@@ -92,3 +93,4 @@ public String getImageUrl(HttpServletRequest req, HttpServletResponse resp) thro
return imageUrl;
}
}
// [END example]
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/appengine-web.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<sessions-enabled>true</sessions-enabled>
<threadsafe>true</threadsafe>
Expand All@@ -37,3 +38,4 @@ Copyright 2015 Google Inc. All Rights Reserved.
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties" />
</system-properties>
</appengine-web-app>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/datastore-indexes.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [START example] -->
<datastore-indexes
autoGenerate="true">
<datastore-index kind="Book" ancestor="false">
<property name="createdById" direction="asc" />
<property name="title" direction="asc" />
</datastore-index>
</datastore-indexes>
<!-- [END example] -->
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/WEB-INF/web.xml
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -14,6 +15,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<-- [END_EXCLUDE] -->
<servlet>
<servlet-name>root</servlet-name>
<servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/base.jsp
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!DOCTYPE html>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -16,6 +17,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<html lang="en">
<head>
<title>Bookshelf - Java on Google Cloud Platform</title>
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/form.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>
<c:out value="${action}" />
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/list.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Books</h3>
<a href="/create" class="btn btn-success btn-sm">
Expand Down
2 changes: 2 additions & 0 deletions bookshelf/src/main/webapp/view.jsp
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<!-- [START_EXCLUDE] -->
<!--
Copyright 2015 Google Inc. All Rights Reserved.

Expand All@@ -15,6 +16,7 @@ Copyright 2015 Google Inc. All Rights Reserved.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- [END_EXCLUDE] -->
<div class="container">
<h3>Book</h3>
<div class="btn-group">
Expand Down
2 changes: 2 additions & 0 deletions helloworld/pom.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,11 +51,13 @@ Copyright 2015 Google Inc. All Rights Reserved.
<target>1.7</target>
</configuration>
</plugin>
<!-- START plugin -->
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>gcloud-maven-plugin</artifactId>
<version>2.0.9.89.v20151202</version>
</plugin>
<!-- END plugin -->
</plugins>
</build>
</project>