add copyright and fix review comments

ludoch · ludoch · commit a48ef77ca75c · 2017-05-22T09:42:59.000-07:00
diff --git a/appengine-standard-java8/kotlin-appengine-standard/README.md b/appengine-standard-java8/kotlin-appengine-standard/README.md
@@ -1,4 +1,5 @@
 App Engine Java Kotlin Servlet 3.1 with Java8
+===
 
 ## Sample Servlet 3.1 written in Kotlin for use with App Engine Java8 Standard.
 
diff --git a/appengine-standard-java8/kotlin-appengine-standard/nbactions.xml b/appengine-standard-java8/kotlin-appengine-standard/nbactions.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2017 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.
+-->
 <actions>
     <action>
         <actionName>CUSTOM-appengine:devserver</actionName>
diff --git a/appengine-standard-java8/kotlin-appengine-standard/pom.xml b/appengine-standard-java8/kotlin-appengine-standard/pom.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2017 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.
+-->
 <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">
@@ -8,8 +20,15 @@
   <version>1.0-SNAPSHOT</version>
 
   <groupId>com.google.appengine.demos</groupId>
-  <artifactId>kotlin-appengine-Standard</artifactId>
+  <artifactId>kotlin-appengine-standard</artifactId>
 
+  <parent>                              <!-- Get parameters and allow bulk testing -->
+    <artifactId>getting-started-java</artifactId>
+    <groupId>com.example</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  
   <dependencies>
     <dependency>
       <groupId>com.google.appengine</groupId>
diff --git a/appengine-standard-java8/kotlin-appengine-standard/src/main/kotlin/HomeController.kt b/appengine-standard-java8/kotlin-appengine-standard/src/main/kotlin/HomeController.kt
@@ -1,3 +1,4 @@
+// See https://github.com/JetBrains/kotlin-examples/blob/master/LICENSE
 package org.jetbrains.kotlin.demo
 
 import javax.servlet.annotation.WebServlet
@@ -11,4 +12,4 @@ class HomeController : HttpServlet() {
         res.writer.write("Hello, World! I am a Servlet 3.1 running on Java8 App Engine Standard, and written in Kotlin...")
  
     }
-}
+}
diff --git a/appengine-standard-java8/kotlin-appengine-standard/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-standard-java8/kotlin-appengine-standard/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2017 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.
+-->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
     <application>kotlin-gae</application>
     <version>kotlin</version>
     <threadsafe>true</threadsafe>
     <runtime>java8</runtime>
     <module>default</module>
-    <manual-scaling>
-        <instances>2</instances>
-    </manual-scaling>
     <system-properties>
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
     </system-properties>
diff --git a/appengine-standard-java8/kotlin-appengine-standard/src/main/webapp/WEB-INF/logging.properties b/appengine-standard-java8/kotlin-appengine-standard/src/main/webapp/WEB-INF/logging.properties
@@ -1,3 +1,14 @@
+# Copyright 2017 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 java.util.logging configuration.
 # (All App Engine logging is through java.util.logging by default).
 #
diff --git a/appengine-standard-java8/kotlin-springboot-appengine-standard/README.md b/appengine-standard-java8/kotlin-springboot-appengine-standard/README.md
@@ -1,4 +1,5 @@
 App Engine Java SpringBoot Kotlin application
+===
 
 ## Sample SpringBoot application written in Kotlin for use with App Engine Java8 Standard.
 
diff --git a/appengine-standard-java8/kotlin-springboot-appengine-standard/nbactions.xml b/appengine-standard-java8/kotlin-springboot-appengine-standard/nbactions.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2017 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.
+-->
 <actions>
     <action>
         <actionName>CUSTOM-appengine:devserver</actionName>
diff --git a/appengine-standard-java8/kotlin-springboot-appengine-standard/pom.xml b/appengine-standard-java8/kotlin-springboot-appengine-standard/pom.xml
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2017 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.
+-->
 <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">
