# HG changeset patch
# User alanb
# Date 1368116831 -3600
# Node ID efdcb1087baea7ddd60f00f6897ff15435bc3ef5
# Parent  dedb40431de50733a41d56a61177164d4667b849
Update module definitions to align with resources changes in jdk8.
Need all of sun.nio.cs in base module.

diff -r dedb40431de5 -r efdcb1087bae make/modules/modules.config
--- a/make/modules/modules.config	Wed May 08 10:40:22 2013 -0700
+++ b/make/modules/modules.config	Thu May 09 17:27:11 2013 +0100
@@ -147,7 +147,7 @@
             sun.security.timestamp.*;
 
     // this list is based on the classlist generated from the rootset
-    // need investigation
+    // need investigation - see JDK-7194075
     exclude sun.security.ec.ECD*,
             sun.security.ec.ECKeyPairGenerator,
             sun.security.ec.SunEC*,
@@ -163,26 +163,9 @@
     // mandatory charsets
     include sun.nio.cs.*;
 
-    exclude sun.nio.cs.AbstractCharsetProvider,
-            sun.nio.cs.IBM*,
-            sun.nio.cs.ISO*,
-            sun.nio.cs.KOI8_*,
-            sun.nio.cs.MS125*,
-            sun.nio.cs.UTF_32*,
-            sun.nio.cs.SingleByteDecoder,
-            sun.nio.cs.SingleByteEncoder;
-
-    allow   sun.nio.cs.ISO_8859_1,
-            sun.nio.cs.ISO_8859_15,
-            sun.nio.cs.MS1252;
-
     include sun.text.*,
             sun.text.bidi.*,
             sun.text.normalizer.*;
-    include sun.text.CharArrayCodePointIterator,
-            sun.text.CharSequenceCodePointIterator,
-            sun.text.CharacterIteratorCodePointIterator,
-            sun.text.CodePointIterator;
 
     // CLDR
     include sun.util.cldr.*,
@@ -203,26 +186,12 @@
             sun.util.locale.**,
             sun.util.logging.*,
             sun.util.spi.*,
-            sun.util.resources.LocaleData,
-            sun.util.resources.LocaleNamesBundle,
-            sun.util.resources.OpenListResourceBundle;
+            sun.util.resources.*,
+            sun.util.resources.en.*;
 
     // US_en locale
-    include sun.text.resources.BreakIteratorInfo,
-            sun.text.resources.CollationData,
-            sun.text.resources.CollationData_en,
-            sun.text.resources.FormatData,
-            sun.text.resources.FormatData_en_US,
-            sun.util.resources.CalendarData,
-            sun.util.resources.CalendarData_en,
-            sun.util.resources.TimeZoneNames,
-            sun.util.resources.TimeZoneNames_en,
-            sun.util.resources.TimeZoneNamesBundle,
-            sun.util.resources.LocaleNames,
-            sun.util.resources.LocaleNames_en,
-            sun.util.resources.LocalenamesBundles,
-            sun.util.resources.CurrencyNames,
-            sun.util.resources.CurrencyNames_en_US,
+    include sun.text.resources.*,
+            sun.text.resources.en.*,
             sun.util.EmptyListResourceBundle;
 
     // resources file needed by
@@ -304,21 +273,6 @@
 
 module charsets {
     include sun.nio.cs.ext.**;
-
-    include sun.nio.cs.AbstractCharsetProvider,
-            sun.nio.cs.CharsetMapping,
-            sun.nio.cs.IBM*,
-            sun.nio.cs.ISO*,
-            sun.nio.cs.KOI8_*,
-            sun.nio.cs.MS125*,
-            sun.nio.cs.SingleByte*,
-            sun.nio.cs.UTF_32*;
-
-    exclude sun.nio.cs.ISO_8859_1,
-            sun.nio.cs.MS1252;
-
-    // legacy sun.io converters
-    include sun.io.*;
 }
 
 /**************************************************************************/
@@ -327,38 +281,6 @@
 module localedata {
     include sun.util.resources.**,
             sun.text.resources.**;
-    include sun.util.resources.*_ar,
-            sun.util.resources.*_ar_*,
-            sun.util.resources.*_hi,
-            sun.util.resources.*_hi_*,
-            sun.util.resources.*_iw,
-            sun.util.resources.*_iw_*,
-            sun.util.resources.*_ja,
-            sun.util.resources.*_ja_*,
-            sun.util.resources.*_ko,
-            sun.util.resources.*_ko_*,
-            sun.util.resources.*_th,
-            sun.util.resources.*_th_*,
-            sun.util.resources.*_vi,
-            sun.util.resources.*_vi_*,
-            sun.util.resources.*_zh,
-            sun.util.resources.*_zh_*;
-    include sun.text.resources.*_ar,
-            sun.text.resources.*_ar_*,
-            sun.text.resources.*_hi,
-            sun.text.resources.*_hi_*,
-            sun.text.resources.*_iw,
-            sun.text.resources.*_iw_*,
-            sun.text.resources.*_ja,
-            sun.text.resources.*_ja_*,
-            sun.text.resources.*_ko,
-            sun.text.resources.*_ko_*,
-            sun.text.resources.*_th,
-            sun.text.resources.*_th_*,
-            sun.text.resources.*_vi,
-            sun.text.resources.*_vi_*,
-            sun.text.resources.*_zh,
-            sun.text.resources.*_zh_*;
 }
 
 module resources {