ICU-7521 Merging fix for ticket#7505(r27801), ticket#7508(r27802), ticket#6990(r27805) and ticket#7508(r27811) from trunk to maint-4-4 for ICU4J 4.4.
X-SVN-Rev: 27814
diff --git a/build.xml b/build.xml
index 82dbb71..fb60318 100644
--- a/build.xml
+++ b/build.xml
@@ -4,7 +4,7 @@
* others. All Rights Reserved. *
*******************************************************************************
-->
-<project name="icu4j" default="main" basedir=".">
+<project name="icu4j" default="jar" basedir=".">
<property file="build.properties"/>
<property name="shared.dir" value="main/shared"/>
@@ -12,14 +12,8 @@
<property name="icu4j.jar.file" value="icu4j.jar"/>
<property name="icu4jtests.jar.file" value="icu4jtests.jar"/>
- <property name="icu4j-core.jar.file" value="icu4j-core.jar"/>
- <property name="icu4j-collate.jar.file" value="icu4j-collate.jar"/>
<property name="icu4j-charsets.jar.file" value="icu4j-charsets.jar"/>
- <property name="icu4j-currdata.jar.file" value="icu4j-currdata.jar"/>
- <property name="icu4j-langdata.jar.file" value="icu4j-langdata.jar"/>
<property name="icu4j-localespi.jar.file" value="icu4j-localespi.jar"/>
- <property name="icu4j-regiondata.jar.file" value="icu4j-regiondata.jar"/>
- <property name="icu4j-translit.jar.file" value="icu4j-translit.jar"/>
<property name="icu4jdocs.jar.file" value="icu4jdocs.jar"/>
<property name="icu4jsrc.jar.file" value="icu4jsrc.jar"/>
<property name="icu4jdemos.jar.file" value="icu4jdemos.jar"/>
@@ -86,7 +80,7 @@
<!-- delete all .jar files in icu4j root directory -->
<delete>
- <fileset dir="." includes="*.jar"/>
+ <fileset dir="." includes="icu4j*.jar"/>
</delete>
<delete dir="${doc.dir}"/>
@@ -95,9 +89,9 @@
</target>
<!-- meta build targets -->
- <target name="all" depends="info, main, tests, localespi, localespi-tests, build-tools, tools, demos, jar, docs" description="Build all primary targets"/>
- <target name="main" depends="info, core, collate, charset, currdata, langdata, regiondata, translit" description="Build ICU4J API classes"/>
- <target name="tests" depends="info, core-tests, charset-tests, collate-tests, packaging-tests, translit-tests" description="Build ICU4J API test classes"/>
+ <target name="all" depends="info, main, tests, build-tools, tools, demos, jar, docs" description="Build all primary targets"/>
+ <target name="main" depends="info, core, collate, charset, currdata, langdata, regiondata, translit, localespi" description="Build ICU4J runtime library classes"/>
+ <target name="tests" depends="info, core-tests, charset-tests, collate-tests, packaging-tests, translit-tests, localespi-tests" description="Build ICU4J test classes"/>
<target name="releaseJar" depends="info, jar, jarDocs, jarSrc" description="Build all jar files for distribution"/>
<target name="secure" depends="icu4jJar" description="(Deprecated)Build ICU4J API and test classes for running the ICU4J test suite with Java security manager enabled"/>
@@ -295,15 +289,9 @@
</target>
<!-- jar targets -->
- <target name="jar" depends="main, icu4jJar" description="Build ICU4J API jar files">
- <copy file="${icu4j.core.jar}" tofile="${icu4j-core.jar.file}"/>
- <copy file="${icu4j.collate.jar}" tofile="${icu4j-collate.jar.file}"/>
+ <target name="jar" depends="icu4jJar, charset, localespi" description="Build ICU4J runtime library jar files">
<copy file="${icu4j.charset.jar}" tofile="${icu4j-charsets.jar.file}"/>
- <copy file="${icu4j.currdata.jar}" tofile="${icu4j-currdata.jar.file}"/>
- <copy file="${icu4j.langdata.jar}" tofile="${icu4j-langdata.jar.file}"/>
<copy file="${icu4j.localespi.jar}" tofile="${icu4j-localespi.jar.file}" failonerror="false"/>
- <copy file="${icu4j.regiondata.jar}" tofile="${icu4j-regiondata.jar.file}"/>
- <copy file="${icu4j.translit.jar}" tofile="${icu4j-translit.jar.file}"/>
</target>
<target name="icu4jJar" depends="info, core, collate, currdata, langdata, regiondata, translit" description="Build ICU4J all-in-one core jar">
@@ -358,6 +346,7 @@
<include name="tools/**/*"/>
<include name="*.html"/>
<include name="*.xml"/>
+ <include name="*.properties"/>
<exclude name="**/out/**/*"/>
</fileset>
</jar>
@@ -444,7 +433,7 @@
<ant dir="${icu4j.build-tools.dir}" inheritAll="false"/>
</target>
- <target name="tools" depends="core, core-tests" description="Build tool classes">
+ <target name="tools" depends="core, core-tests, collate, translit, translit-tests" description="Build tool classes">
<ant dir="${icu4j.tools.dir}" inheritAll="false"/>
</target>
diff --git a/main/shared/data/icudata.jar b/main/shared/data/icudata.jar
index 6da9c7d..ea4fc5f 100755
--- a/main/shared/data/icudata.jar
+++ b/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f395be4d096ecb23445be3dd0210542a527ec610c8e67382a24c3fd50245d774
-size 7014969
+oid sha256:3910b9ac0bf1f11847fe50460642737c4922d7938bdad3c4fe6d0e5a4b5da35f
+size 7020143
diff --git a/main/shared/data/testdata.jar b/main/shared/data/testdata.jar
index cd57178..2dc547c 100755
--- a/main/shared/data/testdata.jar
+++ b/main/shared/data/testdata.jar
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:77fe552a582031dd2700a0f83d61a14174230ff0dbb5f42c4e92c277951043a7
-size 720350
+oid sha256:f9eab7635359df91e970c2508f2eba114050507004715ea72a74ebb84af5381d
+size 720361
diff --git a/readme.html b/readme.html
index 5a5b2dc..282c981 100644
--- a/readme.html
+++ b/readme.html
@@ -132,11 +132,11 @@
<h3 class="doc"><a name="news"></a>What Is New In This Release?</h3>
<h4>Minimum Java runtime environment requirement</h4>
<p>
-Starting from this version, you need at least JRE 5.0 for using ICU4J 4.4.
-ICU4J adopted Java 5 language features and no longer compiled with JDK 1.4 or
+Starting with version 4.4, you need at least JRE 5.0 to use ICU4J 4.4.
+ICU4J adopted Java 5 language features and no longer compiles with JDK 1.4 or
older versions. This migration also includes some updates in public API signatures,
-such as generics, return/parameter types. In general, most of these changes
-do not require any changes in existing ICU4J user codes.
+such as generics and return/parameter types. In general, most of these changes
+do not require any changes in existing ICU4J user code.
</p>
<h4>Other updates</h4>
<p>
@@ -172,10 +172,10 @@
</p>
<h3 class="doc"><a name="PlatformDependencies"></a>Platform Dependencies</h3>
<p>
-ICU4J depends on J2SE 5.0 functionalities. Therefore, ICU4J only runs on
-JRE 5.0 or later releases of Java runtime environment.
-The table below shows operating systems and JRE/VM versions currently
-used by the ICU development team for testing ICU4J.
+ICU4J 4.4 depends on J2SE 5.0 functionality. Therefore, ICU4J only runs on
+JRE version 5.0 or later.
+The table below shows the operating systems and JRE/VM versions currently
+used by the ICU development team to test ICU4J.
</p>
<table border="1">
<tr>
@@ -402,7 +402,7 @@
<table border="1">
<tr>
<th>Path</th>
- <th>Sub Component Name</th>
+ <th>Sub-component Name</th>
<th>Build Dependencies</th>
<th>Public API Packages</th>
<th>Description</th>
@@ -413,7 +413,7 @@
<td>icu4j-core</td>
<td>com.ibm.icu.charset</td>
<td>Implementation of <code>java.nio.charset.spi.CharsetProvider</code>.
- This sub component is shipped as icu4j-charsets.jar along with
+ This sub-component is shipped as icu4j-charsets.jar along with
ICU charset converter data files.</td>
</tr>
<tr>
@@ -422,9 +422,9 @@
<td>icu4j-core</td>
<td>com.ibm.icu.text<br>
com.ibm.icu.util</td>
- <td>Collator APIs and its implementations. Also includes some public API classes
- which depends on Collator.
- This sub component is packaged as a part of icu4j.jar.</td>
+ <td>Collator APIs and implementation. Also includes some public API classes
+ that depend on Collator.
+ This sub-component is packaged as a part of icu4j.jar.</td>
</tr>
<tr>
<td>main/classes/core</td>
@@ -434,24 +434,24 @@
com.ibm.icu.math<br>
com.ibm.icu.text<br>
com.ibm.icu.util</td>
- <td>ICU core API classes and its implementations.
- This sub component is packaged as a part of icu4j.jar.</td>
+ <td>ICU core API classes and implementation.
+ This sub-component is packaged as a part of icu4j.jar.</td>
</tr>
<tr>
<td>main/classes/currdata</td>
<td>icu4j-currdata</td>
<td>icu4j-core</td>
<td>n/a</td>
- <td>No public API classes. Providing access to currency display data.
- This sub component is packaged as a part of icu4j.jar.</td>
+ <td>No public API classes. Provides access to currency display data.
+ This sub-component is packaged as a part of icu4j.jar.</td>
</tr>
<tr>
<td>main/classes/langdata</td>
<td>icu4j-langdata</td>
<td>icu4j-core</td>
<td>n/a</td>
- <td>No public API classes. Providing access to language display data.
- This sub component is packaged as a part of icu4j.jar.</td>
+ <td>No public API classes. Provides access to language display data.
+ This sub-component is packaged as a part of icu4j.jar.</td>
</tr>
<tr>
<td>main/classes/localespi</td>
@@ -460,26 +460,26 @@
icu4j-collate<br>
</td>
<td>n/a</td>
- <td>Implementation of various locale sensitive service providers defined
+ <td>Implementation of various locale-sensitive service providers defined
in <code>java.text.spi</code> and <code>java.util.spi</code> in J2SE 6.0
or later Java releases.
- This sub component is shipped as icu4j-localespi.jar.</td>
+ This sub-component is shipped as icu4j-localespi.jar.</td>
</tr>
<tr>
<td>main/classes/regiondata</td>
<td>icu4j-regiondata</td>
<td>icu4j-core</td>
<td>n/a</td>
- <td>No public API classes. Providing access to region display data.
- This sub component is packaged as a part of icu4j.jar.</td>
+ <td>No public API classes. Provides access to region display data.
+ This sub-component is packaged as a part of icu4j.jar.</td>
</tr>
<tr>
<td>main/classes/translit</td>
<td>icu4j-translit</td>
<td>icu4j-core</td>
<td>com.ibm.icu.text</td>
- <td>Transliterator APIs and its implementations.
- This sub component is packaged as a part of icu4j.jar.</td>
+ <td>Transliterator APIs and implementation.
+ This sub-component is packaged as a part of icu4j.jar.</td>
</tr>
</table>
@@ -487,7 +487,7 @@
<table border="1">
<tr>
<th>Path</th>
- <th>Sub Component Name</th>
+ <th>Sub-component Name</th>
<th>Runtime Dependencies</th>
<th>Description</th>
</tr>
@@ -497,7 +497,7 @@
<td>icu4j-charset<br>
icu4j-core<br>
icu4j-test-framework</td>
- <td>Test suite for charset sub component.</td>
+ <td>Test suite for charset sub-component.</td>
</tr>
<tr>
<td>main/tests/collate</td>
@@ -505,7 +505,7 @@
<td>icu4j-collate<br>
icu4j-core<br>
icu4j-test-framework</td>
- <td>Test suite for collate sub component.</td>
+ <td>Test suite for collate sub-component.</td>
</tr>
<tr>
<td>main/tests/core</td>
@@ -515,7 +515,7 @@
icu4j-langdata<br>
icu4j-regiondata<br>
icu4j-test-framework</td>
- <td>Test suite for core sub component.</td>
+ <td>Test suite for core sub-component.</td>
</tr>
<tr>
<td>main/tests/framework</td>
@@ -533,14 +533,14 @@
icu4j-localespi<br>
icu4j-regiondata<br>
icu4j-test-framework</td>
- <td>Test suite for localespi sub component.</td>
+ <td>Test suite for localespi sub-component.</td>
</tr>
<tr>
<td>main/tests/packaging</td>
<td>icu4j-packaging-tests</td>
<td>icu4j-core<br>
icu4j-test-framework</td>
- <td>Test suite for sub component packaging.</td>
+ <td>Test suite for sub-component packaging.</td>
</tr>
<tr>
<td>main/tests/translit</td>
@@ -548,7 +548,7 @@
<td>icu4j-core<br>
icu4j-translit
icu4j-test-framework</td>
- <td>Test suite for translit sub component.</td>
+ <td>Test suite for translit sub-component.</td>
</tr>
</table>
@@ -556,11 +556,11 @@
<table border="1">
<tr>
<th>Path</td>
- <th>Descriptopm</td>
+ <th>Descriptiom</td>
</tr>
<tr>
<td>main/shared</td>
- <td>Files shared by ICU4J sub components under <code>main</code> directory including:
+ <td>Files shared by ICU4J sub-components under the <code>main</code> directory including:
<ul>
<li>ICU4J runtime data archive (icudata.jar).<li>
<li>ICU4J unit test data archive (testdata.jar).<li>
@@ -575,7 +575,7 @@
</tr>
<tr>
<td>perf-tests</td>
- <td>ICU4J performance test files</td>
+ <td>ICU4J performance test files.</td>
</tr>
<tr>
<td>tools</td>
@@ -646,15 +646,15 @@
<h3 class="doc"><a name="HowToInstallJavac"></a>How to Install and Build</h3>
<p>
To install ICU4J, simply place the prebuilt jar file <strong>icu4j.jar</strong>
-on your Java CLASSPATH. If you need Charset API support please place
+on your Java CLASSPATH. If you need Charset API support please also place
<strong>icu4j-charsets.jar</strong> on your class path along with <strong>icu4j.jar</strong>.
</p>
<p>
-To build ICU4J, you will need a J2SE SDK 5.0 or later releases (ICU4J locale SPI
-provider sub components require J2SE SDK 6.0 or later) and the Ant build system.
-It's recommended to install both the J2SE SDK and Ant somewhere <em>outside</em>
-the ICU4J directory. For example, on Linux you might install these in
-/usr/local.</p>
+To build ICU4J, you will need J2SE SDK 5.0 or later (ICU4J locale SPI
+provider sub-components require J2SE SDK 6.0 or later) and the Ant build system
+version 1.7 or later. It's recommended to install both the J2SE SDK and Ant
+somewhere <em>outside</em>the ICU4J directory. For example, on Linux you might install
+these in <code>/usr/local</code>.</p>
<ul>
<li>Install J2SE SDK 6.0.</li>
<li>Install the <a href="http://ant.apache.org/"><strong>Ant</strong></a>
@@ -675,25 +675,25 @@
</li>
</ul>
<p>Once the J2SE SDK and Ant are installed, building is just a matter of
-typing <strong>ant releaseJar</strong> in the ICU4J root directory. This
-causes the Ant build system to perform the build target <strong>releaseJar</strong>
+typing <strong>ant</strong> in the ICU4J root directory. This causes the
+Ant build system to perform the build target <strong>jar</strong>
as specified by the file <strong>build.xml</strong>, located in the ICU4J
root directory. You can give Ant options like -verbose, and you can specify
other targets. For example:</p>
<blockquote>
-<pre>C:\icu4j>ant releaseJar
+<pre>C:\icu4j>ant
Buildfile: build.xml
info:
[echo] ----- Build Environment Information -------------------
- [echo] Java Home: C:\java\ibm32\1.6.0_4\jre
+ [echo] Java Home: C:\jdk1.6.0
[echo] Java Version: 1.6.0
- [echo] Ant Home: C:\ant\1.7.1
+ [echo] Ant Home: C:\ant
[echo] Ant Version: Apache Ant version 1.7.1 compiled on June 27 2008
[echo] OS: Windows Vista
- [echo] OS Version: 6.0 build 6002 Service Pack 2
+ [echo] OS Version: 6.1 build 7600
[echo] OS Arch: x86
- [echo] Host: ICUDEV
+ [echo] Host: YOSHI945
[echo] -------------------------------------------------------
core:
@@ -720,49 +720,65 @@
[copy] Copying 23 files to C:\icu4j\main\classes\core\out\bin
copy-data:
- [unjar] Expanding: C:\icu4j\main\shared\data\icudata.jar into C:\icu4j\main\
-classes\core\out\bin
+ [unjar] Expanding: C:\icu4j\main\shared\data\icudata.jar into C:\icu4j\main\classes\core\out\bin
....
....
....
-docs:
- [javadoc] Generating Javadoc
- [javadoc] Javadoc execution
- [javadoc] Creating destination directory: "C:\icu4j\doc\"
- [javadoc] Loading source files for package com.ibm.icu.lang...
- [javadoc] Loading source files for package com.ibm.icu.math...
- [javadoc] Loading source files for package com.ibm.icu.text...
- [javadoc] Loading source files for package com.ibm.icu.util...
- [javadoc] Loading source files for package com.ibm.icu.charset...
- [javadoc] Constructing Javadoc information...
- [javadoc] Registered Taglet com.ibm.icu.dev.tool.docs.ICUTaglet ...
- [javadoc] Standard Doclet version 1.6.0
- [javadoc] Building tree for all the packages and classes...
- [javadoc] Building index for all the packages and classes...
- [javadoc] Building index for all classes...
- [javadoc] Generating C:\icu4j\doc\stylesheet.css...
- [javadoc] Note: Custom tags that could override future standard tags: @icuenh
-anced. To avoid potential overrides, use at least one period character (.) in cu
-stom tag names.
+build:
-jarDocs:
- [jar] Building jar: C:\icu4j\icu4jdocs.jar
+_build-localespi:
-jarSrc:
- [jar] Building jar: C:\icu4j\icu4jsrc.jar
+@compile:
+ [echo] --- java compiler arguments ------------------------
+ [echo] source dir: C:\icu4j\main\classes\localespi/src
+ [echo] output dir: C:\icu4j\main\classes\localespi/out/bin
+ [echo] classpath: C:\icu4j\main\classes\core\out\lib\icu4j-core.jar;C:\icu4j\main\classes\collate\
+out\lib\icu4j-collate.jar
+ [echo] source: 1.6
+ [echo] target: 1.6
+ [echo] debug: on
+ [echo] encoding: ascii
+ [echo] compiler arg: -Xlint:all,-deprecation,-dep-ann
+ [echo] ----------------------------------------------------
+ [mkdir] Created dir: C:\icu4j\main\classes\localespi\out\bin
+ [javac] Compiling 22 source files to C:\icu4j\main\classes\localespi\out\bin
-releaseJar:
+compile:
+
+@copy:
+ [copy] Copying 10 files to C:\icu4j\main\classes\localespi\out\bin
+
+copy:
+
+@jar:
+ [mkdir] Created dir: C:\icu4j\main\classes\localespi\out\lib
+ [copy] Copying 1 file to C:\icu4j\main\classes\localespi\out
+ [jar] Building jar: C:\icu4j\main\classes\localespi\out\lib\icu4j-localespi.jar
+
+jar:
+
+build:
+
+jar:
+ [copy] Copying 1 file to C:\icu4j
+ [copy] Copying 1 file to C:\icu4j
BUILD SUCCESSFUL
-Total time: 1 minute 45 seconds</pre>
+Total time: 24 seconds</pre>
</blockquote>
<I>Note: The above output is an example. The numbers are likely to be different with the current version ICU4J.</I>
<p>The following are some targets that you can provide to <b>ant</b>.
For more targets run <code>ant -projecthelp</code> or see the build.xml file.</p>
<table border="1">
<tr>
+ <th>jar (default)</th>
+ <td>Create ICU4J runtime library jar archives (<code>icu4j.jar</code>,
+ <code>icu4j-charsets.jar</code> and <code>icu4j-localespi.jar</code>)
+ in the root ICU4J directory.</td>
+</tr>
+<tr>
<th>check</th>
<td>Build all ICU4J runtime library classes and corresponding unit test cases,
then run the tests.</td>
@@ -773,17 +789,13 @@
</tr>
<tr>
<th>main</th>
- <td>Build all ICU4J runtime library sub components (under the directory main/classes).
- If no target is specified, main is assumed.</td>
+ <td>Build all ICU4J runtime library sub-components (under the directory
+ <code>main/classes</code>).</td>
</tr>
<tr>
<th>tests</th>
- <td>Build all ICU4J unit test sub components (under the directory main/tests) and its
- dependencies.</td>
-</tr>
-<tr>
- <th>demos</th>
- <td>Build the demos.</td>
+ <td>Build all ICU4J unit test sub-components (under the directory <code>main/tests</code>)
+ and their dependencies.</td>
</tr>
<tr>
<th>tools</th>
@@ -791,27 +803,24 @@
</tr>
<tr>
<th>docs</th>
- <td>Run javadoc over ICU4J runtime library files, generating an HTML documentation tree
- in the subdirectory <strong>doc</strong>.</td>
-</tr>
-<tr>
- <th>jar</th>
- <td>Create a jar archive <strong>icu4j.jar</strong> in the root ICU4J directory containing
- the main class files.</td>
-</tr>
-<tr>
- <th>jarSrc</th>
- <td>Like the <strong>jar</strong> target, but containing only the source files.</td>
+ <td>Run javadoc over the ICU4J runtime library files, generating an HTML documentation
+ tree in the subdirectory <code>doc</code>.</td>
</tr>
<tr>
<th>jarDocs</th>
- <td>Like the <strong>jar</strong> target, but containing only the docs. </td>
+ <td>Create ICU4J doc jar archive (<code>icu4jdocs.jar</code>) containing API reference
+ docs in the root ICU4J directory. </td>
+</tr>
+<tr>
+ <th>jarDemos</th>
+ <td>Create ICU4J demo jar archive (<code>icu4jdemos.jar</code>) in the root ICU4J
+ directory.</td>
</tr>
</table>
<p>For more information, read the Ant documentation and the <strong>build.xml</strong>
file.</p>
-<b>Note:</b> If you get a OutOfMemoryError when you are running <tt>"ant check"</tt>,
+<b>Note:</b> If you get an OutOfMemoryError when you are running <tt>"ant check"</tt>,
you can set the heap size of the jvm by setting the environment variable JVM_OPTIONS
to the appropriate java options.</p>
@@ -840,13 +849,13 @@
</p>
<h4>Charset</h4>
To try out the <strong>Charset</strong> package, build <strong>icu4j.jar</strong> and
-<strong>icu4j-charsets.jar</strong> using 'jar' target.
+<strong>icu4j-charsets.jar</strong> using the 'jar' target.
You can use the charsets by placing these files on your classpath.
<blockquote><tt>java -cp $icu4j_root/icu4j.jar:$icu4j_root/icu4j-charsets.jar <your program></tt></blockquote>
<h4>Other demos</h4>
<p>The other demo programs are <strong>not supported</strong> and
exist only to let you experiment with the ICU4J classes. First, build ICU4J using <tt>ant jarDemos</tt>.
-Then launch <strong></strong> as below:
+Then launch the demos as below:
<blockquote><tt>java -jar $icu4j_root/icu4jdemos.jar</tt></blockquote>
</p>
@@ -885,30 +894,30 @@
as a set of <tt>".res"</tt> files.</li>
<li>The <b>rule-based transliterator data</b> is under the directory
- <tt>icudt44b/translit</tt> as a set of <tt>".res"</tt> files.</li>
+ <tt>icudt44b/translit</tt>, as a set of <tt>".res"</tt> files.</li>
<li>The <b>rule-based number format data</b> is under the directory
- <tt>icudt44b/rbnf</tt> as a set of <tt>".res"</tt> files.
+ <tt>icudt44b/rbnf</tt>, as a set of <tt>".res"</tt> files.
- <li>The <b>break iterator data</b> is directly under the data
- directory, as a set of <tt>".brk"</tt> files, named according to the
+ <li>The <b>break iterator data</b> is directly under the
+ directory <tt>icudt44b</tt>, as a set of <tt>".brk"</tt> files, named according to the
type of break and the locale where there are locale-specific versions.</li>
- <li>The <b>holiday data</b> is under the <tt>data</tt> directory,
+ <li>The <b>holiday data</b> is under the directory <tt>icudt44b</tt>,
as a set of <tt>".class"</tt> files, named <tt>"HolidayBundle_"</tt>
followed by the locale ID.</li>
<li>The <b>character property data</b> as well as assorted <b>normalization
data</b> and default <b>unicode collation algorithm (UCA) data</b>
- is found under the <tt>data</tt> directory as a set of <tt>".icu"</tt>
+ is found under the directory <tt>icudt44b</tt>, as a set of <tt>".icu"</tt>
files. </li>
<li>The <b>character set converter data</b> is under the directory
<tt>icudt44b</tt>, as a set of <tt>".cnv"</tt> files. These files are
currently included only in icu-charset.jar.</li>
- <li>The <b>time zone rule data</b> is named <tt>zoneinfo64.res</tt> under
- the directory <tt>icudt44b</tt>.</li>
+ <li>The <b>time zone rule data</b> is under the directory
+ <tt>icudt44b</tt>, as <tt>zoneinfo64.res</tt>.</li>
<li>The <b>time zone display name data</b> is under the directory
<tt>icudt44b/zone</tt>, as a set of <tt>".res"</tt> files.</li>
