Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix copyrights and other clean up #1345

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Fix copyrights and other clean up #1345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...n/ts/tests/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion ...c/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveSetTimezoneValueTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion .../src/main/resources/com/sun/ts/tests/jstl/compat/onedotzero/positiveTimezoneValueTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion .../main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion .../resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion ...urces/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion .../main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion ...sources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion ...ources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion ...c/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions ...fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions ...l/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions ...stl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions ...l/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions ...ces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDBodyValueTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions ...ces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDDateStyleTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 5 additions & 4 deletions ...com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pnicolucci did you intend to update line 19 of jstl/src/main/resources/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.gf?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I did as it was a standard space and not a NNBSP as it should have been for Java 20+


</body>
</html>


3 changes: 2 additions & 1 deletion ...om/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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>
10 changes: 4 additions & 6 deletions ...un/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>



1 change: 1 addition & 0 deletions ...n/ts/tests/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion ...s/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDParseLocaleTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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>
1 change: 1 addition & 0 deletions ...ces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeStyleTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...urces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 5 additions & 4 deletions .../sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>


3 changes: 2 additions & 1 deletion ...sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneNullEmptyTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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>
9 changes: 5 additions & 4 deletions ...sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>


3 changes: 2 additions & 1 deletion ...un/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZonePrecedenceTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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>
Expand Down
13 changes: 7 additions & 6 deletions ...urces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>


7 changes: 5 additions & 2 deletions ...rces/com/sun/ts/tests/jstl/spec/fmt/format/parsedate/positivePDTimeZoneTestJava20Plus.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"%>
Expand Down Expand Up @@ -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>
Loading