From b8d61104771ea99753d751ff9c9a278f8d9051a7 Mon Sep 17 00:00:00 2001
From: Les Vogel <lesv@users.noreply.github.com>
Date: Wed, 14 Dec 2016 14:26:33 -0800
Subject: [PATCH] add war plugin (#452)

---
 appengine/cloudsql/README.md                  | 10 ++++++---
 appengine/cloudsql/pom.xml                    | 22 ++++++++++++++-----
 .../appengine/cloudsql/CloudSqlServlet.java   |  1 +
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/appengine/cloudsql/README.md b/appengine/cloudsql/README.md
index 36995d1a174..62722914cbd 100644
--- a/appengine/cloudsql/README.md
+++ b/appengine/cloudsql/README.md
@@ -13,13 +13,17 @@ Developers Console](https://console.developers.google.com/sql/instances). Altern
 
 ## Deploying
 
-`$ mvn clean appengine:deploy -DINSTANCE_CONNECTION_NAME="instanceConnectionName" -Duser=root
--Dpassword=myPassword -Ddatabase=myDatabase`
+```bash
+$ mvn clean appengine:deploy -DINSTANCE_CONNECTION_NAME="instanceConnectionName" -Duser=root
+-Dpassword=myPassword -Ddatabase=myDatabase
+```
 
 Or you can update the properties in `pom.xml` and
 
 ## Running locally
 1. You will need to be running a local instance of MySQL.
 
-`$ mvn clean appengine:run -Duser=root -Dpassword=myPassowrd -Ddatabase=myDatabase`
+```bash
+$ mvn clean appengine:run -Duser=root -Dpassword=myPassowrd -Ddatabase=myDatabase
+```
 
diff --git a/appengine/cloudsql/pom.xml b/appengine/cloudsql/pom.xml
index c58c0260e18..c4e447b286b 100644
--- a/appengine/cloudsql/pom.xml
+++ b/appengine/cloudsql/pom.xml
@@ -71,13 +71,23 @@
   <build>
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
-    <resources>
-      <resource>
-        <directory>src/webapp/WEB-INF</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <webResources>
+            <!-- in order to interpolate version from pom into appengine-web.xml -->
+            <resource>
+              <directory>${basedir}/src/main/webapp/WEB-INF</directory>
+              <filtering>true</filtering>
+              <targetPath>WEB-INF</targetPath>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
diff --git a/appengine/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java b/appengine/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java
index ecd2c69f59e..b8763237dad 100644
--- a/appengine/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java
+++ b/appengine/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java
@@ -81,6 +81,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
       // Set the url with the local MySQL database connection url when running locally
       url = System.getProperty("ae-cloudsql.local-database-url");
     }
+    log("connecting to: " + url);
     try (Connection conn = DriverManager.getConnection(url);
         PreparedStatement statementCreateVisit = conn.prepareStatement(createVisitSql)) {
       conn.createStatement().executeUpdate(createTableSql);