From c4cfb5cb68b9e314eeb32eff7e97f3ab19dfdc9a Mon Sep 17 00:00:00 2001
From: Kurtis Van Gent <kvg@google.com>
Date: Tue, 23 Jan 2018 13:33:51 -0800
Subject: [PATCH] Updated storage/xml-api/serviceaccount-appengine/sample

---
 .../serviceaccount-appengine-sample/pom.xml   | 17 +++++++-------
 .../serviceaccount/StorageSample.java         | 23 ++++++++++---------
 .../src/main/resources/log4j.properties       | 14 +++++++++++
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/storage/xml-api/serviceaccount-appengine-sample/pom.xml b/storage/xml-api/serviceaccount-appengine-sample/pom.xml
index 6eb61e1159a..d63e2712796 100644
--- a/storage/xml-api/serviceaccount-appengine-sample/pom.xml
+++ b/storage/xml-api/serviceaccount-appengine-sample/pom.xml
@@ -16,12 +16,14 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
 
-  <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
   <parent>
-    <artifactId>doc-samples</artifactId>
-    <groupId>com.google.cloud</groupId>
-    <version>1.0.0</version>
-    <relativePath>../../..</relativePath>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.8</version>
   </parent>
 
   <groupId>com.google.apis-samples</groupId>
@@ -33,7 +35,6 @@
   <properties>
     <maven.compiler.target>1.7</maven.compiler.target>
     <maven.compiler.source>1.7</maven.compiler.source>
-    <appengine.sdk.version>1.9.60</appengine.sdk.version> <!-- TODO(): MOVE to /appengine -->
     <google-api-client.version>1.23.0</google-api-client.version>
     <webappDirectory>${project.build.directory}/${project.build.finalName}
     </webappDirectory>
@@ -87,7 +88,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>${appengine.sdk.version}</version>
+        <version>1.9.59</version>
         <configuration>
           <port>8888</port>
         </configuration>
@@ -111,7 +112,7 @@
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>${appengine.sdk.version}</version>
+      <version>1.9.59</version>
     </dependency>
 
     <dependency>
diff --git a/storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java b/storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java
index 78604c3f9bd..54daa10313e 100644
--- a/storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java
+++ b/storage/xml-api/serviceaccount-appengine-sample/src/main/java/com/google/api/client/sample/storage/appengine/serviceaccount/StorageSample.java
@@ -1,15 +1,17 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 Google Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.google.api.client.sample.storage.appengine.serviceaccount;
@@ -59,9 +61,8 @@ public class StorageSample extends HttpServlet {
       "\n<?xml-stylesheet href=\"/xsl/listing.xsl\" type=\"text/xsl\"?>\n";
 
   @Override
-  protected void doGet(
-      final HttpServletRequest req, final HttpServletResponse resp)
-  throws IOException {
+  protected void doGet(final HttpServletRequest req, final HttpServletResponse resp)
+      throws IOException {
 
     try {
       AppIdentityCredential credential = new AppIdentityCredential(
diff --git a/storage/xml-api/serviceaccount-appengine-sample/src/main/resources/log4j.properties b/storage/xml-api/serviceaccount-appengine-sample/src/main/resources/log4j.properties
index d9c3edc9fee..b2a0ff6c84a 100644
--- a/storage/xml-api/serviceaccount-appengine-sample/src/main/resources/log4j.properties
+++ b/storage/xml-api/serviceaccount-appengine-sample/src/main/resources/log4j.properties
@@ -1,3 +1,17 @@
+# Copyright 2015 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # A default log4j configuration for log4j users.
 #
 # To use this configuration, deploy it into your application's WEB-INF/classes