From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Mon, 9 Jan 2017 21:24:46 +0000 (+0000)
Subject: ICU-12826 Updated CLDR utilities jar build target to exclude test framework classes... 
X-Git-Tag: milestone-59-0-1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0057324249d4623e5f7c165433110ea1ba06a7d6;p=icu

ICU-12826 Updated CLDR utilities jar build target to exclude test framework classes. Also added @internal CLDR to the API comment in those test utility classes actually refereneced by CLDR tooling.

X-SVN-Rev: 39550
---

diff --git a/icu4j/build.xml b/icu4j/build.xml
index b6ba5b74b33..8a9460a41a1 100644
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -1490,11 +1490,12 @@
                 classpath="${icu4j.jar.file}">
 
             <src path="${icu4j.tools.dir}/src"/>
-            <src path="${icu4j.translit-tests.dir}/src"/>
             <src path="${icu4j.test-framework.dir}/src"/>
 
-            <include name="com/ibm/icu/dev/test/TestFmwk.java" />
-            <include name="com/ibm/icu/dev/util/*.java" />
+            <include name="com/ibm/icu/dev/util/CollectionUtilities.java" />
+            <include name="com/ibm/icu/dev/util/ElapsedTimer.java" />
+            <include name="com/ibm/icu/dev/util/UnicodeMap.java" />
+            <include name="com/ibm/icu/dev/util/UnicodeMapIterator.java" />
             <include name="com/ibm/icu/dev/tool/UOption.java" />
         </javac>
 
@@ -1502,7 +1503,6 @@
         <jar jarfile="${cldr.util.out.dir}/lib/utilities.jar"
                 compress="true"
                 basedir="${cldr.util.out.dir}/bin">
-            <include name="com/ibm/icu/dev/test/*.class"/>
             <include name="com/ibm/icu/dev/util/*.class"/>
             <include name="com/ibm/icu/dev/tool/UOption*.class"/>
         </jar>
@@ -1519,13 +1519,11 @@
         <!-- utilities-src.jar -->
         <jar jarfile="${cldr.release.dir}/utilities-src.jar" compress="true">
             <fileset dir="${icu4j.test-framework.dir}/${src.dir}">
-                <include name="com/ibm/icu/dev/test/TestFmwk.java"/>
-                <include name="com/ibm/icu/dev/test/*Log*.java"/>
-                <include name="com/ibm/icu/dev/test/TestUtil.java"/>
-                <include name="com/ibm/icu/dev/test/UTF16Util.java"/>
+                <include name="com/ibm/icu/dev/util/CollectionUtilities.java" />
+                <include name="com/ibm/icu/dev/util/ElapsedTimer.java" />
+                <include name="com/ibm/icu/dev/util/UnicodeMap.java" />
+                <include name="com/ibm/icu/dev/util/UnicodeMapIterator.java" />
             </fileset>
-            <fileset dir="${icu4j.test-framework.dir}/${src.dir}" includes="com/ibm/icu/dev/util/*.java"/>
-            <fileset dir="${icu4j.translit-tests.dir}/${src.dir}" includes="com/ibm/icu/dev/util/*.java"/>
             <fileset dir="${icu4j.tools.dir}/${src.dir}" includes="com/ibm/icu/dev/tool/UOption.java"/>
        </jar>
     </target>
diff --git a/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/CollectionUtilities.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/CollectionUtilities.java
index f0b58954069..94dd2b392cc 100644
--- a/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/CollectionUtilities.java
+++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/CollectionUtilities.java
@@ -25,6 +25,8 @@ import com.ibm.icu.text.UnicodeSetIterator;
 
 /**
  * Utilities that ought to be on collections, but aren't
+ *
+ * @internal CLDR
  */
 public final class CollectionUtilities {
 
diff --git a/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ElapsedTimer.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ElapsedTimer.java
index 6a021069131..b2e9d298a92 100644
--- a/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ElapsedTimer.java
+++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ElapsedTimer.java
@@ -27,6 +27,8 @@ import com.ibm.icu.text.RuleBasedNumberFormat;
  *            System.out.println(et.toString()); }
  *
  * More advanced:  NumberFormat and/or MessageFormat can be provided in the constructor
+ *
+ * @internal CLDR
  */
 public final class ElapsedTimer {
 
diff --git a/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMap.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMap.java
index 9db206b39c3..73ab1e30634 100644
--- a/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMap.java
+++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMap.java
@@ -36,6 +36,8 @@ import com.ibm.icu.util.Freezable;
  * that is, a put(x,null) is the same as remove(x).<br>
  * At this point "" is also not allowed as a key, although that may change.
  * @author markdavis
+ *
+ * @internal CLDR
  */
 
 public final class UnicodeMap<T> implements Cloneable, Freezable<UnicodeMap<T>>, StringTransform, Iterable<String> {
diff --git a/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMapIterator.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMapIterator.java
index 159f5978cbc..3b9b25e1fe4 100644
--- a/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMapIterator.java
+++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMapIterator.java
@@ -43,6 +43,8 @@ import com.ibm.icu.text.UTF16;
  * }
  * </pre>
  * @author M. Davis
+ *
+ * @internal CLDR
  */
 public class UnicodeMapIterator<T> {