Skip to content

Commit 2fa3e01

Browse files
author
Les Vogel
committed
Final Tweaks
1 parent f5b928b commit 2fa3e01

12 files changed

Lines changed: 74 additions & 30 deletions

File tree

‎bookshelf/2-structured-data/pom.xml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,23 @@ Copyright 2016 Google Inc.
3535

3636
<bookshelf.storageType>datastore</bookshelf.storageType> <!-- datastore or cloudsql -->
3737

38-
<!-- Instance Connection Name - project:region:dbName or "localhost" for a local MySQL instance -->
39-
<sql.instanceName>${projectID}:us-central1:bookshelf</sql.instanceName>
4038
<sql.dbName>bookshelf</sql.dbName> <!-- A reasonable default -->
39+
<!-- Instance Connection Name - project:region:dbName -->
40+
<!-- -Dsql.instanceName=localhost to use a local MySQL server -->
41+
<sql.instanceName>${projectID}:us-central1:${sql.dbName}</sql.instanceName>
4142
<sql.userName>root</sql.userName> <!-- A reasonable default -->
4243
<sql.password>myRootPassword1234</sql.password> <!-- -Dsql.password=myRootPassword1234 -->
4344
<!-- [END config] -->
4445

4546
<appengine.maven.plugin>1.0.0</appengine.maven.plugin>
4647
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
4748

49+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4850
<maven.compiler.source>1.8</maven.compiler.source> <!-- REQUIRED -->
4951
<maven.compiler.target>1.8</maven.compiler.target> <!-- REQUIRED -->
5052
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
51-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
52-
53+
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
54+
<maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
5355
<maven.war.filteringDeploymentDescriptors>true</maven.war.filteringDeploymentDescriptors>
5456
</properties>
5557

@@ -137,6 +139,12 @@ Copyright 2016 Google Inc.
137139
<version>1.0.2</version>
138140
</dependency>
139141

142+
<dependency>
143+
    <groupId>com.google.firebase</groupId>
144+
    <artifactId>firebase-admin</artifactId>
145+
    <version>4.0.1</version>
146+
</dependency>
147+
140148
</dependencies>
141149

142150
<build>

‎bookshelf/2-structured-data/src/main/appengine/app.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
# [START runtime]
1818
runtime: java
19-
#vm: true
2019
env: flex
2120

2221
handlers:

‎bookshelf/3-binary-data/pom.xml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ Copyright 2016 Google Inc.
3535

3636
<bookshelf.storageType>datastore</bookshelf.storageType> <!-- datastore or cloudsql -->
3737

38-
<!-- Instance Connection Name - project:region:dbName or "localhost" for a local MySQL instance -->
39-
<sql.instanceName>${projectID}:us-central1:bookshelf</sql.instanceName>
4038
<sql.dbName>bookshelf</sql.dbName> <!-- A reasonable default -->
39+
<!-- Instance Connection Name - project:region:dbName -->
40+
<!-- -Dsql.instanceName=localhost to use a local MySQL server -->
41+
<sql.instanceName>${projectID}:us-central1:${sql.dbName}</sql.instanceName>
4142
<sql.userName>root</sql.userName> <!-- A reasonable default -->
4243
<sql.password>myRootPassword1234</sql.password> <!-- -Dsql.password=myRootPassword1234 -->
4344

@@ -47,11 +48,12 @@ Copyright 2016 Google Inc.
4748
<appengine.maven.plugin>1.0.0</appengine.maven.plugin>
4849
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
4950

51+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5052
<maven.compiler.source>1.8</maven.compiler.source> <!-- REQUIRED -->
5153
<maven.compiler.target>1.8</maven.compiler.target> <!-- REQUIRED -->
5254
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
53-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
54-
55+
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
56+
<maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
5557
<maven.war.filteringDeploymentDescriptors>true</maven.war.filteringDeploymentDescriptors>
5658
</properties>
5759

@@ -139,6 +141,12 @@ Copyright 2016 Google Inc.
139141
<version>1.0.2</version>
140142
</dependency>
141143

144+
<dependency>
145+
    <groupId>com.google.firebase</groupId>
146+
    <artifactId>firebase-admin</artifactId>
147+
    <version>4.0.1</version>
148+
</dependency>
149+
142150
</dependencies>
143151

144152
<build>

‎bookshelf/3-binary-data/src/main/appengine/app.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
# [START runtime]
1818
runtime: java
19-
#vm: true
2019
env: flex
2120

2221
handlers:

‎bookshelf/4-auth/pom.xml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ Copyright 2016 Google Inc.
3535

3636
<bookshelf.storageType>datastore</bookshelf.storageType> <!-- datastore or cloudsql -->
3737

38-
<!-- Instance Connection Name - project:region:dbName or "localhost" for a local MySQL instance -->
39-
<sql.instanceName>${projectID}:us-central1:bookshelf</sql.instanceName>
4038
<sql.dbName>bookshelf</sql.dbName> <!-- A reasonable default -->
39+
<!-- Instance Connection Name - project:region:dbName -->
40+
<!-- -Dsql.instanceName=localhost to use a local MySQL server -->
41+
<sql.instanceName>${projectID}:us-central1:${sql.dbName}</sql.instanceName>
4142
<sql.userName>root</sql.userName> <!-- A reasonable default -->
4243
<sql.password>myRootPassword1234</sql.password> <!-- -Dsql.password=myRootPassword1234 -->
4344

