Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b9f9d69

Browse files
author
Frank Natividad
committedMar 1, 2017
Modified pom.xml and web.xml for docs
1 parent a34b2d9 commit b9f9d69

File tree

2 files changed

+42
-28
lines changed
  • appengine/endpoints-frameworks-v2/migration-example

2 files changed

+42
-28
lines changed
 

‎appengine/endpoints-frameworks-v2/migration-example/pom.xml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@ limitations under the License.
3030
</parent>
3131

3232
<properties>
33-
<!-- Uncomment to use Endpoints Frameworks v1.0 -->
34-
<!--
35-
<appengine.endpoints.version>1.9.48</appengine.endpoints.version>
36-
-->
37-
<!-- End of Endpoints Frameworks v1.0 -->
38-
<appengine.maven.version>1.2.0</appengine.maven.version>
39-
<endpoints.maven.plugin.version>1.0.0-beta3</endpoints.maven.plugin.version>
40-
<endpoints.framework.version>2.0.3</endpoints.framework.version>
4133
<javax.inject.version>1</javax.inject.version>
4234
<maven.compiler.source>1.7</maven.compiler.source>
4335
<maven.compiler.target>1.7</maven.compiler.target>
@@ -53,18 +45,24 @@ limitations under the License.
5345
<dependencies>
5446
<!-- Compile/runtime dependencies -->
5547
<!-- Uncomment to use Endpoints Frameworks v1.0 -->
56-
<!--<dependency>
48+
<!--
49+
[START appengine-endpoints]
50+
<dependency>
5751
<groupId>com.google.appengine</groupId>
5852
<artifactId>appengine-endpoints</artifactId>
59-
<version>${appengine.endpoints.version}</version>
60-
</dependency>-->
53+
<version>1.9.48</version>
54+
</dependency>
55+
[END appengine-endpoints]
56+
-->
6157
<!-- End of Endpoints Frameworks v1.0 -->
6258
<!-- Endpoints Frameworks v2.0 -->
59+
<!-- [START endpoints-frameworks] -->
6360
<dependency>
6461
<groupId>com.google.endpoints</groupId>
6562
<artifactId>endpoints-framework</artifactId>
66-
<version>${endpoints.framework.version}</version>
63+
<version>2.0.3</version>
6764
</dependency>
65+
<!-- [END endpoints-frameworks] -->
6866
<!-- End of Endpoints Frameworks v2.0 -->
6967
<dependency>
7068
<groupId>javax.servlet</groupId>
@@ -83,19 +81,23 @@ limitations under the License.
8381
<!-- for hot reload of the web application-->
8482
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
8583
<plugins>
84+
<!-- [START appengine-plugin] -->
8685
<plugin>
8786
<groupId>com.google.cloud.tools</groupId>
8887
<artifactId>appengine-maven-plugin</artifactId>
89-
<version>${appengine.maven.version}</version>
88+
<version>1.2.0</version>
9089
<configuration>
9190
<!-- deploy configuration -->
9291
</configuration>
9392
</plugin>
93+
<!-- [END appegine-plugin] -->
94+
<!-- [START endpoints-frameworks-plugin -->
9495
<plugin>
9596
<groupId>com.google.cloud.tools</groupId>
9697
<artifactId>endpoints-framework-maven-plugin</artifactId>
97-
<version>${endpoints.maven.plugin.version}</version>
98+
<version>1.0.0-beta3</version>
9899
</plugin>
100+
<!-- [END endpoints-frameworks-plugin -->
99101
<plugin>
100102
<groupId>org.codehaus.mojo</groupId>
101103
<artifactId>versions-maven-plugin</artifactId>

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

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17+
<!-- Uncomment to use Endpoints Frameworks v1.0 -->
18+
<!--
19+
[START appengine-endpoints]
1720
<servlet>
18-
<!-- Uncomment to use Endpoints Frameworks v1.0 -->
19-
<!--
2021
<servlet-name>SystemServiceServlet</servlet-name>
2122
<servlet-class>com.google.api.server.spi.SystemServiceServlet</servlet-class>
22-
-->
23-
<!-- End of Endpoints Frameworks v1.0 -->
24-
<!-- Endpoints Frameworks v2.0 -->
25-
<servlet-name>EndpointsServlet</servlet-name>
26-
<servlet-class>com.google.api.server.spi.EndpointsServlet</servlet-class>
27-
<!-- End of Endpoints Frameworks v2.0 -->
2823
<init-param>
2924
<param-name>services</param-name>
3025
<param-value>com.example.helloendpoints.Greetings</param-value>
@@ -35,17 +30,34 @@ limitations under the License.
3530
</init-param>
3631
</servlet>
3732
<servlet-mapping>
38-
<!-- Uncomment to use Endpoints Frameworks v1.0 -->
39-
<!--
4033
<servlet-name>SystemServiceServlet</servlet-name>
4134
<url-pattern>/_ah/spi/*</url-pattern>
42-
-->
43-
<!-- End of Endpoints Frameworks v1.0 -->
44-
<!-- Endpoints Frameworks v2.0 -->
35+
</servlet-mapping>
36+
[END appengine-endpoints]
37+
-->
38+
<!-- End of Endpoints Frameworks v1.0 -->
39+
40+
<!-- Endpoints Frameworks v2.0 -->
41+
<!-- [START endpoints-frameworks] -->
42+
<servlet>
43+
<servlet-name>EndpointsServlet</servlet-name>
44+
<servlet-class>com.google.api.server.spi.EndpointsServlet</servlet-class>
45+
<init-param>
46+
<param-name>services</param-name>
47+
<param-value>com.example.helloendpoints.Greetings</param-value>
48+
</init-param>
49+
<init-param>
50+
<param-name>restricted</param-name>
51+
<param-value>false</param-value>
52+
</init-param>
53+
</servlet>
54+
<servlet-mapping>
4555
<servlet-name>EndpointsServlet</servlet-name>
4656
<url-pattern>/_ah/api/*</url-pattern>
47-
<!-- End of Endpoints Frameworks v2.0 -->
4857
</servlet-mapping>
58+
<!-- [END endpoints-frameworks] -->
59+
<!-- End of Endpoints Frameworks v2.0 -->
60+
4961
<welcome-file-list>
5062
<welcome-file>index.html</welcome-file>
5163
</welcome-file-list>

0 commit comments

Comments
 (0)
Failed to load comments.