@@ -9,7 +21,14 @@
 
   <groupId>com.google.appengine.demos</groupId>
   <artifactId>kotlin-springboot-appengine-standard</artifactId>
-
+  
+  <parent>                              <!-- Get parameters and allow bulk testing -->
+    <artifactId>getting-started-java</artifactId>
+    <groupId>com.example</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  
   <dependencies>
     <dependency>
       <groupId>com.google.appengine</groupId>
diff --git a/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/kotlin/Application.kt b/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/kotlin/Application.kt
@@ -1,3 +1,4 @@
+// See https://github.com/JetBrains/kotlin-examples/blob/master/LICENSE
 package org.jetbrains.kotlin.demo
 
 import org.springframework.boot.SpringApplication
diff --git a/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/kotlin/Greeting.kt b/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/kotlin/Greeting.kt
@@ -1,3 +1,4 @@
+// See https://github.com/JetBrains/kotlin-examples/blob/master/LICENSE
 package org.jetbrains.kotlin.demo
 
 data class Greeting(val id: Long, val content: String)
diff --git a/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/kotlin/GreetingController.kt b/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/kotlin/GreetingController.kt
@@ -1,3 +1,4 @@
+// See https://github.com/JetBrains/kotlin-examples/blob/master/LICENSE
 package org.jetbrains.kotlin.demo
 
 import org.springframework.web.bind.annotation.RequestMapping
@@ -14,4 +15,4 @@ class GreetingController {
     fun greeting(@RequestParam(value = "name", defaultValue = "World") name: String): Greeting {
         return Greeting(counter.incrementAndGet(), "Hello, $name, from a SpringBoot Application written in Kotlin, running on Google App Engine Java8 Standard...")
     }
-}
+}
diff --git a/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2017 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.
+-->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
     <application>kotlin-in-gae</application>
     <version>kotlin</version>
     <threadsafe>true</threadsafe>
     <runtime>java8</runtime>
     <module>default</module>
-    <manual-scaling>
-        <instances>1</instances>
-    </manual-scaling>
     <system-properties>
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
     </system-properties>
diff --git a/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/webapp/WEB-INF/logging.properties b/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/webapp/WEB-INF/logging.properties
@@ -1,3 +1,14 @@
+# Copyright 2017 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 java.util.logging configuration.
 # (All App Engine logging is through java.util.logging by default).
 #
diff --git a/pom.xml b/pom.xml
@@ -84,6 +84,8 @@ limitations under the License.
 
     <modules>
         <module>appengine-standard-java8/helloworld</module>
+	<module>appengine-standard-java8/kotlin-appengine-standard</module>
+        <module>appengine-standard-java8/kotlin-springboot-appengine-standard</module>
         <module>bookshelf/2-structured-data</module>
         <module>bookshelf/3-binary-data</module>
         <module>bookshelf/4-auth</module>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`App Engine Java Kotlin Servlet 3.1 with Java8`
	`2`	`+===`
`2`	`3`
`3`	`4`	`## Sample Servlet 3.1 written in Kotlin for use with App Engine Java8 Standard.`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// See https://github.com/JetBrains/kotlin-examples/blob/master/LICENSE`
`1`	`2`	`package org.jetbrains.kotlin.demo`
`2`	`3`
`3`	`4`	`import javax.servlet.annotation.WebServlet`
`@@ -11,4 +12,4 @@ class HomeController : HttpServlet() {`
`11`	`12`	`res.writer.write("Hello, World! I am a Servlet 3.1 running on Java8 App Engine Standard, and written in Kotlin...")`
`12`	`13`
`13`	`14`	`}`
`14`		`-}`
	`15`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`App Engine Java SpringBoot Kotlin application`
	`2`	`+===`
`2`	`3`
`3`	`4`	`## Sample SpringBoot application written in Kotlin for use with App Engine Java8 Standard.`
`4`	`5`