fixed license comments

GoogleCloudPlatform · Dec 17, 2024 · af1f890 · af1f890
1 parent 9040fc8
commit af1f890
Show file tree

Hide file tree

Showing 18 changed files with 228 additions and 201 deletions.
diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SendErrorTest.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SendErrorTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+
 package com.google.apphosting.runtime.jetty9;
 
 import static org.hamcrest.CoreMatchers.containsString;

diff --git a/...src/main/java/com/google/apphosting/runtime/jetty9/senderrorapp/SendErrorServletEE10.java b/...src/main/java/com/google/apphosting/runtime/jetty9/senderrorapp/SendErrorServletEE10.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+
 package com.google.apphosting.runtime.jetty9.senderrorapp;
 
 import java.io.IOException;

diff --git a/.../src/main/java/com/google/apphosting/runtime/jetty9/senderrorapp/SendErrorServletEE8.java b/.../src/main/java/com/google/apphosting/runtime/jetty9/senderrorapp/SendErrorServletEE8.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * 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
+ *
+ *     https://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.
+ */
+
 package com.google.apphosting.runtime.jetty9.senderrorapp;
 
 import javax.servlet.ServletException;

diff --git a/...stapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/404.html b/...stapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/404.html
@@ -1,16 +1,16 @@
-/*
-* Copyright 2021 Google LLC
-*
-* 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
-*
-*     https://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.
-*/
+<!--
+ Copyright 2021 Google LLC
+
+ 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
+
+     https://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.
+-->
 <h1>Error 404 Not Found</h1>
diff --git a/...stapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/500.html b/...stapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/500.html
@@ -1,16 +1,16 @@
-/*
-* Copyright 2021 Google LLC
-*
-* 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
-*
-*     https://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.
-*/
+<!--
+ Copyright 2021 Google LLC
+
+ 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
+
+     https://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.
+-->
 <h1>Error 500 Internal Server Error</h1>
diff --git a/...esources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/WEB-INF/appengine-web.xml b/...esources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/WEB-INF/appengine-web.xml
@@ -19,14 +19,7 @@
     <runtime>java21</runtime>
     <application>senderror</application>
     <version>1</version>
-    <static-files>
-        <include path="/404.html"/>
-        <include path="/500.html"/>
-        <include path="/unhandled-error.html"/>
-        <include path="/hello.html"/>
-    </static-files>
     <system-properties>
-        <property name="appengine.use.EE8" value="false"/>
         <property name="appengine.use.EE10" value="true"/>
     </system-properties>
 </appengine-web-app>
diff --git a/...apps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/hello.html b/...apps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/hello.html
@@ -1,16 +1,16 @@
-/*
-* Copyright 2021 Google LLC
-*
-* 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
-*
-*     https://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.
-*/
+<!--
+ Copyright 2021 Google LLC
+
+ 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
+
+     https://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.
+-->
 <h1>Hello, world!</h1>
diff --git a/...ain/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/unhandled-error.html b/...ain/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/unhandled-error.html
@@ -1,16 +1,16 @@
-/*
-* Copyright 2021 Google LLC
-*
-* 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
-*
-*     https://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.
-*/
+<!--
+ Copyright 2021 Google LLC
+
+ 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
+
+     https://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.
+-->
 <h1>Unhandled Error</h1>
diff --git a/...estapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/404.html b/...estapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/404.html
@@ -1,16 +1,16 @@
-/*
-* Copyright 2021 Google LLC
-*
-* 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
-*
-*     https://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.
-*/
+<!--
+ Copyright 2021 Google LLC
+
+ 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
+
+     https://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.
+-->
 <h1>Error 404 Not Found</h1>
diff --git a/...estapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/500.html b/...estapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/500.html
@@ -1,16 +1,16 @@
-/*
-* Copyright 2021 Google LLC
-*
-* 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
-*
-*     https://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.
-*/
+<!--
+ Copyright 2021 Google LLC
+
+ 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
+
+     https://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.
+-->
 <h1>Error 500 Internal Server Error</h1>
diff --git a/...resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/WEB-INF/appengine-web.xml b/...resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/WEB-INF/appengine-web.xml
@@ -19,14 +19,7 @@
     <runtime>java21</runtime>
     <application>senderror</application>
     <version>1</version>
-    <static-files>
-        <include path="/404.html"/>
-        <include path="/500.html"/>
-        <include path="/unhandled-error.html"/>
-        <include path="/hello.html"/>
-    </static-files>
     <system-properties>
         <property name="appengine.use.EE8" value="true"/>
-        <property name="appengine.use.EE10" value="false"/>
     </system-properties>
 </appengine-web-app>
diff --git a/...tapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/hello.html b/...tapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/hello.html
@@ -1,16 +1,16 @@
-/*
-* Copyright 2021 Google LLC
-*
-* 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
-*
-*     https://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.
-*/
+<!--
+ Copyright 2021 Google LLC
+
+ 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
+
+     https://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.
+-->
 <h1>Hello, world!</h1>
diff --git a/...main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/unhandled-error.html b/...main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/unhandled-error.html
@@ -1,16 +1,16 @@
-/*
-* Copyright 2021 Google LLC
-*
-* 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
-*
-*     https://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.
-*/
+<!--
+ Copyright 2021 Google LLC
+
+ 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
+
+     https://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.
+-->
 <h1>Unhandled Error</h1>
diff --git a/...pps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/404.html b/...pps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/404.html
@@ -1,16 +1,16 @@
-/*
-* Copyright 2021 Google LLC
-*
-* 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
-*
-*     https://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.
-*/
+<!--
+ Copyright 2021 Google LLC
+
+ 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
+
+     https://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.
+-->
 <h1>Error 404 Not Found</h1>