Skip to content

Commit

Permalink
Merge pull request #664 from brideck/UpdateJSTLJava11Locale
Browse files Browse the repository at this point in the history 
Updates to JSTL bucket for Java 11 Locale
  • Loading branch information
@scottmarlow
scottmarlow authored Oct 26, 2021
2 parents 8bf4f2d + eea9f92 commit dcfc0d4
Show file tree
Hide file tree
Showing 42 changed files with 133 additions and 133 deletions.
Binary file modified src/com/sun/ts/tests/jstl/compat/onedotzero/jstl_1_0_compat_web.war
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions src/web/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTest.gf
View file
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
4 changes: 2 additions & 2 deletions src/web/jstl/compat/onedotzero/positiveFormatLocalizationContextI18NTest.jsp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%--
Copyright (c) 2003, 2020 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 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
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
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
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
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
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
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
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
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
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
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
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
4 changes: 2 additions & 2 deletions ...jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBrowserLocaleTest.jsp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%--
Copyright (c) 2003, 2018 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 All @@ -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
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
4 changes: 2 additions & 2 deletions src/web/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextBundleTest.jsp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%--
Copyright (c) 2003, 2020 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 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
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
4 changes: 2 additions & 2 deletions src/web/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextI18NTest.jsp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%--
Copyright (c) 2003, 2020 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 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
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
4 changes: 2 additions & 2 deletions src/web/jstl/spec/fmt/format/localecontext/positiveFormatLocalizationContextLocaleTest.jsp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%--
Copyright (c) 2003, 2020 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 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
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
4 changes: 2 additions & 2 deletions src/web/jstl/spec/fmt/format/parsedate/positivePDBodyValueTest.jsp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%--
Copyright (c) 2003, 2018 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 All @@ -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
Loading

0 comments on commit dcfc0d4

Please sign in to comment.