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

Updates to JSTL bucket for Java 11 Locale #664

Merged
merged 2 commits into from
Oct 26, 2021
Merged

Updates to JSTL bucket for Java 11 Locale #664

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f800a7c
Updates to JSTL bucket for Java 11 Locale
brideck Mar 15, 2021
eea9f92
Update JSP Copyrights
brideck Oct 26, 2021
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
Binary file modified src/com/sun/ts/tests/jstl/compat/onedotzero/jstl_1_0_compat_web.war
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/web/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
this will be used in preference to the jakarta.servlet.jstl.fmt.locale
attribute. -->

Nov 21, 2000 3:45:02 AM
Nov 21, 2000, 3:45:02 AM
1234
1,234

<!-- EL: If the jakarta.servlet.jstl.fmt.localizationContext scoped attribute is available,
this will be used in preference to the jakarta.servlet.jstl.fmt.locale
attribute. -->

Nov 21, 2000 3:45:02 AM
Nov 21, 2000, 3:45:02 AM
1234
1,234

Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<fmt:setTimeZone value="EST"/>
<fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.Resources1"/>
<fmt:setLocale value="de_DE"/>
<c:set var="dt" value="Nov 21, 2000 3:45:02 AM"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
<!-- EL: If the jakarta.servlet.jstl.fmt.localizationContext scoped attribute is available,
this will be used in preference to the jakarta.servlet.jstl.fmt.locale
attribute. -->
Expand Down
12 changes: 6 additions & 6 deletions src/web/jstl/compat/onedotzero/positiveSetTimezoneValueTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@
<!-- EL: Behavioral test of value attribute -->
<!-- Timezone object -->

Friday, December 26, 1997 7:11:34 PM PST
Friday, December 26, 1997 at 7:11:34 PM Pacific Standard Time

<!-- Timezone as a String -->

Friday, December 26, 1997 7:11:34 PM PST
Friday, December 26, 1997 at 7:11:34 PM Pacific Standard Time


Friday, December 26, 1997 7:11:34 PM PST
Friday, December 26, 1997 at 7:11:34 PM Pacific Standard Time

<!-- RT: Behavioral test of value attribute -->
<!-- Timezone object -->

Friday, December 26, 1997 7:11:34 PM PST
Friday, December 26, 1997 at 7:11:34 PM Pacific Standard Time

<!-- Timezone as a String -->

Friday, December 26, 1997 7:11:34 PM PST
Friday, December 26, 1997 at 7:11:34 PM Pacific Standard Time


Saturday, December 27, 1997 2:11:34 AM GMT-01:00
Saturday, December 27, 1997 at 2:11:34 AM GMT-01:00

</body>
</html>
Expand Down
12 changes: 6 additions & 6 deletions src/web/jstl/compat/onedotzero/positiveTimezoneValueTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
<!-- EL: Behavioral test of value attribute -->
<!-- Timezone object -->

Friday, December 26, 1997 7:11:34 PM PST
Friday, December 26, 1997 at 7:11:34 PM Pacific Standard Time

<!-- Timezone as a String -->

Friday, December 26, 1997 7:11:34 PM PST
Friday, December 26, 1997 at 7:11:34 PM Pacific Standard Time


Friday, December 26, 1997 7:11:34 PM PST
Friday, December 26, 1997 at 7:11:34 PM Pacific Standard Time


<!-- RT: Behavioral test of value attribute -->
<!-- Timezone object -->

Friday, December 26, 1997 7:11:34 PM PST
Friday, December 26, 1997 at 7:11:34 PM Pacific Standard Time

<!-- Timezone as a String -->

Friday, December 26, 1997 7:11:34 PM PST
Friday, December 26, 1997 at 7:11:34 PM Pacific Standard Time


Saturday, December 27, 1997 2:11:34 AM GMT-01:00
Saturday, December 27, 1997 at 2:11:34 AM GMT-01:00


</body>
Expand Down
24 changes: 12 additions & 12 deletions src/web/jstl/spec/fmt/format/fmtdate/positiveFDDateStyleTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@
10:11:34 PM<br>

<br>'type' set to 'both' -- dateStyle should be applied<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM<br>
12/26/97 10:11:34 PM<br>
12/26/97 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM<br>
December 26, 1997 10:11:34 PM<br>
December 26, 1997 10:11:34 PM<br>
Friday, December 26, 1997 10:11:34 PM<br>
Friday, December 26, 1997 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
12/26/97, 10:11:34 PM<br>
12/26/97, 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
December 26, 1997, 10:11:34 PM<br>
December 26, 1997, 10:11:34 PM<br>
Friday, December 26, 1997, 10:11:34 PM<br>
Friday, December 26, 1997, 10:11:34 PM<br>

</body>
</html>
Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/fmtdate/positiveFDFallbackLocaleTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
used if no locale match can be determined. -->
Dec 26, 1997
10:11:34 PM
Dec 26, 1997 10:11:34 PM
Dec 26, 1997, 10:11:34 PM

</body>
</html>
Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/fmtdate/positiveFDLocalizationContextTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
variable. -->
Dec 26, 1997
10:11:34 PM
Dec 26, 1997 10:11:34 PM
Dec 26, 1997, 10:11:34 PM

