Skip to content

Commit 2ea2c2f

Browse files
authored
Update Region Tags (#1198)
* appidentity region tags * region tag removal * region tags * remove region tags
1 parent 7378792 commit 2ea2c2f

File tree

22 files changed

+5
-54
lines changed

22 files changed

+5
-54
lines changed

appengine/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import javax.servlet.http.HttpServletResponse;
2929
import org.apache.http.client.utils.URIBuilder;
3030

31-
// [START example]
3231
@SuppressWarnings("serial")
3332
public class AnalyticsServlet extends HttpServlet {
3433

@@ -58,4 +57,3 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
5857
resp.getWriter().println("Event tracked.");
5958
}
6059
}
61-
// [END example]

appengine/helloworld-new-plugins/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
// [START gradle]
14+
1515
buildscript { // Configuration for building
1616
repositories {
1717
jcenter() // Bintray's repository - a fast Maven Central mirror & more
@@ -42,7 +42,7 @@ dependencies {
4242

4343
}
4444

45-
// [START model]
45+
// [START gae_maven_model]
4646
appengine { // App Engine tasks configuration
4747
run { // local (dev_appserver) configuration (standard environments only)
4848
port = 8080 // default
@@ -53,11 +53,10 @@ appengine { // App Engine tasks configuration
5353
promote = true // default - & make this the current version
5454
}
5555
}
56-
// [END model]
56+
// [END gae_maven_model]
5757

5858
group = 'com.example.appengine' // Generated output GroupId
5959
version = '1.0-SNAPSHOT' // Version in generated output
6060

6161
sourceCompatibility = 1.7 // App Engine Standard uses Java 7
6262
targetCompatibility = 1.7 // App Engine Standard uses Java 7
63-
// [END gradle]

appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
* See the License for the specific language governing permissions and
1313
* limitations under the License.
1414
*/
15-
// [START logs_API_example]
1615

1716
package com.example.appengine.logs;
1817

@@ -91,5 +90,3 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
9190
writer.println(String.format("<br><a href=\"/?offset=%s\">Next</a>", lastOffset));
9291
}
9392
}
94-
// [END logs_API_example]
95-

appengine/oauth2/src/main/java/com/example/appengine/HelloServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import javax.servlet.http.HttpServletRequest;
2929
import javax.servlet.http.HttpServletResponse;
3030

31-
// [START example]
3231
@SuppressWarnings("serial")
3332
public class HelloServlet extends HttpServlet {
3433

@@ -53,4 +52,3 @@ public void doPost(final HttpServletRequest req, final HttpServletResponse resp)
5352
out.print("Hello world, welcome to Oauth2: " + user.getEmail());
5453
}
5554
}
56-
// [END example]

appengine/oauth2/src/main/java/com/example/appengine/Oauth2Filter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public void init(final FilterConfig config) throws ServletException {
5252
this.context = config.getServletContext();
5353
}
5454

55-
// [START oauth2]
5655
@Override
5756
public void doFilter(
5857
final ServletRequest servletReq, final ServletResponse servletResp, final FilterChain chain)
@@ -91,7 +90,6 @@ public void doFilter(
9190
}
9291
chain.doFilter(servletReq, servletResp); // continue processing
9392
}
94-
// [END oauth2]
9593

9694
@Override
9795
public void destroy() { }

appengine/pusher-chat/src/main/java/com/example/appengine/pusher/AuthorizeServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
*
3838
* @see <a href="https://pusher.com/docs/authenticating_users">Pusher Authentication Docs</a>
3939
*/
40-
// [START pusher_authorize]
4140
public class AuthorizeServlet extends HttpServlet {
4241

4342
@Override
@@ -92,4 +91,3 @@ private static Map<String, String> splitQuery(String query) throws UnsupportedEn
9291
return queryPairs;
9392
}
9493
}
95-
// [END pusher_authorize]

appengine/pusher-chat/src/main/java/com/example/appengine/pusher/PusherService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.pusher.rest.Pusher;
2020

