diff --git a/appengine-java8/README.md b/appengine-java8/README.md index 62f932bda7e..d93cc50cc9f 100644 --- a/appengine-java8/README.md +++ b/appengine-java8/README.md @@ -1,5 +1,8 @@ # Google App Engine Standard Environment Samples for Java 8 + +Open in Cloud Shell + This is a repository that contains Java code samples for [Google App Engine standard environment][ae-docs]. diff --git a/appengine-java8/analytics/pom.xml b/appengine-java8/analytics/pom.xml index 422f45d520f..9e5b9f34967 100644 --- a/appengine-java8/analytics/pom.xml +++ b/appengine-java8/analytics/pom.xml @@ -20,13 +20,15 @@ com.example.appengine appengine-analytics-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 - 1.8 @@ -39,7 +41,7 @@ com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 @@ -72,7 +74,7 @@ com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java b/appengine-java8/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java index b87fa6ef090..e5974fa5aa4 100644 --- a/appengine-java8/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java +++ b/appengine-java8/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java @@ -1,14 +1,16 @@ /* * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/appidentity/README.md b/appengine-java8/appidentity/README.md index 49c1c62a30e..a6c32cf4b86 100644 --- a/appengine-java8/appidentity/README.md +++ b/appengine-java8/appidentity/README.md @@ -1,5 +1,9 @@ # App Identity sample for Google App Engine + +Open in Cloud Shell + + This sample demonstrates how to use the [App Identity API][appid] on [Google App Engine][ae-docs]. diff --git a/appengine-java8/appidentity/pom.xml b/appengine-java8/appidentity/pom.xml index 3a6a3b28248..54bacd135da 100644 --- a/appengine-java8/appidentity/pom.xml +++ b/appengine-java8/appidentity/pom.xml @@ -20,24 +20,26 @@ com.example.appengine appengine-appidentity-j8 + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 1.8 1.8 - 1.9.60 com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 @@ -64,13 +66,13 @@ com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test @@ -89,7 +91,7 @@ com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/bigtable/README.md b/appengine-java8/bigtable/README.md index 5fd95ed030f..2c794719d68 100644 --- a/appengine-java8/bigtable/README.md +++ b/appengine-java8/bigtable/README.md @@ -1,6 +1,9 @@ Bigtable-hello-j8 ================= + +Open in Cloud Shell + Moves the Bigtable Hello World application to Google App Engine Standard for Java 8. diff --git a/appengine-java8/bigtable/pom.xml b/appengine-java8/bigtable/pom.xml index 6c4ddf5ce0a..f298a122343 100644 --- a/appengine-java8/bigtable/pom.xml +++ b/appengine-java8/bigtable/pom.xml @@ -23,27 +23,22 @@ limitations under the License. com.example.google.cloud.bigtable bigtable-hello-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 - 1.3.2 - UTF-8 - UTF-8 1.8 1.8 - 1.0.0-pre3 - 1.2.6 YOUR_PROJECT_ID YOUR_INSTANCE_ID - - true - true false @@ -51,7 +46,7 @@ limitations under the License. com.google.cloud.bigtable bigtable-hbase-1.x - ${bigtable.version} + 1.0.0-pre3 @@ -162,7 +157,7 @@ limitations under the License. com.google.cloud.tools appengine-maven-plugin - ${appengine.maven.plugin} + 1.3.2 @@ -203,5 +198,4 @@ limitations under the License. - diff --git a/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelloWorld.java b/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelloWorld.java index 21aa1805e57..f3fcb6097d4 100644 --- a/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelloWorld.java +++ b/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelloWorld.java @@ -1,19 +1,20 @@ /* * Copyright 2016 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may - * obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package com.example.bigtable; import java.io.IOException; diff --git a/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java b/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java index ed326224e4c..81bbeb559d4 100644 --- a/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java +++ b/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java @@ -1,14 +1,16 @@ /* - * Copyright 2015 Google Inc. + * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/bigtable/src/test/java/com/example/bigtable/ITBigtableHelloWorld.java b/appengine-java8/bigtable/src/test/java/com/example/bigtable/ITBigtableHelloWorld.java index a0978f72269..1b345b40655 100644 --- a/appengine-java8/bigtable/src/test/java/com/example/bigtable/ITBigtableHelloWorld.java +++ b/appengine-java8/bigtable/src/test/java/com/example/bigtable/ITBigtableHelloWorld.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/cloudsql/README.md b/appengine-java8/cloudsql/README.md index adb8e97acaf..1992c040a5e 100644 --- a/appengine-java8/cloudsql/README.md +++ b/appengine-java8/cloudsql/README.md @@ -1,5 +1,9 @@ # Cloud SQL sample for Google App Engine + +Open in Cloud Shell + + This sample demonstrates how to use [Cloud SQL](https://cloud.google.com/cloudsql/) on Google App Engine standard Java 8 diff --git a/appengine-java8/cloudsql/pom.xml b/appengine-java8/cloudsql/pom.xml index d70b1cb48c4..4c613de18d7 100644 --- a/appengine-java8/cloudsql/pom.xml +++ b/appengine-java8/cloudsql/pom.xml @@ -20,11 +20,14 @@ com.example.appengine appengine-cloudsql-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 diff --git a/appengine-java8/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java b/appengine-java8/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java index 5eeb03b6bf4..5e30119ade7 100644 --- a/appengine-java8/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java +++ b/appengine-java8/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/appengine-java8/datastore-indexes-exploding/pom.xml b/appengine-java8/datastore-indexes-exploding/pom.xml index ef59041493b..c215b55ea52 100644 --- a/appengine-java8/datastore-indexes-exploding/pom.xml +++ b/appengine-java8/datastore-indexes-exploding/pom.xml @@ -20,18 +20,26 @@ com.example.appengine appengine-datastore-indexes-exploding-j8 + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 javax.servlet @@ -57,19 +65,19 @@ com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/datastore-indexes-perfect/pom.xml b/appengine-java8/datastore-indexes-perfect/pom.xml index 5402cdeb165..c58ab18946f 100644 --- a/appengine-java8/datastore-indexes-perfect/pom.xml +++ b/appengine-java8/datastore-indexes-perfect/pom.xml @@ -20,18 +20,26 @@ com.example.appengine appengine-datastore-indexes-perfect-j8 + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 javax.servlet @@ -57,19 +65,19 @@ com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/datastore-indexes/pom.xml b/appengine-java8/datastore-indexes/pom.xml index 501923ce769..1a12c4b9fec 100644 --- a/appengine-java8/datastore-indexes/pom.xml +++ b/appengine-java8/datastore-indexes/pom.xml @@ -20,18 +20,26 @@ com.example.appengine appengine-datastore-indexes-j8 + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 @@ -58,19 +66,19 @@ com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/datastore/README.md b/appengine-java8/datastore/README.md index 4a9f625455a..1de1f8b81cf 100644 --- a/appengine-java8/datastore/README.md +++ b/appengine-java8/datastore/README.md @@ -1,5 +1,8 @@ # Google Cloud Datastore Sample + +Open in Cloud Shell + This sample demonstrates how to use [Google Cloud Datastore][java-datastore] from [Google App Engine standard environment][ae-docs]. diff --git a/appengine-java8/datastore/pom.xml b/appengine-java8/datastore/pom.xml index e4a7b3dffe8..9a9374424ba 100644 --- a/appengine-java8/datastore/pom.xml +++ b/appengine-java8/datastore/pom.xml @@ -20,18 +20,26 @@ com.example.appengine appengine-datastore-j8 + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 @@ -84,19 +92,19 @@ com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/endpoints-v2-README.md b/appengine-java8/endpoints-v2-README.md index 97f20f51bfc..9a58ac719b5 100644 --- a/appengine-java8/endpoints-v2-README.md +++ b/appengine-java8/endpoints-v2-README.md @@ -1,5 +1,8 @@ # Google Cloud Endpoints Frameworks for App Engine Standard + +Open in Cloud Shell + This directory contains Google Cloud Endpoints Frameworks for App Engine for App Engine Standard samples. The [`backend/`](backend/) directory contains the sample code for the [quickstart][4] for Cloud Endpoints Frameworks on App Engine diff --git a/appengine-java8/endpoints-v2-backend/README.md b/appengine-java8/endpoints-v2-backend/README.md index 9982f20e707..4365809673f 100644 --- a/appengine-java8/endpoints-v2-backend/README.md +++ b/appengine-java8/endpoints-v2-backend/README.md @@ -1,5 +1,9 @@ # App Engine Standard & Google Cloud Endpoints Frameworks & Java + +Open in Cloud Shell + + This sample demonstrates how to use Google Cloud Endpoints Frameworks using Java on App Engine Standard. diff --git a/appengine-java8/endpoints-v2-backend/pom.xml b/appengine-java8/endpoints-v2-backend/pom.xml index 240e443e65f..d5281c52480 100644 --- a/appengine-java8/endpoints-v2-backend/pom.xml +++ b/appengine-java8/endpoints-v2-backend/pom.xml @@ -21,23 +21,26 @@ com.example.echo echo-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + 1.8 + 1.8 + UTF-8 2.0.10 1.0.4 YOUR_PROJECT_ID - 1.8 - 1.8 - 1.3.2 @@ -92,7 +95,7 @@ com.google.cloud.tools appengine-maven-plugin - ${appengine.maven.plugin.version} + 1.3.2 diff --git a/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Echo.java b/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Echo.java index fd3bc8e41bd..d78dc65c4dd 100644 --- a/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Echo.java +++ b/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Echo.java @@ -1,17 +1,17 @@ /* - * Copyright (c) 2016 Google Inc. + * Copyright 2016 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.example.echo; diff --git a/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Email.java b/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Email.java index b7b0fbc999e..c2a7a71d85d 100644 --- a/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Email.java +++ b/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Email.java @@ -1,19 +1,20 @@ /* - * Copyright (c) 2016 Google Inc. + * Copyright 2016 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package com.example.echo; /** diff --git a/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Message.java b/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Message.java index cda377f0add..1b41b78ec02 100644 --- a/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Message.java +++ b/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Message.java @@ -1,19 +1,20 @@ /* - * Copyright (c) 2016 Google Inc. + * Copyright 2016 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package com.example.echo; /** diff --git a/appengine-java8/endpoints-v2-guice/README.md b/appengine-java8/endpoints-v2-guice/README.md index e69d9cdf87f..d58d5986184 100644 --- a/appengine-java8/endpoints-v2-guice/README.md +++ b/appengine-java8/endpoints-v2-guice/README.md @@ -1,5 +1,8 @@ # App Engine Standard & Google Cloud Endpoints Frameworks + +Open in Cloud Shell + This sample demonstrates how to use Google Cloud Endpoints Frameworks with Guice on App Engine Standard. diff --git a/appengine-java8/endpoints-v2-guice/pom.xml b/appengine-java8/endpoints-v2-guice/pom.xml index b3628c5c8a6..55a4d2a1357 100644 --- a/appengine-java8/endpoints-v2-guice/pom.xml +++ b/appengine-java8/endpoints-v2-guice/pom.xml @@ -21,23 +21,25 @@ com.example.echo echo-guice-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + 1.8 + 1.8 UTF-8 2.0.10 1.0.4 YOUR_PROJECT_ID - 1.8 - 1.8 - 1.3.2 @@ -99,7 +101,7 @@ com.google.cloud.tools appengine-maven-plugin - ${appengine.maven.plugin.version} + 1.3.2 diff --git a/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Echo.java b/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Echo.java index 217922887e1..ef659d44090 100644 --- a/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Echo.java +++ b/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Echo.java @@ -1,19 +1,20 @@ /* - * Copyright (c) 2017 Google Inc. + * Copyright 2017 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package com.example.echo; import com.google.api.server.spi.auth.EspAuthenticator; diff --git a/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/EchoEndpointModule.java b/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/EchoEndpointModule.java index a0b2cf7f005..555b2bbabd1 100644 --- a/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/EchoEndpointModule.java +++ b/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/EchoEndpointModule.java @@ -1,19 +1,20 @@ /* - * Copyright (c) 2017 Google Inc. + * Copyright 2017 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package com.example.echo; import com.google.api.control.ServiceManagementConfigFilter; diff --git a/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/EchoGuiceListener.java b/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/EchoGuiceListener.java index 7de3ed6546e..ddccb3b5bd6 100644 --- a/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/EchoGuiceListener.java +++ b/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/EchoGuiceListener.java @@ -1,19 +1,20 @@ /* - * Copyright (c) 2017 Google Inc. + * Copyright 2017 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package com.example.echo; import com.google.inject.Guice; @@ -22,9 +23,10 @@ // [START injector] public class EchoGuiceListener extends GuiceServletContextListener { - @Override - protected Injector getInjector() { - return Guice.createInjector(new EchoEndpointModule()); - } + + @Override + protected Injector getInjector() { + return Guice.createInjector(new EchoEndpointModule()); + } } // [END injector] diff --git a/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Email.java b/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Email.java index 2ecd4cf6a45..206c6c2f003 100644 --- a/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Email.java +++ b/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Email.java @@ -1,17 +1,17 @@ /* - * Copyright (c) 2017 Google Inc. + * Copyright 2017 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.example.echo; diff --git a/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Message.java b/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Message.java index d5ddb79d430..a0e6c0fc4f9 100644 --- a/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Message.java +++ b/appengine-java8/endpoints-v2-guice/src/main/java/com/example/echo/Message.java @@ -1,19 +1,20 @@ /* - * Copyright (c) 2017 Google Inc. + * Copyright 2017 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package com.example.echo; /** The message bean that will be used in the echo request and response. */ diff --git a/appengine-java8/endpoints-v2-migration/README.md b/appengine-java8/endpoints-v2-migration/README.md index f53b3f35883..174e02228b2 100644 --- a/appengine-java8/endpoints-v2-migration/README.md +++ b/appengine-java8/endpoints-v2-migration/README.md @@ -1,5 +1,8 @@ # Hello World Google Cloud Endpoints for App Engine + +Open in Cloud Shell + This sample provides an example of a [migration][7] from the prior version of [Google Cloud Endpoints Frameworks][3] to new [Google Cloud Endpoints Frameworks for App Engine][8] using a diff --git a/appengine-java8/endpoints-v2-migration/pom.xml b/appengine-java8/endpoints-v2-migration/pom.xml index ab6c126bc65..4c7c1a55219 100644 --- a/appengine-java8/endpoints-v2-migration/pom.xml +++ b/appengine-java8/endpoints-v2-migration/pom.xml @@ -22,11 +22,14 @@ limitations under the License. com.example.helloendpoints helloendpoints-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 diff --git a/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Constants.java b/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Constants.java index 255a3dd9e25..4d42d4b3456 100644 --- a/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Constants.java +++ b/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Constants.java @@ -1,18 +1,19 @@ /* -Copyright 2017 Google Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 + * Copyright 2017 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ package com.example.helloendpoints; diff --git a/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Greetings.java b/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Greetings.java index 716d2c597e1..8a545e28d1f 100644 --- a/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Greetings.java +++ b/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Greetings.java @@ -1,20 +1,22 @@ /* -Copyright 2017 Google Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 + * Copyright 2017 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ //[START begin] + package com.example.helloendpoints; import com.google.api.server.spi.config.Api; @@ -47,9 +49,9 @@ public class Greetings { greetings.add(new HelloGreeting("hello world!")); greetings.add(new HelloGreeting("goodbye world!")); } -//[END api_def] + //[END api_def] -//[START getgreetings] + //[START getgreetings] public HelloGreeting getGreeting(@Named("id") Integer id) throws NotFoundException { try { @@ -62,9 +64,9 @@ public HelloGreeting getGreeting(@Named("id") Integer id) throws NotFoundExcepti public ArrayList listGreeting() { return greetings; } -//[END getgreetings] + //[END getgreetings] -//[START multiplygreetings] + //[START multiplygreetings] @ApiMethod(name = "greetings.multiply", httpMethod = "post") public HelloGreeting insertGreeting(@Named("times") Integer times, HelloGreeting greeting) { @@ -76,14 +78,14 @@ public HelloGreeting insertGreeting(@Named("times") Integer times, HelloGreeting response.setMessage(responseBuilder.toString()); return response; } -//[END multiplygreetings] + //[END multiplygreetings] -//[START auth] + //[START auth] @ApiMethod(name = "greetings.authed", path = "hellogreeting/authed") public HelloGreeting authedGreeting(User user) { HelloGreeting response = new HelloGreeting("hello " + user.getEmail()); return response; } -//[END auth] + //[END auth] } diff --git a/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/HelloGreeting.java b/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/HelloGreeting.java index 7cf19f7c482..81edc00c091 100644 --- a/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/HelloGreeting.java +++ b/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/HelloGreeting.java @@ -1,18 +1,18 @@ /* -Copyright 2017 Google Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ + * Copyright 2017 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.example.helloendpoints; diff --git a/appengine-java8/endpoints-v2-skeleton/README.md b/appengine-java8/endpoints-v2-skeleton/README.md index deb996b5910..f6e70afa671 100644 --- a/appengine-java8/endpoints-v2-skeleton/README.md +++ b/appengine-java8/endpoints-v2-skeleton/README.md @@ -1,5 +1,8 @@ # App Engine Standard & Endpoints Frameworks skeleton + +Open in Cloud Shell + This is a skeleton example for getting setup with Endpoints Framework v2 for Java. diff --git a/appengine-java8/endpoints-v2-skeleton/pom.xml b/appengine-java8/endpoints-v2-skeleton/pom.xml index d2a31328b95..7e7f23d0d18 100644 --- a/appengine-java8/endpoints-v2-skeleton/pom.xml +++ b/appengine-java8/endpoints-v2-skeleton/pom.xml @@ -21,11 +21,14 @@ com.example.skeleton endpoints-j8-skeleton + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 diff --git a/appengine-java8/endpoints-v2-skeleton/src/main/java/com/example/skeleton/MyApi.java b/appengine-java8/endpoints-v2-skeleton/src/main/java/com/example/skeleton/MyApi.java index e35c6f36a91..4a93b4966b7 100644 --- a/appengine-java8/endpoints-v2-skeleton/src/main/java/com/example/skeleton/MyApi.java +++ b/appengine-java8/endpoints-v2-skeleton/src/main/java/com/example/skeleton/MyApi.java @@ -1,17 +1,17 @@ /* - * Copyright (c) 2017 Google Inc. + * Copyright 2017 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain a - * copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.example.skeleton; diff --git a/appengine-java8/firebase-event-proxy-README.md b/appengine-java8/firebase-event-proxy-README.md index 1b8c0317a11..cb82f499a1c 100644 --- a/appengine-java8/firebase-event-proxy-README.md +++ b/appengine-java8/firebase-event-proxy-README.md @@ -1,5 +1,8 @@ # App Engine Firebase Event Proxy + +Open in Cloud Shell + An example app that illustrates how to create a Java App Engine Standard Environment app that proxies Firebase events to another App Engine app. diff --git a/appengine-java8/firebase-event-proxy/pom.xml b/appengine-java8/firebase-event-proxy/pom.xml index 2d2810b8a2e..05630265efe 100644 --- a/appengine-java8/firebase-event-proxy/pom.xml +++ b/appengine-java8/firebase-event-proxy/pom.xml @@ -20,18 +20,24 @@ com.example.gaefirebaseeventproxy gaefirebaseeventproxy-j8 + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 - gae-firebase-event-proxy - 1 - UTF-8 - true + 1.8 + 1.8 + + gae-firebase-event-proxy + 1 + UTF-8 + true @@ -39,7 +45,7 @@ com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 javax.servlet @@ -74,13 +80,13 @@ com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/firebase-tictactoe/README.md b/appengine-java8/firebase-tictactoe/README.md index fc7fbf0d052..a456ee0e54b 100644 --- a/appengine-java8/firebase-tictactoe/README.md +++ b/appengine-java8/firebase-tictactoe/README.md @@ -1,5 +1,8 @@ # Tic Tac Toe on Google App Engine Standard using Firebase + +Open in Cloud Shell + This directory contains a project that implements a realtime two-player game of Tic Tac Toe on Google [App Engine Standard][standard], using the [Firebase] database for realtime notifications when the board changes. diff --git a/appengine-java8/firebase-tictactoe/pom.xml b/appengine-java8/firebase-tictactoe/pom.xml index 9e703485b23..69776038d2c 100644 --- a/appengine-java8/firebase-tictactoe/pom.xml +++ b/appengine-java8/firebase-tictactoe/pom.xml @@ -20,30 +20,26 @@ com.example.appengine appengine-firebase-tictactoe-j8 + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 - 5.1.21 - - 2.7 - 20.0 - 1.23.0 - 4.12 - 1.10.19 - 0.37 - 1.3.2 + 1.8 + 1.8 com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 @@ -62,17 +58,17 @@ com.googlecode.objectify objectify - ${objectify.version} + 5.1.21 com.google.guava guava - ${guava.version} + 23.0 com.google.api-client google-api-client-appengine - ${google-api-client.version} + 1.23.0 @@ -80,37 +76,37 @@ junit junit - ${junit.version} + 4.12 test org.mockito mockito-all - ${mockito.version} + 1.10.19 test com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test com.google.truth truth - ${google-truth.version} + 0.36 test @@ -121,7 +117,7 @@ com.google.cloud.tools appengine-maven-plugin - ${appengine-maven.version} + 1.3.2 diff --git a/appengine-java8/gaeinfo/README.md b/appengine-java8/gaeinfo/README.md index 3c9c13435b6..245afae0384 100644 --- a/appengine-java8/gaeinfo/README.md +++ b/appengine-java8/gaeinfo/README.md @@ -1,5 +1,8 @@ # Google App Engine Information + +Open in Cloud Shell + This sample displays what's going on in your app. It dumps the environment and lots more. See the [Google App Engine standard environment documentation][ae-docs] for more diff --git a/appengine-java8/gaeinfo/pom.xml b/appengine-java8/gaeinfo/pom.xml index a8e0a4a3071..e29aee47958 100644 --- a/appengine-java8/gaeinfo/pom.xml +++ b/appengine-java8/gaeinfo/pom.xml @@ -21,11 +21,14 @@ Copyright 2017 Google Inc. com.example.appengine gaeinfo-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 @@ -39,7 +42,7 @@ Copyright 2017 Google Inc. com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 diff --git a/appengine-java8/gaeinfo/src/main/java/com/example/appengine/standard/GaeInfoServlet.java b/appengine-java8/gaeinfo/src/main/java/com/example/appengine/standard/GaeInfoServlet.java index d2f183cb293..5d649234ecd 100644 --- a/appengine-java8/gaeinfo/src/main/java/com/example/appengine/standard/GaeInfoServlet.java +++ b/appengine-java8/gaeinfo/src/main/java/com/example/appengine/standard/GaeInfoServlet.java @@ -1,14 +1,16 @@ /* * Copyright 2017 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/guestbook-cloud-datastore/README.md b/appengine-java8/guestbook-cloud-datastore/README.md index feee3374a1e..96d7254314e 100644 --- a/appengine-java8/guestbook-cloud-datastore/README.md +++ b/appengine-java8/guestbook-cloud-datastore/README.md @@ -1,5 +1,8 @@ # appengine/guestbook-cloud-datastore + +Open in Cloud Shell + An App Engine guestbook using Java, Maven, and the Cloud Datastore API via [google-cloud-java](https://github.com/GoogleCloudPlatform/google-cloud-java). diff --git a/appengine-java8/guestbook-cloud-datastore/pom.xml b/appengine-java8/guestbook-cloud-datastore/pom.xml index fcdfbfe2f51..c1bdb3aa47e 100644 --- a/appengine-java8/guestbook-cloud-datastore/pom.xml +++ b/appengine-java8/guestbook-cloud-datastore/pom.xml @@ -24,22 +24,28 @@ com.example.appengine appengine-guestbook-cloud-datastore-j8 - - 22.0 - + + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 @@ -65,7 +71,7 @@ com.google.guava guava - ${guava.version} + 23.0 @@ -84,19 +90,19 @@ com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java index 0bf17f3ac99..a87a3cb1577 100644 --- a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java +++ b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java index 43b768daf3b..8c2b29b1f3e 100644 --- a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java +++ b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java index 92bc8af9766..25278fab798 100644 --- a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java +++ b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java index c7ae2673532..688f981cec4 100644 --- a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java +++ b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java b/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java index bbfb3ac3734..9f476734a74 100644 --- a/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java +++ b/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java b/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java index 4b476584787..1bb57fc8f94 100644 --- a/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java +++ b/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java b/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java index ee18bec19a3..fa5f77860c8 100644 --- a/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java +++ b/appengine-java8/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java @@ -1,3 +1,19 @@ +/* + * Copyright 2016 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.example.guestbook; import static com.example.guestbook.Persistence.getDatastore; diff --git a/appengine-java8/guestbook-objectify/README.md b/appengine-java8/guestbook-objectify/README.md index 2a7ee9cd289..dbd828e1143 100644 --- a/appengine-java8/guestbook-objectify/README.md +++ b/appengine-java8/guestbook-objectify/README.md @@ -1,5 +1,8 @@ # appengine/guestbook-objectify + +Open in Cloud Shell + An App Engine guestbook using Java, Maven, and Objectify. Data access using [Objectify](https://github.com/objectify/objectify) diff --git a/appengine-java8/guestbook-objectify/pom.xml b/appengine-java8/guestbook-objectify/pom.xml index 3880c77f4f3..5e14fbd30fb 100644 --- a/appengine-java8/guestbook-objectify/pom.xml +++ b/appengine-java8/guestbook-objectify/pom.xml @@ -22,23 +22,28 @@ com.example.appengine appengine-guestbook-objectify-j8 - - 5.1.21 - 20.0 - + + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 @@ -59,12 +64,12 @@ com.google.guava guava - ${guava.version} + 23.0 com.googlecode.objectify objectify - ${objectify.version} + 5.1.21 @@ -84,19 +89,19 @@ com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java index 9536eb2cd4a..2a49a42fb75 100644 --- a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java +++ b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java @@ -1,14 +1,16 @@ /* - * Copyright 2014-2015 Google Inc. + * Copyright 2014 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java index 5717af7f5fa..04a4460a942 100644 --- a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java +++ b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java @@ -1,14 +1,16 @@ /* - * Copyright 2014-2015 Google Inc. + * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java index dbe7582d6c3..bc591871648 100644 --- a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java +++ b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java @@ -1,15 +1,19 @@ /* - * Copyright 2014-2015 Google Inc. + * Copyright 2015 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ + //[START all] package com.example.guestbook; diff --git a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java index 2542869111b..03d0e59ce72 100644 --- a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java +++ b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java @@ -1,14 +1,16 @@ /* - * Copyright 2014-2015 Google Inc. + * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/GreetingTest.java b/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/GreetingTest.java index 71c62dffbf5..3add8a136e2 100644 --- a/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/GreetingTest.java +++ b/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/GreetingTest.java @@ -3,7 +3,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/GuestbookTestUtilities.java b/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/GuestbookTestUtilities.java index e5b8d9ece04..2bc45173884 100644 --- a/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/GuestbookTestUtilities.java +++ b/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/GuestbookTestUtilities.java @@ -3,7 +3,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/SignGuestbookServletTest.java b/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/SignGuestbookServletTest.java index 95ffbc2435e..39e7ec0ecbc 100644 --- a/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/SignGuestbookServletTest.java +++ b/appengine-java8/guestbook-objectify/src/test/java/com/example/guestbook/SignGuestbookServletTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Google Inc. + * Copyright 2016 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/appengine-java8/images/README.md b/appengine-java8/images/README.md index 88edaa825f2..d2eb855c98f 100644 --- a/appengine-java8/images/README.md +++ b/appengine-java8/images/README.md @@ -1,5 +1,8 @@ # Google App Engine Standard Environment Images Sample + +Open in Cloud Shell + This sample demonstrates how to use the Images Java API. See the [Google App Engine standard environment documentation][ae-docs] for more diff --git a/appengine-java8/images/pom.xml b/appengine-java8/images/pom.xml index 6515daf9a3d..59ae904c9be 100644 --- a/appengine-java8/images/pom.xml +++ b/appengine-java8/images/pom.xml @@ -20,22 +20,26 @@ Copyright 2015 Google Inc. com.example.appengine appengine-images-j8 - - 1.9.60 - - + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 diff --git a/appengine-java8/images/src/main/java/com/example/appengine/images/ImagesServlet.java b/appengine-java8/images/src/main/java/com/example/appengine/images/ImagesServlet.java index d8ae82035a5..45815ab327e 100644 --- a/appengine-java8/images/src/main/java/com/example/appengine/images/ImagesServlet.java +++ b/appengine-java8/images/src/main/java/com/example/appengine/images/ImagesServlet.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2015 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/appengine-java8/logs/README.md b/appengine-java8/logs/README.md index ce1f661c796..8e8f2d5ea59 100644 --- a/appengine-java8/logs/README.md +++ b/appengine-java8/logs/README.md @@ -1,5 +1,8 @@ # Users Authentication sample for Google App Engine + +Open in Cloud Shell + This sample demonstrates how to use the [Logs API][log-docs] on [Google App Engine][ae-docs]. diff --git a/appengine-java8/logs/pom.xml b/appengine-java8/logs/pom.xml index b6c763b239b..df073cdaa2d 100644 --- a/appengine-java8/logs/pom.xml +++ b/appengine-java8/logs/pom.xml @@ -20,18 +20,27 @@ 1.0-SNAPSHOT com.example.appengine appengine-logs-j8 - + + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 - + + + 1.8 + 1.8 + + + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 com.google.guava diff --git a/appengine-java8/mailgun/README.md b/appengine-java8/mailgun/README.md index 582771ddb34..ffe9512006f 100644 --- a/appengine-java8/mailgun/README.md +++ b/appengine-java8/mailgun/README.md @@ -1,5 +1,8 @@ # Java Mailgun Email Sample for Google App Engine Standard Environment + +Open in Cloud Shell + This sample demonstrates how to use [Mailgun][mailgun-api] on [Google App Engine standard environment][ae-docs]. diff --git a/appengine-java8/mailgun/pom.xml b/appengine-java8/mailgun/pom.xml index 4017daac51b..3a7d8125bee 100644 --- a/appengine-java8/mailgun/pom.xml +++ b/appengine-java8/mailgun/pom.xml @@ -19,12 +19,22 @@ 1.0-SNAPSHOT com.example.appengine appengine-mailgun-j8 + + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + + 1.8 + 1.8 + + javax.servlet diff --git a/appengine-java8/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java b/appengine-java8/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java index 7e1c907d479..2928df1e361 100644 --- a/appengine-java8/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java +++ b/appengine-java8/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java @@ -1,14 +1,16 @@ /* * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/mailjet/README.md b/appengine-java8/mailjet/README.md index 0a9bddaaac7..4b3b3a13149 100644 --- a/appengine-java8/mailjet/README.md +++ b/appengine-java8/mailjet/README.md @@ -1,4 +1,9 @@ # Mailjet sample for Google App Engine + + +Open in Cloud Shell + + This sample demonstrates how to use [Mailjet](https://www.mailjet.com/) on Google Managed VMs to send emails from a verified sender you own. diff --git a/appengine-java8/mailjet/pom.xml b/appengine-java8/mailjet/pom.xml index 338a1fdc7de..5e3f664f3af 100644 --- a/appengine-java8/mailjet/pom.xml +++ b/appengine-java8/mailjet/pom.xml @@ -19,20 +19,26 @@ 1.0-SNAPSHOT com.example.appengine appengine-mailjet-j8 + + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 - 4.1.1 + 1.8 + 1.8 + com.mailjet mailjet-client - ${mailjet.version} + 4.1.1 diff --git a/appengine-java8/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java b/appengine-java8/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java index 14baf5f114e..25d04f04f9f 100644 --- a/appengine-java8/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java +++ b/appengine-java8/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java @@ -1,16 +1,19 @@ /* - * Copyright 2016 Google Inc. + * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ + // [START mailjet_imports] package com.example.appengine.mailjet; diff --git a/appengine-java8/memcache/pom.xml b/appengine-java8/memcache/pom.xml index daf8e890fec..f8f2b32b3a4 100644 --- a/appengine-java8/memcache/pom.xml +++ b/appengine-java8/memcache/pom.xml @@ -20,13 +20,21 @@ Copyright 2015 Google Inc. com.example.appengine appengine-memcache-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + javax.servlet @@ -37,11 +45,10 @@ Copyright 2015 Google Inc. - com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 com.googlecode.xmemcached diff --git a/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java b/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java index 2a90cc0cb18..7fdde25ab4e 100644 --- a/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java +++ b/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheBestPracticeServlet.java b/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheBestPracticeServlet.java index 119c84a1c06..f99cbe061a4 100644 --- a/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheBestPracticeServlet.java +++ b/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheBestPracticeServlet.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheConcurrentServlet.java b/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheConcurrentServlet.java index 379114d2e1b..9e6c350aed2 100644 --- a/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheConcurrentServlet.java +++ b/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheConcurrentServlet.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheSyncCacheServlet.java b/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheSyncCacheServlet.java index f146effb400..b3b421d8b29 100644 --- a/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheSyncCacheServlet.java +++ b/appengine-java8/memcache/src/main/java/com/example/appengine/memcache/MemcacheSyncCacheServlet.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/appengine-java8/metadata/README.md b/appengine-java8/metadata/README.md index 34b6577e3f2..95ffac90b26 100644 --- a/appengine-java8/metadata/README.md +++ b/appengine-java8/metadata/README.md @@ -1,5 +1,8 @@ # Google App Engine - Metadata Inspection + +Open in Cloud Shell + This sample displays what's going on in your app. It dumps the environment and lots more. See the [Google App Engine standard environment documentation][ae-docs] for more diff --git a/appengine-java8/metadata/pom.xml b/appengine-java8/metadata/pom.xml index 80ad3cf5385..2e04a8e6760 100644 --- a/appengine-java8/metadata/pom.xml +++ b/appengine-java8/metadata/pom.xml @@ -21,11 +21,14 @@ Copyright 2017 Google Inc. com.example.appengine metadata-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 diff --git a/appengine-java8/metadata/src/main/java/com/example/appengine/standard/MetadataServlet.java b/appengine-java8/metadata/src/main/java/com/example/appengine/standard/MetadataServlet.java index ae6c2c982d3..fc8bc509df3 100644 --- a/appengine-java8/metadata/src/main/java/com/example/appengine/standard/MetadataServlet.java +++ b/appengine-java8/metadata/src/main/java/com/example/appengine/standard/MetadataServlet.java @@ -1,15 +1,17 @@ -/** +/* * Copyright 2017 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.example.appengine.standard; diff --git a/appengine-java8/multitenancy/README.md b/appengine-java8/multitenancy/README.md index d11dd5df9ac..5b4e82eaa5c 100644 --- a/appengine-java8/multitenancy/README.md +++ b/appengine-java8/multitenancy/README.md @@ -1,5 +1,9 @@ # Multitenancy Java sample + +Open in Cloud Shell + + Shows the usage of the Namespaces API. An App Engine guestbook using Java, Maven, and Objectify. diff --git a/appengine-java8/multitenancy/pom.xml b/appengine-java8/multitenancy/pom.xml index afd1d69ff58..37f84d667bf 100644 --- a/appengine-java8/multitenancy/pom.xml +++ b/appengine-java8/multitenancy/pom.xml @@ -23,23 +23,26 @@ com.example.appengine appengine-multitenancy-j8 - - 5.1.21 - 20.0 - + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 @@ -60,12 +63,12 @@ com.google.guava guava - ${guava.version} + 23.0 com.googlecode.objectify objectify - ${objectify.version} + 5.1.21 @@ -85,19 +88,19 @@ com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/multitenancy/src/main/java/com/example/appengine/Greeting.java b/appengine-java8/multitenancy/src/main/java/com/example/appengine/Greeting.java index e3406d63728..8f1e0bb228a 100644 --- a/appengine-java8/multitenancy/src/main/java/com/example/appengine/Greeting.java +++ b/appengine-java8/multitenancy/src/main/java/com/example/appengine/Greeting.java @@ -1,14 +1,16 @@ -/** - * Copyright 2014-2015 Google Inc. +/* + * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/multitenancy/src/main/java/com/example/appengine/Guestbook.java b/appengine-java8/multitenancy/src/main/java/com/example/appengine/Guestbook.java index 22e94cf01f5..40840fa7a21 100644 --- a/appengine-java8/multitenancy/src/main/java/com/example/appengine/Guestbook.java +++ b/appengine-java8/multitenancy/src/main/java/com/example/appengine/Guestbook.java @@ -1,14 +1,16 @@ /* - * Copyright 2014-2015 Google Inc. + * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/multitenancy/src/main/java/com/example/appengine/MultitenancyServlet.java b/appengine-java8/multitenancy/src/main/java/com/example/appengine/MultitenancyServlet.java index d9829c159d2..8cdc4d7a470 100644 --- a/appengine-java8/multitenancy/src/main/java/com/example/appengine/MultitenancyServlet.java +++ b/appengine-java8/multitenancy/src/main/java/com/example/appengine/MultitenancyServlet.java @@ -3,7 +3,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/appengine-java8/multitenancy/src/main/java/com/example/appengine/NamespaceFilter.java b/appengine-java8/multitenancy/src/main/java/com/example/appengine/NamespaceFilter.java index 0c48123a913..17e84e90620 100644 --- a/appengine-java8/multitenancy/src/main/java/com/example/appengine/NamespaceFilter.java +++ b/appengine-java8/multitenancy/src/main/java/com/example/appengine/NamespaceFilter.java @@ -3,7 +3,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/appengine-java8/multitenancy/src/main/java/com/example/appengine/OfyHelper.java b/appengine-java8/multitenancy/src/main/java/com/example/appengine/OfyHelper.java index b5e225700ba..332f7b77e5b 100644 --- a/appengine-java8/multitenancy/src/main/java/com/example/appengine/OfyHelper.java +++ b/appengine-java8/multitenancy/src/main/java/com/example/appengine/OfyHelper.java @@ -1,16 +1,19 @@ /* - * Copyright 2014-2015 Google Inc. + * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ + //[START all] package com.example.appengine; diff --git a/appengine-java8/multitenancy/src/main/java/com/example/appengine/SignGuestbookServlet.java b/appengine-java8/multitenancy/src/main/java/com/example/appengine/SignGuestbookServlet.java index 3941927edaa..0e452b20d32 100644 --- a/appengine-java8/multitenancy/src/main/java/com/example/appengine/SignGuestbookServlet.java +++ b/appengine-java8/multitenancy/src/main/java/com/example/appengine/SignGuestbookServlet.java @@ -1,14 +1,16 @@ /* - * Copyright 2014-2015 Google Inc. + * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/multitenancy/src/main/java/com/example/appengine/SomeRequestServlet.java b/appengine-java8/multitenancy/src/main/java/com/example/appengine/SomeRequestServlet.java index ace077f095b..2bfa418cfd0 100644 --- a/appengine-java8/multitenancy/src/main/java/com/example/appengine/SomeRequestServlet.java +++ b/appengine-java8/multitenancy/src/main/java/com/example/appengine/SomeRequestServlet.java @@ -3,7 +3,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/appengine-java8/multitenancy/src/main/java/com/example/appengine/UpdateCountsServlet.java b/appengine-java8/multitenancy/src/main/java/com/example/appengine/UpdateCountsServlet.java index d9fec18b5a1..76e15d88990 100644 --- a/appengine-java8/multitenancy/src/main/java/com/example/appengine/UpdateCountsServlet.java +++ b/appengine-java8/multitenancy/src/main/java/com/example/appengine/UpdateCountsServlet.java @@ -3,7 +3,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/appengine-java8/multitenancy/src/test/java/com/example/appengine/GreetingTest.java b/appengine-java8/multitenancy/src/test/java/com/example/appengine/GreetingTest.java index f38eaaf868e..3fc186380b9 100644 --- a/appengine-java8/multitenancy/src/test/java/com/example/appengine/GreetingTest.java +++ b/appengine-java8/multitenancy/src/test/java/com/example/appengine/GreetingTest.java @@ -3,7 +3,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/appengine-java8/multitenancy/src/test/java/com/example/appengine/GuestbookTestUtilities.java b/appengine-java8/multitenancy/src/test/java/com/example/appengine/GuestbookTestUtilities.java index 796303a4373..9dcafcc102b 100644 --- a/appengine-java8/multitenancy/src/test/java/com/example/appengine/GuestbookTestUtilities.java +++ b/appengine-java8/multitenancy/src/test/java/com/example/appengine/GuestbookTestUtilities.java @@ -3,7 +3,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/appengine-java8/oauth2/README.md b/appengine-java8/oauth2/README.md index 3f38cfba462..5ea35104d35 100644 --- a/appengine-java8/oauth2/README.md +++ b/appengine-java8/oauth2/README.md @@ -1,4 +1,8 @@ # Google App Engine Standard Environment + + +Open in Cloud Shell + ## Oauth2 Sample This sample demonstrates using the Oauth2 apis to create an authenticaion filter. diff --git a/appengine-java8/oauth2/pom.xml b/appengine-java8/oauth2/pom.xml index c98f713c1f7..470e22b9026 100644 --- a/appengine-java8/oauth2/pom.xml +++ b/appengine-java8/oauth2/pom.xml @@ -20,18 +20,25 @@ com.example.appengine appengine-oauth2-j8 + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 diff --git a/appengine-java8/oauth2/src/main/java/com/example/appengine/HelloServlet.java b/appengine-java8/oauth2/src/main/java/com/example/appengine/HelloServlet.java index d7d9477ef49..be4e4f68a17 100644 --- a/appengine-java8/oauth2/src/main/java/com/example/appengine/HelloServlet.java +++ b/appengine-java8/oauth2/src/main/java/com/example/appengine/HelloServlet.java @@ -1,14 +1,16 @@ /* * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/oauth2/src/main/java/com/example/appengine/Oauth2Filter.java b/appengine-java8/oauth2/src/main/java/com/example/appengine/Oauth2Filter.java index f9395222658..5a65172b098 100644 --- a/appengine-java8/oauth2/src/main/java/com/example/appengine/Oauth2Filter.java +++ b/appengine-java8/oauth2/src/main/java/com/example/appengine/Oauth2Filter.java @@ -3,7 +3,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/appengine-java8/pom.xml b/appengine-java8/pom.xml index acded09594a..f626dc0da1b 100644 --- a/appengine-java8/pom.xml +++ b/appengine-java8/pom.xml @@ -21,82 +21,62 @@ appengine-java8-samples pom - + - doc-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 - + - 1.9.52 + 1.8 + 1.8 - analytics appidentity bigtable cloudsql - datastore datastore-indexes datastore-indexes-exploding datastore-indexes-perfect - endpoints-v2-backend endpoints-v2-migration endpoints-v2-guice endpoints-v2-skeleton - firebase-event-proxy - firebase-tictactoe - gaeinfo - guestbook-cloud-datastore guestbook-objectify - images logs mailgun mailjet memcache - metadata - multitenancy - oauth2 - postgres - pubsub - requests - remote-client remote-server - search - sendgrid - spanner - static-files - taskqueues-deferred taskqueues-pull taskqueues-push - twilio - urlfetch users - diff --git a/appengine-java8/postgres/README.md b/appengine-java8/postgres/README.md index b91e64e824c..a787ceeff18 100644 --- a/appengine-java8/postgres/README.md +++ b/appengine-java8/postgres/README.md @@ -1,4 +1,8 @@ # Postgre SQL sample for Google App Engine J8 + + +Open in Cloud Shell + This sample demonstrates how to use [PostgreSql](https://cloud.google.com/sql/) on Google App Engine standard Java 8 diff --git a/appengine-java8/postgres/pom.xml b/appengine-java8/postgres/pom.xml index 708d9471dd0..40d16e2af3a 100644 --- a/appengine-java8/postgres/pom.xml +++ b/appengine-java8/postgres/pom.xml @@ -20,11 +20,14 @@ com.example.appengine appengine-postgreSQL-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 diff --git a/appengine-java8/postgres/src/main/java/com/example/appengine/postgresql/PostgreSqlServlet.java b/appengine-java8/postgres/src/main/java/com/example/appengine/postgresql/PostgreSqlServlet.java index 46d34497463..ba2ac4442ff 100644 --- a/appengine-java8/postgres/src/main/java/com/example/appengine/postgresql/PostgreSqlServlet.java +++ b/appengine-java8/postgres/src/main/java/com/example/appengine/postgresql/PostgreSqlServlet.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/appengine-java8/pubsub/README.md b/appengine-java8/pubsub/README.md index 2852d718eab..c3294dcfb5e 100644 --- a/appengine-java8/pubsub/README.md +++ b/appengine-java8/pubsub/README.md @@ -1,5 +1,8 @@ # Using Google Cloud Pub/Sub on App Engine Standard Java 8 Environment + +Open in Cloud Shell + This sample demonstrates how to use [Google Cloud Pub/Sub][pubsub] from [Google App Engine standard environment][ae-docs]. diff --git a/appengine-java8/pubsub/pom.xml b/appengine-java8/pubsub/pom.xml index 1e71561fa5c..126fc4f869e 100644 --- a/appengine-java8/pubsub/pom.xml +++ b/appengine-java8/pubsub/pom.xml @@ -21,11 +21,14 @@ com.example.flexible appengine-pubsub + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 diff --git a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/Message.java b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/Message.java index 555d328cb38..ff83a311732 100644 --- a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/Message.java +++ b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/Message.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2017 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/MessageRepository.java b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/MessageRepository.java index d68e210f560..c2fc2f78761 100644 --- a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/MessageRepository.java +++ b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/MessageRepository.java @@ -1,17 +1,20 @@ -/** +/* * Copyright 2017 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ + package com.example.appengine.pubsub; import java.util.List; diff --git a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/MessageRepositoryImpl.java b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/MessageRepositoryImpl.java index 8d8e5a6b18e..521c82f13dd 100644 --- a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/MessageRepositoryImpl.java +++ b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/MessageRepositoryImpl.java @@ -1,17 +1,20 @@ -/** +/* * Copyright 2017 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ + package com.example.appengine.pubsub; import com.google.cloud.datastore.Datastore; diff --git a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubHome.java b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubHome.java index b9b551de376..be9ab2546e6 100644 --- a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubHome.java +++ b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubHome.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2017 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPublish.java b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPublish.java index 72f15161702..bcf19d66b49 100644 --- a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPublish.java +++ b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPublish.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2017 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPush.java b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPush.java index 225757a8744..0d3f5a2def6 100644 --- a/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPush.java +++ b/appengine-java8/pubsub/src/main/java/com/example/appengine/pubsub/PubSubPush.java @@ -1,16 +1,19 @@ -/** +/* * Copyright 2017 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ + package com.example.appengine.pubsub; import com.google.gson.Gson; diff --git a/appengine-java8/remote-README.md b/appengine-java8/remote-README.md index 1cff7ec12ec..ed6f9b09af8 100644 --- a/appengine-java8/remote-README.md +++ b/appengine-java8/remote-README.md @@ -1,5 +1,8 @@ # Google App Engine Standard Environment Remote API Sample + +Open in Cloud Shell + This sample demonstrates how to access App Engine Standard Environment APIs remotely, using the [Remote API](https://cloud.google.com/appengine/docs/java/tools/remoteapi). diff --git a/appengine-java8/remote-client/pom.xml b/appengine-java8/remote-client/pom.xml index 9a61f65f994..c8b72634d86 100644 --- a/appengine-java8/remote-client/pom.xml +++ b/appengine-java8/remote-client/pom.xml @@ -20,24 +20,31 @@ com.example.appengine appengine-remote-client-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 - + + 1.8 + 1.8 + + com.google.appengine appengine-remote-api - ${appengine.sdk.version} + 1.9.59 com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 diff --git a/appengine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java b/appengine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java index e1ec3ab045e..a633f9838ae 100644 --- a/appengine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java +++ b/appengine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/remote-server/pom.xml b/appengine-java8/remote-server/pom.xml index 46f30a00703..d7aa7c9c76a 100644 --- a/appengine-java8/remote-server/pom.xml +++ b/appengine-java8/remote-server/pom.xml @@ -20,18 +20,26 @@ com.example.appengine appengine-remote-server-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 - + + + 1.8 + 1.8 + + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 org.apache.httpcomponents diff --git a/appengine-java8/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java b/appengine-java8/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java index 8f95fd8b90d..58acb6d7a8b 100644 --- a/appengine-java8/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java +++ b/appengine-java8/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/appengine-java8/requests/README.md b/appengine-java8/requests/README.md index 208738a275b..93fc345b425 100644 --- a/appengine-java8/requests/README.md +++ b/appengine-java8/requests/README.md @@ -1,5 +1,8 @@ # Request Handling sample for Google App Engine + +Open in Cloud Shell + This sample provides Java code samples in support of the "Handling Requests" description [Requests][requests-doc] on [Google App Engine][ae-docs]. diff --git a/appengine-java8/requests/pom.xml b/appengine-java8/requests/pom.xml index dd467ba601f..973633afd23 100644 --- a/appengine-java8/requests/pom.xml +++ b/appengine-java8/requests/pom.xml @@ -21,19 +21,26 @@ Copyright 2016 Google Inc. com.example.appengine appengine-requests-j8 - + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + com.google.appengine appengine-maven-plugin - ${appengine.sdk.version} + 1.9.59 @@ -71,19 +78,19 @@ Copyright 2016 Google Inc. com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/search/README.md b/appengine-java8/search/README.md index ee1c00203dc..7769a17d747 100644 --- a/appengine-java8/search/README.md +++ b/appengine-java8/search/README.md @@ -1,5 +1,9 @@ # Google App Engine Standard Environment Search API Sample + +Open in Cloud Shell + + This sample demonstrates how to use App Engine Search API. See the [Google App Engine Search API documentation][search-api-docs] for more diff --git a/appengine-java8/search/pom.xml b/appengine-java8/search/pom.xml index da6e4ed4b77..de3397590e3 100644 --- a/appengine-java8/search/pom.xml +++ b/appengine-java8/search/pom.xml @@ -20,17 +20,26 @@ Copyright 2015 Google Inc. com.example.appengine appengine-search-j8 + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + + 1.8 + 1.8 + + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 javax.servlet @@ -56,19 +65,19 @@ Copyright 2015 Google Inc. com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/search/src/main/java/com/example/appengine/search/DeleteServlet.java b/appengine-java8/search/src/main/java/com/example/appengine/search/DeleteServlet.java index 136b86fd044..6166f7fd93f 100644 --- a/appengine-java8/search/src/main/java/com/example/appengine/search/DeleteServlet.java +++ b/appengine-java8/search/src/main/java/com/example/appengine/search/DeleteServlet.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/main/java/com/example/appengine/search/DocumentServlet.java b/appengine-java8/search/src/main/java/com/example/appengine/search/DocumentServlet.java index ff377363657..c5e63b15f89 100644 --- a/appengine-java8/search/src/main/java/com/example/appengine/search/DocumentServlet.java +++ b/appengine-java8/search/src/main/java/com/example/appengine/search/DocumentServlet.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/main/java/com/example/appengine/search/IndexServlet.java b/appengine-java8/search/src/main/java/com/example/appengine/search/IndexServlet.java index e4135b63df3..0ebb34e29c6 100644 --- a/appengine-java8/search/src/main/java/com/example/appengine/search/IndexServlet.java +++ b/appengine-java8/search/src/main/java/com/example/appengine/search/IndexServlet.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/main/java/com/example/appengine/search/SchemaServlet.java b/appengine-java8/search/src/main/java/com/example/appengine/search/SchemaServlet.java index 9233b5f081a..44f2a4d52b2 100644 --- a/appengine-java8/search/src/main/java/com/example/appengine/search/SchemaServlet.java +++ b/appengine-java8/search/src/main/java/com/example/appengine/search/SchemaServlet.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/main/java/com/example/appengine/search/SearchOptionServlet.java b/appengine-java8/search/src/main/java/com/example/appengine/search/SearchOptionServlet.java index fb9ea08fb0b..5a3c751b7bc 100644 --- a/appengine-java8/search/src/main/java/com/example/appengine/search/SearchOptionServlet.java +++ b/appengine-java8/search/src/main/java/com/example/appengine/search/SearchOptionServlet.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/main/java/com/example/appengine/search/SearchServlet.java b/appengine-java8/search/src/main/java/com/example/appengine/search/SearchServlet.java index 60c47675aa3..d9ef92a917e 100644 --- a/appengine-java8/search/src/main/java/com/example/appengine/search/SearchServlet.java +++ b/appengine-java8/search/src/main/java/com/example/appengine/search/SearchServlet.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/main/java/com/example/appengine/search/Utils.java b/appengine-java8/search/src/main/java/com/example/appengine/search/Utils.java index b504f4613dc..013eda99e41 100644 --- a/appengine-java8/search/src/main/java/com/example/appengine/search/Utils.java +++ b/appengine-java8/search/src/main/java/com/example/appengine/search/Utils.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/DeleteServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/DeleteServletTest.java index f60d8e8daf4..8e9041183ee 100644 --- a/appengine-java8/search/src/test/java/com/example/appengine/search/DeleteServletTest.java +++ b/appengine-java8/search/src/test/java/com/example/appengine/search/DeleteServletTest.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/DocumentServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/DocumentServletTest.java index 0e94495b06c..d34440acf7b 100644 --- a/appengine-java8/search/src/test/java/com/example/appengine/search/DocumentServletTest.java +++ b/appengine-java8/search/src/test/java/com/example/appengine/search/DocumentServletTest.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/IndexServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/IndexServletTest.java index 6f3ed56082a..51ab18aec74 100644 --- a/appengine-java8/search/src/test/java/com/example/appengine/search/IndexServletTest.java +++ b/appengine-java8/search/src/test/java/com/example/appengine/search/IndexServletTest.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/SchemaServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/SchemaServletTest.java index e8d20dfaf3d..119b9214556 100644 --- a/appengine-java8/search/src/test/java/com/example/appengine/search/SchemaServletTest.java +++ b/appengine-java8/search/src/test/java/com/example/appengine/search/SchemaServletTest.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java index 3b8b3a3ecfe..a810889300a 100644 --- a/appengine-java8/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java +++ b/appengine-java8/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/SearchServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/SearchServletTest.java index 1f11f2f4111..f18770df372 100644 --- a/appengine-java8/search/src/test/java/com/example/appengine/search/SearchServletTest.java +++ b/appengine-java8/search/src/test/java/com/example/appengine/search/SearchServletTest.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/UtilsTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/UtilsTest.java index daf2c7d45b2..611ab9f8537 100644 --- a/appengine-java8/search/src/test/java/com/example/appengine/search/UtilsTest.java +++ b/appengine-java8/search/src/test/java/com/example/appengine/search/UtilsTest.java @@ -1,14 +1,16 @@ /* * Copyright 2016 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/sendgrid/README.md b/appengine-java8/sendgrid/README.md index d7a8f6b0654..a64a01183e9 100644 --- a/appengine-java8/sendgrid/README.md +++ b/appengine-java8/sendgrid/README.md @@ -1,5 +1,8 @@ # Java SendGrid Email Sample for Google App Engine Standard Environment + +Open in Cloud Shell + This sample demonstrates how to use [SendGrid](https://www.sendgrid.com) on [Google App Engine standard environment][ae-docs]. diff --git a/appengine-java8/sendgrid/pom.xml b/appengine-java8/sendgrid/pom.xml index 64b2c60c592..c099ce8026d 100644 --- a/appengine-java8/sendgrid/pom.xml +++ b/appengine-java8/sendgrid/pom.xml @@ -20,13 +20,21 @@ Copyright 2015 Google Inc. com.example.appengine appengine-sendgrid-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + javax.servlet diff --git a/appengine-java8/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java b/appengine-java8/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java index 0b918e89752..1fa3272b27b 100644 --- a/appengine-java8/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java +++ b/appengine-java8/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java @@ -1,15 +1,17 @@ -/** +/* * Copyright 2015 Google Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.example.appengine.sendgrid; diff --git a/appengine-java8/spanner/README.md b/appengine-java8/spanner/README.md index 43a2d6ddaf3..332a2432ae4 100644 --- a/appengine-java8/spanner/README.md +++ b/appengine-java8/spanner/README.md @@ -1,5 +1,8 @@ # Google Cloud Spanner Sample + +Open in Cloud Shell + This sample demonstrates how to use [Google Cloud Spanner][spanner-docs] from [Google App Engine standard environment][ae-docs]. diff --git a/appengine-java8/spanner/pom.xml b/appengine-java8/spanner/pom.xml index c06eecb4fbc..41c61c08915 100644 --- a/appengine-java8/spanner/pom.xml +++ b/appengine-java8/spanner/pom.xml @@ -22,16 +22,23 @@ appengine-spanner-j8 1.0-SNAPSHOT war - - false - + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + + 1.8 + 1.8 + + false + diff --git a/appengine-java8/spanner/src/main/java/com/example/appengine/spanner/SpannerClient.java b/appengine-java8/spanner/src/main/java/com/example/appengine/spanner/SpannerClient.java index fc2b2becc87..307aba9aee3 100644 --- a/appengine-java8/spanner/src/main/java/com/example/appengine/spanner/SpannerClient.java +++ b/appengine-java8/spanner/src/main/java/com/example/appengine/spanner/SpannerClient.java @@ -1,14 +1,16 @@ -/** +/* * Copyright 2017 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/static-files/pom.xml b/appengine-java8/static-files/pom.xml index 1d4d229cf39..3999c496d7b 100644 --- a/appengine-java8/static-files/pom.xml +++ b/appengine-java8/static-files/pom.xml @@ -20,13 +20,21 @@ Copyright 2015 Google Inc. com.example.appengine appengine-staticfiles-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + javax.servlet diff --git a/appengine-java8/taskqueues-README.md b/appengine-java8/taskqueues-README.md deleted file mode 100644 index a8cda57b7a3..00000000000 --- a/appengine-java8/taskqueues-README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Task Queue Java Snippets - -These are Java samples for using the [Task Queue](https://cloud.google.com/appengine/docs/java/taskqueue/) - - diff --git a/appengine-java8/taskqueues-deferred/README.md b/appengine-java8/taskqueues-deferred/README.md index 8ed90310827..bb5f87a396a 100644 --- a/appengine-java8/taskqueues-deferred/README.md +++ b/appengine-java8/taskqueues-deferred/README.md @@ -1,6 +1,9 @@ App Engine Java Guestbook Copyright (C) 2010-2012 Google Inc. + +Open in Cloud Shell + ## Sample guestbook for use with App Engine Java. Requires [Apache Maven](http://maven.apache.org) 3.1 or greater, and JDK 7+ in order to run. diff --git a/appengine-java8/taskqueues-deferred/pom.xml b/appengine-java8/taskqueues-deferred/pom.xml index eff0eac977a..8dbfabb2639 100644 --- a/appengine-java8/taskqueues-deferred/pom.xml +++ b/appengine-java8/taskqueues-deferred/pom.xml @@ -20,18 +20,19 @@ com.google.cloud.taskqueue.samples taskqueue-defer-j8 - + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 1.8 1.8 - 1.9.60 @@ -39,7 +40,7 @@ com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 @@ -70,12 +71,12 @@ com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 diff --git a/appengine-java8/taskqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java b/appengine-java8/taskqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java index 146509033bf..392cbffed9e 100644 --- a/appengine-java8/taskqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java +++ b/appengine-java8/taskqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java @@ -1,15 +1,17 @@ /* * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and - * limitations under the License. This package demonstrates how to use the task queue with Java. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /** This package demonstrates how to use the task queue with Java. */ diff --git a/appengine-java8/taskqueues-pull/README.md b/appengine-java8/taskqueues-pull/README.md index 0f51bfc1cf4..0f3fc7c1064 100644 --- a/appengine-java8/taskqueues-pull/README.md +++ b/appengine-java8/taskqueues-pull/README.md @@ -1,5 +1,8 @@ # Pull Task Queue sample for Google App Engine + +Open in Cloud Shell + This sample demonstrates how to use [pull task queues][appid] on [Google App Engine][ae-docs]. diff --git a/appengine-java8/taskqueues-pull/pom.xml b/appengine-java8/taskqueues-pull/pom.xml index 71176488c4c..724abfef467 100644 --- a/appengine-java8/taskqueues-pull/pom.xml +++ b/appengine-java8/taskqueues-pull/pom.xml @@ -23,18 +23,27 @@ Copyright 2016 Google Inc. com.example.taskqueue appengine-taskqueue-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + + 1.8 + 1.8 + + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 javax.servlet @@ -53,13 +62,13 @@ Copyright 2016 Google Inc. com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/taskqueues-pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java b/appengine-java8/taskqueues-pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java index b70c9ee32b0..c6dfbe14873 100644 --- a/appengine-java8/taskqueues-pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java +++ b/appengine-java8/taskqueues-pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java @@ -1,14 +1,16 @@ /* * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/taskqueues-push/README.md b/appengine-java8/taskqueues-push/README.md index e235666bdac..9a698895a93 100644 --- a/appengine-java8/taskqueues-push/README.md +++ b/appengine-java8/taskqueues-push/README.md @@ -1,5 +1,8 @@ # A Java Task Queue example for Google App Engine + +Open in Cloud Shell + This sample demonstrates how to use the [TaskQueue API][taskqueue-api] on [Google App Engine][ae-docs]. diff --git a/appengine-java8/taskqueues-push/pom.xml b/appengine-java8/taskqueues-push/pom.xml index 07fa20bb6cc..6de6d25f730 100644 --- a/appengine-java8/taskqueues-push/pom.xml +++ b/appengine-java8/taskqueues-push/pom.xml @@ -20,13 +20,22 @@ Copyright 2016 Google Inc. 1.0-SNAPSHOT com.example.appengine taskqueue-push-j8 - + + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + + 1.8 + 1.8 + + javax.servlet @@ -44,7 +53,7 @@ Copyright 2016 Google Inc. com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 @@ -62,19 +71,19 @@ Copyright 2016 Google Inc. com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test diff --git a/appengine-java8/twilio/README.md b/appengine-java8/twilio/README.md index 16c71862da1..f3a72156376 100644 --- a/appengine-java8/twilio/README.md +++ b/appengine-java8/twilio/README.md @@ -1,5 +1,8 @@ # Java Twilio Voice and SMS Sample for Google App Engine Standard Environment + +Open in Cloud Shell + This sample demonstrates how to use [Twilio](https://www.twilio.com) on [Google App Engine standard environment][ae-docs]. diff --git a/appengine-java8/twilio/pom.xml b/appengine-java8/twilio/pom.xml index 6ef9198a217..70d4df4abeb 100644 --- a/appengine-java8/twilio/pom.xml +++ b/appengine-java8/twilio/pom.xml @@ -20,13 +20,22 @@ Copyright 2015 Google Inc. com.example.appengine appengine-twilio-j8 + - appengine-java8-samples - com.google.cloud - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + + diff --git a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java index 6537a76c21c..d75906550c0 100644 --- a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java +++ b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java @@ -1,14 +1,16 @@ /* * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java index a48b5c0c8b7..88446602c42 100644 --- a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java +++ b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java @@ -1,14 +1,16 @@ /* * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java index 423ca41dc6b..c5b9eb7f744 100644 --- a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java +++ b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java @@ -1,14 +1,16 @@ /* * Copyright 2015 Google Inc. * - *

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - *

