1.1 --- a/make/common/shared/Defs.gmk	Tue Apr 19 18:14:51 2011 -0700
     1.2 +++ b/make/common/shared/Defs.gmk	Wed Apr 20 16:05:52 2011 -0700
     1.3 @@ -218,11 +218,7 @@
     1.4  else
     1.5    LAUNCHER_NAME = java
     1.6    PRODUCT_NAME = Java(TM)
     1.7 -  ifeq ($(J4B), true)
     1.8 -    PRODUCT_SUFFIX = SE Runtime Environment for Business
     1.9 -  else
    1.10 -    PRODUCT_SUFFIX = SE Runtime Environment
    1.11 -  endif
    1.12 +  PRODUCT_SUFFIX = SE Runtime Environment
    1.13    JDK_RC_PLATFORM_NAME = Platform SE
    1.14    COMPANY_NAME = Oracle Corporation
    1.15  endif

     2.1 --- a/src/share/classes/sun/util/resources/CurrencyNames_de.properties	Tue Apr 19 18:14:51 2011 -0700
     2.2 +++ b/src/share/classes/sun/util/resources/CurrencyNames_de.properties	Wed Apr 20 16:05:52 2011 -0700
     2.3 @@ -65,6 +65,8 @@
     2.4  #
     2.5  adp=Andorranische Pesete
     2.6  aed=UAE Dirham
     2.7 +afa=Afghani (1927-2002)
     2.8 +afn=Afghani
     2.9  all=Lek
    2.10  amd=Dram
    2.11  ang=Niederl. Antillen Gulden
    2.12 @@ -85,6 +87,7 @@
    2.13  bif=Burundi-Franc
    2.14  bmd=Bermuda-Dollar
    2.15  bnd=Brunei-Dollar
    2.16 +bob=Boliviano
    2.17  bov=Mvdol
    2.18  brl=Real
    2.19  bsd=Bahama-Dollar
    2.20 @@ -106,6 +109,7 @@
    2.21  cve=Kap Verde Escudo
    2.22  cyp=Zypern-Pfund
    2.23  czk=Tschechische Krone
    2.24 +dem=Deutsche Mark
    2.25  djf=Dschibuti-Franc
    2.26  dkk=D\u00e4nische Krone
    2.27  dop=Dominikanischer Peso
    2.28 @@ -176,7 +180,9 @@
    2.29  mtl=Maltesische Lira
    2.30  mur=Mauritius-Rupie
    2.31  mvr=Rufiyaa
    2.32 +mwk=Malawi Kwacha
    2.33  mxn=Mexikanischer Peso
    2.34 +mxv=Mexican Unidad de Inversion (UDI)
    2.35  myr=Malaysischer Ringgit
    2.36  mzm=Alter Metical
    2.37  mzn=Metical
    2.38 @@ -217,6 +223,7 @@
    2.39  srd=Surinamischer Dollar
    2.40  srg=Suriname Gulden
    2.41  std=Dobra
    2.42 +svc=El Salvador Colon
    2.43  syp=Syrisches Pfund
    2.44  szl=Lilangeni
    2.45  thb=Baht

     3.1 --- a/src/share/classes/sun/util/resources/CurrencyNames_it.properties	Tue Apr 19 18:14:51 2011 -0700
     3.2 +++ b/src/share/classes/sun/util/resources/CurrencyNames_it.properties	Wed Apr 20 16:05:52 2011 -0700
     3.3 @@ -86,6 +86,7 @@
     3.4  bif=Franco del Burundi
     3.5  bmd=Dollaro delle Bermuda
     3.6  bnd=Dollaro del Brunei
     3.7 +bob=Boliviano
     3.8  bov=Mvdol Boliviano
     3.9  brl=Real Brasiliano
    3.10  bsd=Dollaro delle Bahamas

     4.1 --- a/test/java/util/Currency/CurrencyTest.java	Tue Apr 19 18:14:51 2011 -0700
     4.2 +++ b/test/java/util/Currency/CurrencyTest.java	Wed Apr 20 16:05:52 2011 -0700
     4.3 @@ -23,7 +23,7 @@
     4.4  /*
     4.5   * @test
     4.6   * @bug 4290801 4692419 4693631 5101540 5104960 6296410 6336600 6371531
     4.7 - *    6488442
     4.8 + *    6488442 7036905
     4.9   * @summary Basic tests for Currency class.
    4.10   */
    4.11  
    4.12 @@ -249,7 +249,7 @@
    4.13          testDisplayName("ITL", new Locale("it"), "Lira Italiana");
    4.14          testDisplayName("JPY", Locale.JAPANESE, "\u65e5\u672c\u5186");
    4.15          testDisplayName("KRW", Locale.KOREAN, "\ub300\ud55c\ubbfc\uad6d \uc6d0");
    4.16 -        testDisplayName("SEK", new Locale("sv"), "Svensk krona");
    4.17 +        testDisplayName("SEK", new Locale("sv"), "svensk krona");
    4.18          testDisplayName("CNY", Locale.SIMPLIFIED_CHINESE, "\u4eba\u6c11\u5e01");
    4.19          testDisplayName("TWD", Locale.TRADITIONAL_CHINESE, "\u65b0\u81fa\u5e63");
    4.20      }

     5.1 --- a/test/sun/text/resources/LocaleData	Tue Apr 19 18:14:51 2011 -0700
     5.2 +++ b/test/sun/text/resources/LocaleData	Wed Apr 20 16:05:52 2011 -0700
     5.3 @@ -6942,3 +6942,14 @@
     5.4  CurrencyNames/zh_TW/xts=XTS
     5.5  CurrencyNames/zh_TW/xxx=XXX
     5.6  CurrencyNames/zh_TW/yer=\u8449\u9580\u91cc\u96c5
     5.7 +
     5.8 +# bug 7036905
     5.9 +CurrencyNames/de/afa=Afghani (1927-2002)
    5.10 +CurrencyNames/de/afn=Afghani
    5.11 +CurrencyNames/de/bob=Boliviano
    5.12 +CurrencyNames/de/dem=Deutsche Mark
    5.13 +CurrencyNames/de/mwk=Malawi Kwacha
    5.14 +CurrencyNames/de/mxv=Mexican Unidad de Inversion (UDI)
    5.15 +CurrencyNames/de/svc=El Salvador Colon
    5.16 +
    5.17 +CurrencyNames/it/bob=Boliviano

     6.1 --- a/test/sun/text/resources/LocaleDataTest.java	Tue Apr 19 18:14:51 2011 -0700
     6.2 +++ b/test/sun/text/resources/LocaleDataTest.java	Wed Apr 20 16:05:52 2011 -0700
     6.3 @@ -33,7 +33,7 @@
     6.4   *      6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259
     6.5   *      6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
     6.6   *      6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
     6.7 - *      6919624 6998391 7019267 7020960 7025837 7020583
     6.8 + *      6919624 6998391 7019267 7020960 7025837 7020583 7036905
     6.9   * @summary Verify locale data
    6.10   *
    6.11   */