21-
// [START pusher_server_initialize]
2221
public abstract class PusherService {
2322

2423
public static final String APP_KEY = System.getenv("PUSHER_APP_KEY");
@@ -40,4 +39,3 @@ static Pusher getDefaultInstance() {
4039
return pusher;
4140
}
4241
}
43-
// [END pusher_server_initialize]

appengine/pusher-chat/src/main/java/com/example/appengine/pusher/SendMessageServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
* <ahref="https://pusher.com/docs/server_api_guide/server_excluding_recipients">Excluding
3737
* Recipients</ahref>}
3838
*/
39-
// [START pusher_server_send_message]
4039
public class SendMessageServlet extends HttpServlet {
4140

4241
private Gson gson = new GsonBuilder().create();
@@ -81,4 +80,3 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
8180
response.getWriter().println(gson.toJson(messageData));
8281
}
8382
}
84-
// [END pusher_server_send_message]

flexible/async-rest/src/main/appengine/app.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
# [START appyaml]
1514
runtime: custom
1615
env: flex
1716

@@ -22,5 +21,3 @@ handlers:
2221

2322
env_variables:
2423
PLACES_APPKEY: 'YOUR_PLACES_APP_KEY'
25-
26-
# [END appyaml]

flexible/cloud-tasks/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<!-- [START project] -->
1716
<project>
1817
<modelVersion>4.0.0</modelVersion>
1918
<packaging>war</packaging>
@@ -85,4 +84,3 @@
8584
</plugins>
8685
</build>
8786
</project>
88-
<!-- [END project] -->

flexible/cloud-tasks/src/main/appengine/app.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,5 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
# [START appyaml]
1514
runtime: java
1615
env: flex
17-
# [END appyaml]

flexible/cron/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<jetty>9.4.4.v20170414</jetty>
4141
</properties>
4242

43-
<!-- [START dependencies] -->
4443
<dependencies>
4544
<dependency>
4645
<groupId>javax.servlet</groupId>
@@ -50,7 +49,6 @@
5049
<scope>provided</scope>
5150
</dependency>
5251
</dependencies>
53-
<!-- [END dependencies] -->
5452

5553
<build>
5654
<!-- for hot reload of the web application -->

flexible/cron/src/main/java/com/example/cron/CronServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import javax.servlet.http.HttpServletRequest;
2525
import javax.servlet.http.HttpServletResponse;
2626

27-
// [START example]
2827
@WebServlet(name = "cron", value = "/cron")
2928
@SuppressWarnings("serial")
3029
public class CronServlet extends HttpServlet {
@@ -35,4 +34,3 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
3534
out.println("Hello from cron!");
3635
}
3736
}
38-
// [END example]

flexible/disk/src/main/java/com/example/disk/DiskServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import javax.servlet.http.HttpServletRequest;
3434
import javax.servlet.http.HttpServletResponse;
3535

36-
// [START example]
3736
@SuppressWarnings("serial")
3837
@WebServlet(name = "disk", value = "")
3938
public class DiskServlet extends HttpServlet {
@@ -69,4 +68,3 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
6968
out.print("Instance: " + instanceId + "\nSeen:\n" + sb.toString());
7069
}
7170
}
72-
// [END example]

flexible/errorreporting/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<!-- [START project] -->
1716
<project>
1817
<modelVersion>4.0.0</modelVersion>
1918
<packaging>war</packaging>
@@ -74,4 +73,3 @@
7473
</plugins>
7574
</build>
7675
</project>
77-
<!-- [END project] -->

flexible/errorreporting/src/main/appengine/app.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
# See the License for the specific language governing permissions and
1212
# limitations under the License.
13-
# [START appyaml]
1413
runtime: java
1514
env: flex
1615

1716
handlers:
1817
- url: /.*
1918
script: this field is required, but ignored
20-
# [END appyaml]

flexible/extending-runtime/src/main/java/com/example/extendingruntime/FortuneServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import javax.servlet.http.HttpServletRequest;
2828
import javax.servlet.http.HttpServletResponse;
2929