http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - *

Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing permissions and + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and * limitations under the License. */ diff --git a/appengine-java8/urlfetch/README.md b/appengine-java8/urlfetch/README.md index ac515ce7a55..87fbf5c508b 100644 --- a/appengine-java8/urlfetch/README.md +++ b/appengine-java8/urlfetch/README.md @@ -1,5 +1,8 @@ # Google App Engine Standard Environment URL Fetch Sample + +Open in Cloud Shell + This sample demonstrates how to deploy an application on Google App Engine. See the [Google App Engine standard environment documentation][ae-docs] for more diff --git a/appengine-java8/urlfetch/pom.xml b/appengine-java8/urlfetch/pom.xml index 9660e1326e6..fb2038d4ee8 100644 --- a/appengine-java8/urlfetch/pom.xml +++ b/appengine-java8/urlfetch/pom.xml @@ -20,13 +20,21 @@ Copyright 2015 Google Inc. com.example.appengine appengine-URLFetch-j8 + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + + javax.servlet diff --git a/appengine-java8/urlfetch/src/main/java/com/example/appengine/UrlFetchServlet.java b/appengine-java8/urlfetch/src/main/java/com/example/appengine/UrlFetchServlet.java index 6ff3f0d0f0b..c3a0d6d5e0f 100644 --- a/appengine-java8/urlfetch/src/main/java/com/example/appengine/UrlFetchServlet.java +++ b/appengine-java8/urlfetch/src/main/java/com/example/appengine/UrlFetchServlet.java @@ -3,7 +3,9 @@ * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/appengine-java8/users/README.md b/appengine-java8/users/README.md index e58938a662a..157c4968faf 100644 --- a/appengine-java8/users/README.md +++ b/appengine-java8/users/README.md @@ -1,5 +1,8 @@ # Users Authentication sample for Google App Engine + +Open in Cloud Shell + This sample demonstrates how to use the [Users API][appid] on [Google App Engine][ae-docs]. diff --git a/appengine-java8/users/pom.xml b/appengine-java8/users/pom.xml index dd13ea4376d..919a89372e2 100644 --- a/appengine-java8/users/pom.xml +++ b/appengine-java8/users/pom.xml @@ -22,19 +22,25 @@ Copyright 2015 Google Inc. com.example.appengine appengine-users-j8 - + - com.google.cloud - appengine-java8-samples - 1.0.0 - .. + com.google.cloud.samples + shared-configuration + 1.0.8 + + 1.8 + 1.8 + com.google.appengine appengine-api-1.0-sdk - ${appengine.sdk.version} + 1.9.59 com.google.guava @@ -72,19 +78,19 @@ Copyright 2015 Google Inc. com.google.appengine appengine-testing - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-api-stubs - ${appengine.sdk.version} + 1.9.59 test com.google.appengine appengine-tools-sdk - ${appengine.sdk.version} + 1.9.59 test