Fix copyrights and other clean up (#1345)

jakartaee · Jul 2, 2024 · b851848 · b851848
1 parent 8fa4b77
commit b851848
Show file tree

Hide file tree

Showing 36 changed files with 96 additions and 63 deletions.
diff --git a/...n/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTestJava20Plus.jsp b/...n/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/...c/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveSetTimezoneValueTest.jsp b/...c/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveSetTimezoneValueTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/.../src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveTimezoneValueTest.jsp b/.../src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveTimezoneValueTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/.../main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.jsp b/.../main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/.../resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.jsp b/.../resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/...urces/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.jsp b/...urces/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/.../main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.jsp b/.../main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/...sources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.jsp b/...sources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/...ources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.jsp b/...ources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/...c/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.jsp b/...c/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation.
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.jsp b/jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.jsp
@@ -1,6 +1,7 @@
 <%--
 
-    Copyright (c) 2003 Contributors to the Eclipse Foundation
+    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/...fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTestJava20Plus.jsp b/...fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the

diff --git a/...l/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTestJava20Plus.jsp b/...l/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the

diff --git a/...stl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTestJava20Plus.jsp b/...stl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the

diff --git a/...l/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTestJava20Plus.jsp b/...l/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the

diff --git a/...ces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTestJava20Plus.jsp b/...ces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the

diff --git a/...ces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTestJava20Plus.jsp b/...ces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the

diff --git a/...com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.gf b/...com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.gf
@@ -11,13 +11,14 @@
 
     <!-- The fallbackLocale configuration variable will be
              used if no locale match can be determined. -->
-
-
-
+    
+    
+    
     Nov 21, 2000<br>
     3:45:02 AM<br>
-    Nov 21, 2000, 3:45:02 AM<br>
+    Nov 21, 2000, 3:45:02 AM<br>
 
 </body>
 </html>
 
+
diff --git a/...om/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.jsp b/...om/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
@@ -37,4 +38,4 @@
     <fmt:formatDate value="${r1}" timeZone="EST"/><br>
     <fmt:formatDate value="${r2}" timeZone="EST" type="time"/><br>
     <fmt:formatDate value="${r3}" timeZone="EST" type="both"/><br>
-</tck:test>
+</tck:test>
diff --git a/...un/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.gf b/...un/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.gf
@@ -4,24 +4,22 @@
 
 
 
-
 <html>
 <head><title>positivePDLocalizationContextTest</title></head>
 <body>
 
     <!-- Validate that the action is able to dermine the
              formatting locale based on the localizationContext configuration
              variable. -->
-
-
-
+    
+    
+    
     Nov 21, 2000<br>
     3:45:02 AM<br>
-    Nov 21, 2000, 3:45:02 AM<br>
+    Nov 21, 2000, 3:45:02 AM<br>
 
 
 </body>
 </html>
 
 
-
diff --git a/...n/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.jsp b/...n/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the

diff --git a/...s/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTestJava20Plus.jsp b/...s/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
@@ -40,4 +41,4 @@
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>'
                       parseLocale='<%= (Locale) pageContext.getAttribute("loc") %>' type="both"/><br>
     <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' parseLocale="en_US" type="both"/><br>
-</tck:test>
+</tck:test>
diff --git a/...ces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTestJava20Plus.jsp b/...ces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the

diff --git a/...urces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTest.jsp b/...urces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTest.jsp
@@ -1,6 +1,6 @@
 <%--
 
-    Copyright (c) 2003 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at

diff --git a/.../sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.gf b/.../sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.gf
@@ -12,11 +12,12 @@
     <!-- If timeZone is null or empty, it will be treated as
              if it was not present (only type short times is specified
              as any other style has no impact on the result). -->
-
-
-    Nov 21, 2000, 5:45 AM<br>
-    Nov 21, 2000, 5:45 AM<br>
+    
+    
+    Nov 21, 2000, 5:45 AM<br>
+    Nov 21, 2000, 5:45 AM<br>
 
 </body>
 </html>
 
+
diff --git a/...sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.jsp b/...sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
@@ -35,4 +36,4 @@
                        timeZone="" type="both" timeStyle="short" var="re1"/>
     <fmt:formatDate value="${rn1}" timeZone="EST" type="both" timeStyle="short"/><br>
     <fmt:formatDate value="${re1}" timeZone="EST" type="both" timeStyle="short"/><br>
-</tck:test>
+</tck:test>
diff --git a/...sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.gf b/...sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.gf
@@ -21,24 +21,25 @@
 
 
 
-      Nov 21, 2000, 6:45 AM<br>
+      Nov 21, 2000, 6:45 AM<br>
 
       Not wrapped.  Page has a time zone of EST, timeZone attribute specified.  Time should be offset by 3 hours:<br>
       <br>
-      Nov 21, 2000, 6:45 AM<br>
+      Nov 21, 2000, 6:45 AM<br>
 
     <br>No TimeZone attribute specified:<br>
       Wrapped by &lt;fmt:timeZone&gt; action with MST.  Time should be offset by 2 hours:<br>
 
         <br>
 
-      Nov 21, 2000, 5:45 AM<br>
+      Nov 21, 2000, 5:45 AM<br>
 
       Not wrapped.  Page has a time zone of EST.  Time should not be offset:<br>
       <br>
-      Nov 21, 2000, 3:45 AM<br>
+      Nov 21, 2000, 3:45 AM<br>
     <br>
 
 </body>
 </html>
 
+
diff --git a/...un/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.jsp b/...un/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.jsp
@@ -1,5 +1,6 @@
 <%--
 
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
@@ -51,7 +52,7 @@
         <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' type="both" timeStyle="short" var="rd3"/><br>
       </fmt:timeZone>
       <fmt:formatDate value="${rd3}" timeZone="EST" type="both" timeStyle="short"/><br>
-
+      
       Not wrapped.  Page has a time zone of EST.  Time should not be offset:<br>
       <fmt:parseDate value='<%= (String) pageContext.getAttribute("dte") %>' type="both" timeStyle="short" var="rd4"/><br>
       <fmt:formatDate value="${rd4}" timeZone="EST" type="both" timeStyle="short"/><br>

diff --git a/...urces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.gf b/...urces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.gf
@@ -13,13 +13,14 @@
              be explicitly provided to the action.  This will effectively
              overried the timezone of the page -->
     <br>Page is using EST for the timezone.  The formatting action will use PST.  Value should be offset 3 hours.<br>
-
-
-
-    No timeZone attribute: Nov 21, 2000, 3:45 AM<br>
-    Nov 21, 2000, 6:45 AM<br>
-    Nov 21, 2000, 6:45 AM<br>
+    
+    
+    
+    No timeZone attribute: Nov 21, 2000, 3:45 AM<br>
+    Nov 21, 2000, 6:45 AM<br>
+    Nov 21, 2000, 6:45 AM<br>
 
 </body>
 </html>
 
+
diff --git a/...rces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.jsp b/...rces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.jsp
@@ -1,4 +1,6 @@
 <%--
+
+    Copyright (c) 2003, 2021 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2024 Contributors to the Eclipse Foundation
 
     This program and the accompanying materials are made available under the
@@ -10,8 +12,9 @@
     Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
     version 2 with the GNU Classpath Exception, which is available at
     https://www.gnu.org/software/classpath/license.html.
-    
+
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
 --%>
 
 <%@ page pageEncoding="UTF-8"%>
@@ -40,4 +43,4 @@
     No timeZone attribute: <fmt:formatDate value="${rdef}" timeZone="EST" type="both" timeStyle="short"/><br>
     <fmt:formatDate value="${rpst1}" timeZone="EST" type="both" timeStyle="short"/><br>
     <fmt:formatDate value="${rpst2}" timeZone="EST" type="both" timeStyle="short"/><br>
-</tck:test>
+</tck:test>