30-
// [START example]
3130
@SuppressWarnings("serial")
3231
@WebServlet(name = "fortune", value = "")
3332
public class FortuneServlet extends HttpServlet {
@@ -63,4 +62,3 @@ private String getFortune() throws IOException {
6362
return fortune;
6463
}
6564
}
66-
// [END example]

flexible/gaeinfo/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Copyright 2017 Google Inc.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<!-- [START pom] -->
1716
<project>
1817
<modelVersion>4.0.0</modelVersion>
1918
<packaging>war</packaging>
@@ -31,12 +30,10 @@ Copyright 2017 Google Inc.
3130
<version>1.0.9</version>
3231
</parent>
3332

34-
<!-- [START compiler] -->
3533
<properties> <!-- App Engine Standard currently requires Java 7 -->
3634
<maven.compiler.target>1.8</maven.compiler.target>
3735
<maven.compiler.source>1.8</maven.compiler.source>
3836
</properties>
39-
<!-- [END compiler] -->
4037

4138
<dependencies>
4239
<dependency>
@@ -107,4 +104,3 @@ Copyright 2017 Google Inc.
107104
</plugins>
108105
</build>
109106
</project>
110-
<!-- [END pom] -->

flexible/gaeinfo/src/main/java/com/example/appengine/flex_compat/GaeInfoServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
4848

4949

50-
// [START example]
5150
@SuppressWarnings({"serial"})
5251
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
5352
@WebServlet(name = "GAEInfo", description = "GAEInfo: Write info about GAE Standard",
@@ -233,4 +232,3 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
233232
templateEngine.process("index", ctx, resp.getWriter());
234233
}
235234
}
236-
// [END example]

flexible/gaeinfo/src/main/webapp/WEB-INF/appengine-web.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<!-- [START config] -->
1817
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
1918
<threadsafe>true</threadsafe>
2019
<ssl-enabled>true</ssl-enabled>
@@ -24,4 +23,3 @@
2423
</beta-settings>
2524

2625
</appengine-web-app>
27-
<!-- [END config] -->

flexible/helloworld/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<!-- [START project] -->
1716
<project>
1817
<modelVersion>4.0.0</modelVersion>
1918
<packaging>war</packaging>
@@ -41,7 +40,7 @@
4140
<jetty>9.4.4.v20170414</jetty>
4241
</properties>
4342

44-
<!-- [START dependencies] -->
43+
<!-- [START gae_flex_libraries_dependencies] -->
4544
<dependencies>
4645

4746
<dependency>
@@ -53,7 +52,7 @@
5352
</dependency>
5453

5554
</dependencies>
56-
<!-- [END dependencies] -->
55+
<!-- [END gae_flex_libraries_dependencies] -->
5756

5857
<build>
5958
<!-- for hot reload of the web application -->
@@ -78,4 +77,3 @@
7877
</plugins>
7978
</build>
8079
</project>
81-
<!-- [END project] -->

flexible/sparkjava/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ limitations under the License.
6969
</dependencies>
7070
<build>
7171
<plugins>
72-
<!-- // [START assembly] -->
7372
<plugin>
7473
<artifactId>maven-assembly-plugin</artifactId>
7574
<executions>
@@ -91,9 +90,7 @@ limitations under the License.
9190
</archive>
9291
</configuration>
9392
</plugin>
94-
<!-- // [END assembly] -->
9593

96-
<!-- // [START exec] -->
9794
<plugin>
9895
<groupId>org.codehaus.mojo</groupId>
9996
<artifactId>exec-maven-plugin</artifactId>
@@ -106,7 +103,6 @@ limitations under the License.
106103
</arguments>
107104
</configuration>
108105
</plugin>
109-
<!-- // [END exec] -->
110106
<plugin>
111107
<groupId>com.google.cloud.tools</groupId>
112108
<artifactId>appengine-maven-plugin</artifactId>

0 commit comments

Comments
 (0)