8000 Merge pull request #729 from GoogleCloudPlatform/remove-v1-from-j8 · jcferreira/java-docs-samples@5600781 · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5600781

Browse files
frankynfrankyn
authored
Merge pull request GoogleCloudPlatform#729 from GoogleCloudPlatform/remove-v1-from-j8
Removing Endpoints v1 workflow from java8 samples
2 parents cf854d2 + 6b96b9e commit 5600781

File tree

4 files changed

+3
-64
lines changed

4 files changed

+3
-64
lines changed

‎appengine-java8/endpoints-v2-migration/README.md

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ This sample provides an example of a [migration][7] from the prior version of
77
the new App Engine Maven and Gradle plugins for deploying your Google App Engine
88
Standard applications.
99

10-
This sample contains comments of how to use the prior Endpoints Frameworks as
11-
well. For clarity, the prior Endpoints Frameworks and the new Endpoints
12-
Frameworks are denoted as Endpoints Frameworks v1.0 and Endpoints Frameworks
13-
v2.0, respectively.
14-
1510
Google Cloud Endpoints Frameworks v2.0 provides new functionality which may
1611
require payment and uses an OpenAPI specification. The OpenAPI development
1712
process is explained [here][8] and a quickstart is provided [here][9].
@@ -68,19 +63,6 @@ process is explained [here][8] and a quickstart is provided [here][9].
6863

6964
- You can read more about different user authentication supported [here][12].
7065

71-
72-
1. [Optional]: Use Cloud Endpoints Frameworks v2.0 Maven and Gradle
73-
client library generation plugins with Cloud Endpoints Frameworks v1.0.
74-
75-
- Uncomment `Endpoints Frameworks v1.0` sections and comment
76-
`Endpoints Frameworks v2.0` sections in the following files.
77-
78-
```
79-
pom.xml
80-
build.gradle
81-
src/main/webapp/WEB-INF/web.xml
82-
```
83-
8466
## Build and Deployment
8567

8668
### Maven

‎appengine-java8/endpoints-v2-migration/build.gradle

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,9 @@ dependencies {
4949
compile 'jstl:jstl:1.2'
5050
compile group: 'javax.inject', name: 'javax.inject', version: '1'
5151

52-
// Uncomment to use Endpoints Frameworks v1.0 and comment the v2.0 section
53-
// compile group: 'com.google.appengine', name: 'appengine-endpoints', version: '+'
54-
// End of Endpoints Frameworks v1.0
55-
56-
// Endpoints Frameworks v2.0
5752
// [START endpoints-tools]
5853
compile group: 'com.google.endpoints', name: 'endpoints-framework-tools', version: '+'
5954
// [END endpoints-tools]
60-
// End of Endpoints Frameworks v2.0
6155
}
6256

6357
appengine { // App Engine tasks configuration
@@ -71,12 +65,12 @@ appengine { // App Engine tasks configuration
7165
}
7266
}
7367

74-
/* [START endpoints-server]
68+
// [START endpoints-server]
7569
endpointsServer {
7670
// Endpoints Framework Plugin server-side configuration
7771
hostname = 'YOUR-PROJECT-ID.appspot.com'
7872
}
79-
[END endpoints-server] */
73+
// [END endpoints-server]
8074

8175
group = 'com.example.helloendpoints' // Generated output GroupId
8276
version = '1' // Version in generated output

‎appengine-java8/endpoints-v2-migration/pom.xml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,13 @@ limitations under the License.
3737

3838
<dependencies>
3939
<!-- Compile/runtime dependencies -->
40-
<!-- Uncomment to use Endpoints Frameworks v1.0 and comment the v2.0 section-->
41-
<!--
42-
[START appengine-endpoints]
43-
<dependency>
44-
<groupId>com.google.appengine</groupId>
45-
<artifactId>appengine-endpoints</artifactId>
46-
<version>1.9.48</version>
47-
</dependency>
48-
[END appengine-endpoints]
49-
-->
50-
<!-- End of Endpoints Frameworks v1.0 -->
51-
<!-- Endpoints Frameworks v2.0 -->
5240
<!-- [START endpoints-frameworks] -->
5341
<dependency>
5442
<groupId>com.google.endpoints</groupId>
5543
<artifactId>endpoints-framework</artifactId>
5644
<version>2.0.7</version>
5745
</dependency>
5846
<!-- [END endpoints-frameworks] -->
59-
<!-- End of Endpoints Frameworks v2.0 -->
6047
<dependency>
6148
<groupId>com.google.appengine</groupId>
6249
<artifactId>appengine-api-1.0-sdk</artifactId>
@@ -97,6 +84,7 @@ limitations under the License.
9784
<version>1.0.0-beta4</version>
9885
<configuration>
9986
<!-- plugin configuration -->
87+
<hostname>YOUR-PROJECT-ID.appspot.com</hostname>
10088
</configuration>
10189
</plugin>
10290
<!-- [END endpoints-frameworks-plugin] -->

‎appengine-java8/endpoints-v2-migration/src/main/webapp/WEB-INF/web.xml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,6 @@ limitations under the License.
1919
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
2020
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
2121
version="3.1">
22-
<!-- Uncomment to use Endpoints Frameworks v1.0 and comment the v2.0 section -->
23-
<!--
24-
[START appengine-endpoints]
25-
<servlet>
26-
<servlet-name>SystemServiceServlet</servlet-name>
27-
<servlet-class>com.google.api.server.spi.SystemServiceServlet</servlet-class>
28-
<init-param>
29-
<param-name>services</param-name>
30-
<param-value>com.example.helloendpoints.Greetings</param-value>
31-
</init-param>
32-
<init-param>
33-
<param-name>restricted</param-name>
34-
<param-value>false</param-value>
35-
</init-param>
36-
</servlet>
37-
<servlet-mapping>
38-
<servlet-name>SystemServiceServlet</servlet-name>
39-
<url-pattern>/_ah/spi/*</url-pattern>
40-
</servlet-mapping>
41-
[END appengine-endpoints]
42-
-->
43-
<!-- End of Endpoints Frameworks v1.0 -->
44-
45-
<!-- Endpoints Frameworks v2.0 -->
4622
<!-- [START endpoints-frameworks] -->
4723
<servlet>
4824
<servlet-name>EndpointsServlet</servlet-name>
@@ -61,7 +37,6 @@ limitations under the License.
6137
<url-pattern>/_ah/api/*</url-pattern>
6238
</servlet-mapping>
6339
<!-- [END endpoints-frameworks] -->
64-
<!-- End of Endpoints Frameworks v2.0 -->
6540

6641
<welcome-file-list>
6742
<welcome-file>index.html</welcome-file>

0 commit comments

Comments
 (0)
0