@@ -55,11 +56,12 @@ Copyright 2016 Google Inc.
5556
<appengine.maven.plugin>1.0.0</appengine.maven.plugin>
5657
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
5758

59+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5860
<maven.compiler.source>1.8</maven.compiler.source> <!-- REQUIRED -->
5961
<maven.compiler.target>1.8</maven.compiler.target> <!-- REQUIRED -->
6062
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
61-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
62-
63+
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
64+
<maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
6365
<maven.war.filteringDeploymentDescriptors>true</maven.war.filteringDeploymentDescriptors>
6466
</properties>
6567

@@ -158,6 +160,12 @@ Copyright 2016 Google Inc.
158160
<version>1.0.2</version>
159161
</dependency>
160162

163+
<dependency>
164+
    <groupId>com.google.firebase</groupId>
165+
    <artifactId>firebase-admin</artifactId>
166+
    <version>4.0.1</version>
167+
</dependency>
168+
161169
</dependencies>
162170

163171
<build>

‎bookshelf/4-auth/src/main/appengine/app.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
# [START runtime]
1818
runtime: java
19-
#vm: true
2019
env: flex
2120

2221
handlers:

‎bookshelf/5-logging/pom.xml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ Copyright 2016 Google Inc.
3535

3636
<bookshelf.storageType>datastore</bookshelf.storageType> <!-- datastore or cloudsql -->
3737

38-
<!-- Instance Connection Name - project:region:dbName or "localhost" for a local MySQL instance -->
39-
<sql.instanceName>${projectID}:us-central1:bookshelf</sql.instanceName>
4038
<sql.dbName>bookshelf</sql.dbName> <!-- A reasonable default -->
39+
<!-- Instance Connection Name - project:region:dbName -->
40+
<!-- -Dsql.instanceName=localhost to use a local MySQL server -->
41+
<sql.instanceName>${projectID}:us-central1:${sql.dbName}</sql.instanceName>
4142
<sql.userName>root</sql.userName> <!-- A reasonable default -->
4243
<sql.password>myRootPassword1234</sql.password> <!-- -Dsql.password=myRootPassword1234 -->
4344

@@ -53,11 +54,12 @@ Copyright 2016 Google Inc.
5354
<appengine.maven.plugin>1.0.0</appengine.maven.plugin>
5455
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
5556

57+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5658
<maven.compiler.source>1.8</maven.compiler.source> <!-- REQUIRED -->
5759
<maven.compiler.target>1.8</maven.compiler.target> <!-- REQUIRED -->
5860
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
59-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
60-
61+
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
62+
<maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
6163
<maven.war.filteringDeploymentDescriptors>true</maven.war.filteringDeploymentDescriptors>
6264
</properties>
6365

@@ -156,6 +158,12 @@ Copyright 2016 Google Inc.
156158
<version>1.0.2</version>
157159
</dependency>
158160

161+
<dependency>
162+
    <groupId>com.google.firebase</groupId>
163+
    <artifactId>firebase-admin</artifactId>
164+
    <version>4.0.1</version>
165+
</dependency>
166+
159167
</dependencies>
160168

161169
<build>

‎bookshelf/5-logging/src/main/appengine/app.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
# [START runtime]
1818
runtime: java
19-
#vm: true
2019
env: flex
2120

2221
handlers:

‎bookshelf/6-gce/pom.xml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ Copyright 2016 Google Inc.
3535

3636
<bookshelf.storageType>datastore</bookshelf.storageType> <!-- datastore or cloudsql -->
3737

38-
<!-- Instance Connection Name - project:region:dbName or "localhost" for a local MySQL instance -->
39-
<sql.instanceName>${projectID}:us-central1:bookshelf</sql.instanceName>
4038
<sql.dbName>bookshelf</sql.dbName> <!-- A reasonable default -->
39+
<!-- Instance Connection Name - project:region:dbName -->
40+
<!-- -Dsql.instanceName=localhost to use a local MySQL server -->
41+
<sql.instanceName>${projectID}:us-central1:${sql.dbName}</sql.instanceName>
4142
<sql.userName>root</sql.userName> <!-- A reasonable default -->
4243
<sql.password>myRootPassword1234</sql.password> <!-- -Dsql.password=myRootPassword1234 -->
4344

@@ -53,11 +54,12 @@ Copyright 2016 Google Inc.
5354
<appengine.maven.plugin>1.0.0</appengine.maven.plugin>
5455
<jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
5556

57+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5658
<maven.compiler.source>1.8</maven.compiler.source> <!-- REQUIRED -->
5759
<maven.compiler.target>1.8</maven.compiler.target> <!-- REQUIRED -->
5860
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
59-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
60-
61+
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
62+
<maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
6163
<maven.war.filteringDeploymentDescriptors>true</maven.war.filteringDeploymentDescriptors>
6264
</properties>
6365

@@ -156,6 +158,12 @@ Copyright 2016 Google Inc.
156158
<version>1.0.2</version>
157159
</dependency>
158160

161+
<dependency>
162+
    <groupId>com.google.firebase</groupId>
163+
    <artifactId>firebase-admin</artifactId>
164+
    <version>4.0.1</version>
165+
</dependency>
166+
159167
</dependencies>
160168

161169
<build>

‎bookshelf/6-gce/src/main/appengine/app.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# [START runtime]
1818
runtime: java
19-
vm: true
19+
env: flex
2020

2121
handlers:
2222
- url: /.*

0 commit comments

Comments
 (0)