From b7a60d04e877c00b9a892fbc40a99d30506aeeba Mon Sep 17 00:00:00 2001
From: William Chang <misterwilliam@users.noreply.github.com>
Date: Mon, 16 May 2016 12:20:01 -0700
Subject: [PATCH] Updating firebase-event-proxy/pom.xml and parent pom.xml.
 (#239)

* Updating firebase-event-proxy/pom.xml so that it is more like other pom's and references the parent pom.xml. Adding firebase-event-proxy to parent pom.xml
* Fixing checkstyle issues
---
 .../gae-firebase-event-proxy/pom.xml          | 81 ++++---------------
 .../FirebaseEventProxy.java                   | 26 +++---
 .../ServletContextListenerImpl.java           |  2 +-
 .../src/main/webapp/WEB-INF/appengine-web.xml |  3 +-
 .../src/main/webapp/WEB-INF/web.xml           |  5 +-
 pom.xml                                       |  1 +
 6 files changed, 32 insertions(+), 86 deletions(-)

diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
index c4975f1f095..4554b7dc37c 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
@@ -10,21 +10,24 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+<project>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
     <version>1.0-SNAPSHOT</version>
 
-    <groupId>com.example.GaeFirebaseEventProxy</groupId>
-    <artifactId>GaeFirebaseEventProxy</artifactId>
+    <groupId>com.example.gaefirebaseeventproxy</groupId>
+    <artifactId>gaefirebaseeventproxy</artifactId>
+
+    <parent>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>doc-samples</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../../..</relativePath>
+    </parent>
 
     <properties>
         <app.id>gae-firebase-event-proxy</app.id>
         <app.version>1</app.version>
-        <appengine.version>1.9.36</appengine.version>
-        <gcloud.plugin.version>2.0.9.74.v20150814</gcloud.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
     </properties>
@@ -38,7 +41,7 @@
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>${appengine.version}</version>
+            <version>${appengine.sdk.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -71,13 +74,13 @@
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-testing</artifactId>
-            <version>${appengine.version}</version>
+            <version>${appengine.sdk.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-stubs</artifactId>
-            <version>${appengine.version}</version>
+            <version>${appengine.sdk.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -86,71 +89,15 @@
         <!-- for hot reload of the web application-->
         <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-                <version>2.1</version>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>display-dependency-updates</goal>
-                            <goal>display-plugin-updates</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <version>3.1</version>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <archiveClasses>true</archiveClasses>
-                    <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.appengine</groupId>
                 <artifactId>appengine-maven-plugin</artifactId>
-                <version>${appengine.version}</version>
+                <version>${appengine.sdk.version}</version>
                 <configuration>
                     <enableJarClasses>false</enableJarClasses>
                     <version>${app.version}</version>
-                    <!-- Comment in the below snippet to bind to all IPs instead of just localhost -->
-                    <!-- address>0.0.0.0</address>
-                    <port>8080</port -->
-                    <!-- Comment in the below snippet to enable local debugging with a remote debugger
-                         like those included with Eclipse or IntelliJ -->
-                    <!-- jvmFlags>
-                      <jvmFlag>-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n</jvmFlag>
-                    </jvmFlags -->
                 </configuration>
             </plugin>
-            <plugin>
-              <groupId>com.google.appengine</groupId>
-              <artifactId>gcloud-maven-plugin</artifactId>
-              <version>${gcloud.plugin.version}</version>
-              <configuration>
-                <set_default>true</set_default>
-              </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
index ffff83eaa34..4c67beb5d14 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
@@ -14,7 +14,17 @@
  * limitations under the License.
  */
 
-package com.example.GaeFirebaseEventProxy;
+package com.example.gaefirebaseeventproxy;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.firebase.client.AuthData;
+import com.firebase.client.DataSnapshot;
+import com.firebase.client.Firebase;
+import com.firebase.client.FirebaseError;
+import com.firebase.client.ValueEventListener;
+import com.firebase.security.token.TokenGenerator;
+import com.google.appengine.api.utils.SystemProperty;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -27,16 +37,6 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.firebase.client.AuthData;
-import com.firebase.client.DataSnapshot;
-import com.firebase.client.Firebase;
-import com.firebase.client.FirebaseError;
-import com.firebase.client.ValueEventListener;
-import com.firebase.security.token.TokenGenerator;
-import com.google.appengine.api.utils.SystemProperty;
-
 public class FirebaseEventProxy {
 
   private static final Logger log = Logger.getLogger(FirebaseEventProxy.class.getName());
@@ -49,8 +49,8 @@ public FirebaseEventProxy() {
   }
 
   public void start() {
-    String FIREBASE_LOCATION = "https://gae-fb-proxy.firebaseio.com/";
-    Firebase firebase = new Firebase(FIREBASE_LOCATION);
+    String firebaseLocation = "https://gae-fb-proxy.firebaseio.com/";
+    Firebase firebase = new Firebase(firebaseLocation);
 
     // Authenticate with Firebase
     firebase.authWithCustomToken(this.firebaseAuthToken, new Firebase.AuthResultHandler() {
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java
index b50dc4d3961..ffee0cee769 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.GaeFirebaseEventProxy;
+package com.example.gaefirebaseeventproxy;
 
 import java.util.logging.Logger;
 
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml
index 96aaab69ef4..dcf0932551f 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
  Copyright 2015 Google Inc. All Rights Reserved.
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -10,8 +11,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-<?xml version="1.0" encoding="utf-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
     <application>${app.id}</application>
     <version>${app.version}</version>
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml
index b8ded3bcce1..427fd14c909 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Copyright 2015 Google Inc. All Rights Reserved.
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -10,15 +11,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-<?xml version="1.0" encoding="UTF-8"?>
 <web-app version="2.5"
          xmlns="http://java.sun.com/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
   <listener>
-    <listener-class>com.example.GaeFirebaseEventProxy.ServletContextListenerImpl</listener-class>
+    <listener-class>com.example.gaefirebaseeventproxy.ServletContextListenerImpl</listener-class>
   </listener>
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>
diff --git a/pom.xml b/pom.xml
index adbe586579e..097b3c63a85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
         <module>appengine/datastore/indexes</module>
         <module>appengine/datastore/indexes-exploding</module>
         <module>appengine/datastore/indexes-perfect</module>
+        <module>appengine/firebase-event-proxy/gae-firebase-event-proxy</module>
         <module>appengine/guestbook-objectify</module>
         <module>appengine/helloworld</module>
         <module>appengine/images</module>