</body>
</html>
Expand Down
28 changes: 14 additions & 14 deletions src/web/jstl/spec/fmt/format/fmtdate/positiveFDTimeStyleTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,22 @@
10:11:34 PM<br>
10:11:34 PM EST<br>
10:11:34 PM EST<br>
10:11:34 PM EST<br>
10:11:34 PM EST<br>
10:11:34 PM Eastern Standard Time<br>
10:11:34 PM Eastern Standard Time<br>

<br>'type' set to 'both' -- timeStyle should be applied<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 10:11 PM<br>
Dec 26, 1997 10:11 PM<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM EST<br>
Dec 26, 1997 10:11:34 PM EST<br>
Dec 26, 1997 10:11:34 PM EST<br>
Dec 26, 1997 10:11:34 PM EST<br>
Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 10:11 PM<br>
Dec 26, 1997, 10:11 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM EST<br>
Dec 26, 1997, 10:11:34 PM EST<br>
Dec 26, 1997, 10:11:34 PM Eastern Standard Time<br>
Dec 26, 1997, 10:11:34 PM Eastern Standard Time<br>

</body>
</html>
Expand Down
4 changes: 2 additions & 2 deletions src/web/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneNullEmptyTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<!-- If timeZone is null or empty, it will be treated as
if it was not present. -->
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>

</body>
</html>
Expand Down
8 changes: 4 additions & 4 deletions src/web/jstl/spec/fmt/format/fmtdate/positiveFDTimeZonePrecedenceTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
<br>TimeZone attribute specified with a value of PST:<br>
Wrapped by &lt;fmt:timeZone&gt; action with MST. Time should be 7:11:34 PM:<br>

Dec 26, 1997 7:11:34 PM<br>
Dec 26, 1997, 7:11:34 PM<br>


Not wrapped. Page has a time zone of EST. Time should be 7:11:34 PM<br>
Dec 26, 1997 7:11:34 PM<br>
Dec 26, 1997, 7:11:34 PM<br>

<br>No TimeZone attribute specified:<br>
Wrapped by &lt;fmt:timeZone&gt; action with MST. Time should be 8:11:34 PM:<br>

Dec 26, 1997 8:11:34 PM<br>
Dec 26, 1997, 8:11:34 PM<br>


Not wrapped. Page has a time zone of EST. Time should be 10:11:34 PM<br>
Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997, 10:11:34 PM<br>
<br>

</body>
Expand Down
6 changes: 3 additions & 3 deletions src/web/jstl/spec/fmt/format/fmtdate/positiveFDTimeZoneTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<!-- The time zone to be applied to the formatted value can 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 minus 3 hours.<br>
No timeZone attribute: Dec 26, 1997 10:11:34 PM<br>
Dec 26, 1997 7:11:34 PM<br>
Dec 26, 1997 7:11:34 PM<br>
No timeZone attribute: Dec 26, 1997, 10:11:34 PM<br>
Dec 26, 1997, 7:11:34 PM<br>
Dec 26, 1997, 7:11:34 PM<br>

</body>
</html>
Expand Down
4 changes: 2 additions & 2 deletions src/web/jstl/spec/fmt/format/fmtdate/positiveFDTypeTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
date: Dec 26, 1997<br>
time: 10:11:34 PM<br>
time: 10:11:34 PM<br>
both: Dec 26, 1997 10:11:34 PM<br>
both: Dec 26, 1997 10:11:34 PM<br>
both: Dec 26, 1997, 10:11:34 PM<br>
both: Dec 26, 1997, 10:11:34 PM<br>


</body>
Expand Down
2 changes: 1 addition & 1 deletion .../jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
or the basename or locale scoped attributes don't exist,
the browser's preferred locales are used. -->

Nov 21, 2000 3:45:02 AM
Nov 21, 2000, 3:45:02 AM
1234
1,234

Expand Down
2 changes: 1 addition & 1 deletion ...jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
pageContext.setAttribute("dte", date);
%>
<fmt:setTimeZone value="EST"/>
<c:set var="dt" value="Nov 21, 2000 3:45:02 AM"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>

<!-- If the action is not wrapped in a fmt:bundle action,
or the basename or locale scoped attributes don't exist,
Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
will not be considered. -->


Nov 21, 2000 3:45:02 AM
Nov 21, 2000, 3:45:02 AM
1234
1,234

Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
%>
<fmt:setTimeZone value="EST"/>
<fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.AlgoResources6"/>
<c:set var="dt" value="Nov 21, 2000 3:45:02 AM"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>

<!-- The localization context for formatting actions can
be provided by wrapping these actions in a fmt:bundle
Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
this will be used in preference to the jakarta.servlet.jstl.fmt.locale
attribute. -->

Nov 21, 2000 3:45:02 AM
Nov 21, 2000, 3:45:02 AM
1234
1,234

Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<fmt:setTimeZone value="EST"/>
<fmt:setBundle basename="com.sun.ts.tests.jstl.common.resources.Resources1"/>
<fmt:setLocale value="de_DE"/>
<c:set var="dt" value="Nov 21, 2000 3:45:02 AM"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>

