From 95e6511cdb956c676303f8759aed795df2f7d583 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Thu, 27 Apr 2017 12:04:20 -0700 Subject: [PATCH 1/6] Updating README to be explicit of the discovery document workflow --- .../migration-example/README.md | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/appengine/endpoints-frameworks-v2/migration-example/README.md b/appengine/endpoints-frameworks-v2/migration-example/README.md index b9357a8af1c..bd007ab3ad8 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/README.md +++ b/appengine/endpoints-frameworks-v2/migration-example/README.md @@ -1,7 +1,12 @@ # Hello World Google Cloud Endpoints for App Engine 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]. +[Google Cloud Endpoints Frameworks][3] to new +[Google Cloud Endpoints Frameworks for App Engine][8] using a +**Discovery Document**. Additionally, this sample provides an example of using +the new App Engine Maven and Gradle plugins for deploying your Google App Engine +Standard applications. + This sample contains comments of how to use the prior Endpoints Frameworks as well. For clarity, the prior Endpoints Frameworks and the new Endpoints Frameworks are denoted as Endpoints Frameworks v1.0 and Endpoints Frameworks @@ -22,6 +27,10 @@ process is explained [here][8] and a quickstart is provided [here][9]. - [Google Cloud Endpoints Frameworks v1.0][3] ## Build and Deployment Plugins +- [Google App Engine Maven plugin][14] +- [Google App Engine Gradle plugin][15] + +## Discovery Document and Client Library Generation Plugins - [Google Cloud Endpoints Frameworks Maven Plugin][10] - [Google Cloud Endpoints Frameworks Gradle Plugin][11] @@ -37,10 +46,12 @@ process is explained [here][8] and a quickstart is provided [here][9]. have registered in the [Credentials on Developers Console for OAuth 2.0 client IDs][6]. -1. [Optional]: User Authenticating with Google Accounts in other Applications Types +1. [Optional]: User Authenticating with Google Accounts in other Applications + Types - - Inside [Constants.java](src/main/java/com/example/helloendpoints/Constants.java) you will find placeholders for Android - applications using Google Accounts client IDs registered in the + - Inside [Constants.java](src/main/java/com/example/helloendpoints/Constants.java) + you will find placeholders for Android applications using Google Accounts + client IDs registered in the [Credentials on Developers Console for OAuth 2.0 client IDs][6]. - These client IDs are used when defining annotation for this sample API @@ -77,8 +88,8 @@ process is explained [here][8] and a quickstart is provided [here][9]. [http://localhost:8080/_ah/api/explorer][13] -1. Generate the client library located at `target/client-libs/helloworld-v1-java.zip` - by using: +1. Generate the client library located at + `target/client-libs/helloworld-v1-java.zip` by using: `mvn endpoints-framework:clientLibs` @@ -100,8 +111,8 @@ process is explained [here][8] and a quickstart is provided [here][9]. [http://localhost:8080/_ah/api/explorer][13] -1. Generate the client library located at `build/endpointsClientLibs/helloworld-v1-java.zip` - by using: +1. Generate the client library located at + `build/endpointsClientLibs/helloworld-v1-java.zip` by using: `gradle endpointsClientLibs` @@ -123,3 +134,5 @@ process is explained [here][8] and a quickstart is provided [here][9]. [11]: https://github.com/GoogleCloudPlatform/endpoints-framework-gradle-plugin [12]: https://cloud.google.com/endpoints/docs/authenticating-users-frameworks [13]: http://localhost:8080/_ah/api/explorer +[14]: https://github.com/GoogleCloudPlatform/app-maven-plugin +[15]: https://github.com/GoogleCloudPlatform/app-gradle-plugin From 21a5ef60861a9aaa0ae10193ae7d434e8f416bd2 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Fri, 28 Apr 2017 07:22:09 -0700 Subject: [PATCH 2/6] Adding endpoints-frameworks-v2/migration-example to appengine/pom.xml --- appengine/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/appengine/pom.xml b/appengine/pom.xml index ef62024febf..996daa82b82 100644 --- a/appengine/pom.xml +++ b/appengine/pom.xml @@ -55,6 +55,7 @@ datastore/indexes-exploding datastore/indexes-perfect endpoints-frameworks-v2/backend + endpoints-frameworks-v2/migration-example firebase-event-proxy/gae-firebase-event-proxy firebase-tictactoe guestbook-objectify From 8ca4742489070bb96a2d88d4ec86642bf5b5e6b2 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Tue, 9 May 2017 16:24:20 -0700 Subject: [PATCH 3/6] Updating appengine plugin versions --- .../endpoints-frameworks-v2/migration-example/build.gradle | 2 +- appengine/endpoints-frameworks-v2/migration-example/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/endpoints-frameworks-v2/migration-example/build.gradle b/appengine/endpoints-frameworks-v2/migration-example/build.gradle index 3f84099aa7d..e7a36384e41 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/build.gradle +++ b/appengine/endpoints-frameworks-v2/migration-example/build.gradle @@ -20,7 +20,7 @@ buildscript { // Configuration for building } dependencies { // App Engine Gradle plugin - classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.1.1' + classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.0' // Endpoints Frameworks Gradle plugin classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.0-beta6' diff --git a/appengine/endpoints-frameworks-v2/migration-example/pom.xml b/appengine/endpoints-frameworks-v2/migration-example/pom.xml index 6112d4fd48e..87828992e57 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/pom.xml +++ b/appengine/endpoints-frameworks-v2/migration-example/pom.xml @@ -85,7 +85,7 @@ limitations under the License. com.google.cloud.tools appengine-maven-plugin - 1.2.1 + 1.3.1 From c5e08957f615d2e0b07471810f57657c21d9b7cf Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Tue, 9 May 2017 16:25:32 -0700 Subject: [PATCH 4/6] Update endpoints-framework plugins --- .../endpoints-frameworks-v2/migration-example/build.gradle | 2 +- appengine/endpoints-frameworks-v2/migration-example/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/endpoints-frameworks-v2/migration-example/build.gradle b/appengine/endpoints-frameworks-v2/migration-example/build.gradle index e7a36384e41..d32b95a3f29 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/build.gradle +++ b/appengine/endpoints-frameworks-v2/migration-example/build.gradle @@ -23,7 +23,7 @@ buildscript { // Configuration for building classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.0' // Endpoints Frameworks Gradle plugin - classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.0-beta6' + classpath 'com.google.cloud.tools:endpoints-framework-gradle-plugin:1.0.0-beta9' } } // [END buildscript] diff --git a/appengine/endpoints-frameworks-v2/migration-example/pom.xml b/appengine/endpoints-frameworks-v2/migration-example/pom.xml index 87828992e57..36e11e6a4e9 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/pom.xml +++ b/appengine/endpoints-frameworks-v2/migration-example/pom.xml @@ -95,7 +95,7 @@ limitations under the License. com.google.cloud.tools endpoints-framework-maven-plugin - 1.0.0-beta3 + 1.0.0-beta5 From 2e22e5aec29c601e38372bc84099234803cf9f0c Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Tue, 9 May 2017 16:48:26 -0700 Subject: [PATCH 5/6] Updated URLs for v1 endpoints docs to legacy location --- appengine/endpoints-frameworks-v2/README.md | 4 ++-- appengine/endpoints-frameworks-v2/migration-example/README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appengine/endpoints-frameworks-v2/README.md b/appengine/endpoints-frameworks-v2/README.md index 97f20f51bfc..e643ed5bfec 100644 --- a/appengine/endpoints-frameworks-v2/README.md +++ b/appengine/endpoints-frameworks-v2/README.md @@ -13,7 +13,7 @@ The new Google Cloud Endpoints Frameworks for App Engine provides It's recommended that you migrate projects using the prior version of [Cloud Endpoints Frameworks][1]. -[1]: https://cloud.google.com/appengine/docs/java/endpoints/ -[2]: https://cloud.google.com/appengine/docs/java/endpoints/migrating +[1]: https://cloud.google.com/endpoints/docs/frameworks/legacy/v1/java +[2]: https://cloud.google.com/endpoints/docs/frameworks/legacy/v1/java/migrating [3]: https://cloud.google.com/endpoints/docs/frameworks/java/about-cloud-endpoints-frameworks [4]: https://cloud.google.com/endpoints/docs/frameworks/java/quickstart-frameworks-java diff --git a/appengine/endpoints-frameworks-v2/migration-example/README.md b/appengine/endpoints-frameworks-v2/migration-example/README.md index bd007ab3ad8..653e98d3917 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/README.md +++ b/appengine/endpoints-frameworks-v2/migration-example/README.md @@ -123,11 +123,11 @@ process is explained [here][8] and a quickstart is provided [here][9]. [1]: https://cloud.google.com/appengine/docs/java/ [2]: http://java.com/en/ -[3]: https://cloud.google.com/appengine/docs/java/endpoints/ +[3]: https://cloud.google.com/endpoints/docs/frameworks/legacy/v1/java [4]: https://cloud.google.com/appengine/docs/java/tools/maven [5]: http://localhost:8080/ [6]: https://console.developers.google.com/project/_/apiui/credential -[7]: https://cloud.google.com/appengine/docs/java/endpoints/migrating +[7]: https://cloud.google.com/endpoints/docs/frameworks/legacy/v1/java/migrating [8]: https://cloud.google.com/endpoints/docs/frameworks/java/about-cloud-endpoints-frameworks [9]: https://cloud.google.com/endpoints/docs/frameworks/java/quickstart-frameworks-java [10]: https://github.com/GoogleCloudPlatform/endpoints-framework-maven-plugin From 7dd2a0b6e465c36b13a6fe6115db2151ce0eb350 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Wed, 10 May 2017 15:02:08 -0700 Subject: [PATCH 6/6] Updating endpoints-framework-tools version to 2.0.7 --- .../endpoints-frameworks-v2/migration-example/build.gradle | 2 +- appengine/endpoints-frameworks-v2/migration-example/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/endpoints-frameworks-v2/migration-example/build.gradle b/appengine/endpoints-frameworks-v2/migration-example/build.gradle index d32b95a3f29..9c04913bc59 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/build.gradle +++ b/appengine/endpoints-frameworks-v2/migration-example/build.gradle @@ -55,7 +55,7 @@ dependencies { // Endpoints Frameworks v2.0 // [START endpoints-tools] - compile group: 'com.google.endpoints', name: 'endpoints-framework-tools', version: '2.0.4' + compile group: 'com.google.endpoints', name: 'endpoints-framework-tools', version: '2.0.7' // [END endpoints-tools] // End of Endpoints Frameworks v2.0 } diff --git a/appengine/endpoints-frameworks-v2/migration-example/pom.xml b/appengine/endpoints-frameworks-v2/migration-example/pom.xml index 36e11e6a4e9..0ed813a6d24 100644 --- a/appengine/endpoints-frameworks-v2/migration-example/pom.xml +++ b/appengine/endpoints-frameworks-v2/migration-example/pom.xml @@ -60,7 +60,7 @@ limitations under the License. com.google.endpoints endpoints-framework - 2.0.4 + 2.0.7