<!-- If the jakarta.servlet.jstl.fmt.localizationContext scoped attribute is available,
this will be used in preference to the jakarta.servlet.jstl.fmt.locale
Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
is present, it will take precedence over the browser
supplied preferred locales. -->

Nov 21, 2000 3:45:02 AM
Nov 21, 2000, 3:45:02 AM
1234
1,234

Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
%>
<fmt:setTimeZone value="EST"/>
<fmt:setLocale value="en_US"/>
<c:set var="dt" value="Nov 21, 2000 3:45:02 AM"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>

<!-- If the jakarta.servlet.jsp.jstl.fmt.locale attribute
is present, it will take precedence over the browser
Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/parsedate/positivePDBodyValueTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!-- The date to be parsed can be provided as body content to the
action. -->

Nov 21, 2000 3:45:02 AM
Nov 21, 2000, 3:45:02 AM


</body>
Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/parsedate/positivePDBodyValueTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<!-- The date to be parsed can be provided as body content to the
action. -->
<fmt:parseDate type="both" var="e2">
Nov 21, 2000 3:45:02 AM
Nov 21, 2000, 3:45:02 AM
</fmt:parseDate>
<fmt:formatDate value="${e2}" type="both" timeZone="EST"/>

Expand Down
24 changes: 12 additions & 12 deletions src/web/jstl/spec/fmt/format/parsedate/positivePDDateStyleTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,22 +91,22 @@
<fmt:parseDate value="3:45:03 AM" dateStyle="full" type="time"/><br>

<br>'type' set to 'both' -- dateStyle should be applied<br>
<fmt:parseDate value="Nov 21, 2000 3:45:02 AM" type="both"/><br>
<fmt:parseDate value="Nov 21, 2000 3:45:02 AM" type="both"/><br>
<fmt:parseDate value="Nov 21, 2000 3:45:02 AM"
<fmt:parseDate value="Nov 21, 2000, 3:45:02 AM" type="both"/><br>
<fmt:parseDate value="Nov 21, 2000, 3:45:02 AM" type="both"/><br>
<fmt:parseDate value="Nov 21, 2000, 3:45:02 AM"
dateStyle='<%= (String) pageContext.getAttribute("def") %>' type="both"/><br>
<fmt:parseDate value="Nov 21, 2000 3:45:02 AM" dateStyle="default" type="both"/><br>
<fmt:parseDate value="11/21/00 3:45:02 AM"
<fmt:parseDate value="Nov 21, 2000, 3:45:02 AM" dateStyle="default" type="both"/><br>
<fmt:parseDate value="11/21/00, 3:45:02 AM"
dateStyle='<%= (String) pageContext.getAttribute("sho") %>' type="both"/><br>
<fmt:parseDate value="11/21/00 3:45:02 AM" dateStyle="short" type="both"/><br>
<fmt:parseDate value="Nov 21, 2000 3:45:02 AM"
<fmt:parseDate value="11/21/00, 3:45:02 AM" dateStyle="short" type="both"/><br>
<fmt:parseDate value="Nov 21, 2000, 3:45:02 AM"
dateStyle='<%= (String) pageContext.getAttribute("med") %>' type="both"/><br>
<fmt:parseDate value="Nov 21, 2000 3:45:02 AM" dateStyle="medium" type="both"/><br>
<fmt:parseDate value="November 21, 2000 3:45:02 AM"
<fmt:parseDate value="Nov 21, 2000, 3:45:02 AM" dateStyle="medium" type="both"/><br>
<fmt:parseDate value="November 21, 2000, 3:45:02 AM"
dateStyle='<%= (String) pageContext.getAttribute("lon") %>' type="both"/><br>
<fmt:parseDate value="November 21, 2000 3:45:02 AM" dateStyle="long" type="both"/><br>
<fmt:parseDate value="Tuesday, November 21, 2000 3:45:02 AM"
<fmt:parseDate value="November 21, 2000, 3:45:02 AM" dateStyle="long" type="both"/><br>
<fmt:parseDate value="Tuesday, November 21, 2000, 3:45:02 AM"
dateStyle='<%= (String) pageContext.getAttribute("ful") %>' type="both"/><br>
<fmt:parseDate value="Tuesday, November 21, 2000 3:45:02 AM"
<fmt:parseDate value="Tuesday, November 21, 2000, 3:45:02 AM"
dateStyle="full" type="both"/><br>
</tck:test>
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

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>
Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/parsedate/positivePDFallbackLocaleTest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<fmt:setTimeZone value="EST"/>
<c:set var="dte" value="Nov 21, 2000"/>
<c:set var="dtim" value="3:45:02 AM"/>
<c:set var="dt" value="Nov 21, 2000 3:45:02 AM"/>
<c:set var="dt" value="Nov 21, 2000, 3:45:02 AM"/>
<tck:config op="set" configVar="fallback" value="en-US"/>

<!-- The fallbackLocale configuration variable will be
Expand Down
2 changes: 1 addition & 1 deletion src/web/jstl/spec/fmt/format/parsedate/positivePDLocalizationContextTest.gf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

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>
Expand Down
Loading