From 802559f52867cc92a729612804805f1848c9342e Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl@icu-project.org>
Date: Sat, 27 Feb 2016 01:48:56 +0000
Subject: [PATCH] ICU-12037 fix references to license.html

X-SVN-Rev: 38409
---
 icu4j/build.xml                                      |  4 ++--
 icu4j/eclipse-build/build.xml                        | 12 ++++++------
 .../com.ibm.icu.base/build.properties                |  4 ++--
 .../features.template/com.ibm.icu/build.properties   |  4 ++--
 icu4j/eclipse-build/misc/about_icu.html              |  4 ++--
 icu4j/eclipse-build/misc/about_icu_base.html         |  4 ++--
 icu4j/main/shared/build/common-targets.xml           |  4 ++--
 icu4j/pom.xml                                        |  2 +-
 icu4j/readme.html                                    |  4 ++--
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/icu4j/build.xml b/icu4j/build.xml
index 25a39d5b297..826d9a0ce54 100644
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -389,7 +389,7 @@
             <fileset dir="${icu4j.regiondata.dir}/${bin.dir}" includes="**/*"/>
             <fileset dir="${icu4j.translit.dir}/${bin.dir}" includes="**/*"/>
             <fileset dir="${shared.dir}/licenses">
-                <include name="license.html"/>
+                <include name="LICENSE.txt"/>
             </fileset>
         </jar>
     </target>
@@ -404,7 +404,7 @@
             <fileset dir="${icu4j.regiondata.dir}/${src.dir}" includes="**/*.java"/>
             <fileset dir="${icu4j.translit.dir}/${src.dir}" includes="**/*.java"/>
             <fileset dir="${shared.dir}/licenses">
-                <include name="license.html"/>
+                <include name="LICENSE.txt"/>
             </fileset>
         </jar>
     </target>
diff --git a/icu4j/eclipse-build/build.xml b/icu4j/eclipse-build/build.xml
index 85d3378435c..46dee75fd63 100644
--- a/icu4j/eclipse-build/build.xml
+++ b/icu4j/eclipse-build/build.xml
@@ -1,7 +1,7 @@
 <!--
 /*
 *******************************************************************************
-* Copyright (C) 2010-2014, International Business Machines Corporation and    *
+* Copyright (C) 2010,2016, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
@@ -269,7 +269,7 @@
     </copy>
 
     <!-- license -->
-    <copy file="${shared.dir}/licenses/license.html"
+    <copy file="${shared.dir}/licenses/LICENSE.txt"
           todir="${eclipse.projects.dir}/plugins/com.ibm.icu/about_files" />
 
     <!-- about -->
@@ -327,7 +327,7 @@
     </copy>
 
     <!-- license -->
-    <copy file="${shared.dir}/licenses/license.html"
+    <copy file="${shared.dir}/licenses/LICENSE.txt"
           todir="${eclipse.projects.dir}/plugins/com.ibm.icu.tests/about_files" />
 
     <!-- about -->
@@ -357,7 +357,7 @@
     </copy>
 
     <!-- license -->
-    <copy file="${shared.dir}/licenses/license.html"
+    <copy file="${shared.dir}/licenses/LICENSE.txt"
           todir="${eclipse.projects.dir}/plugins/com.ibm.icu.base/about_files" />
 
     <!-- about -->
@@ -396,7 +396,7 @@
     </copy>
 
     <!-- license -->
-    <copy file="${shared.dir}/licenses/license.html"
+    <copy file="${shared.dir}/licenses/LICENSE.txt"
           todir="${eclipse.projects.dir}/plugins/com.ibm.icu.base.tests/about_files" />
 
     <!-- about -->
@@ -405,4 +405,4 @@
 
   </target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/icu4j/eclipse-build/features.template/com.ibm.icu.base/build.properties b/icu4j/eclipse-build/features.template/com.ibm.icu.base/build.properties
index cafcaa26704..bce562e8815 100644
--- a/icu4j/eclipse-build/features.template/com.ibm.icu.base/build.properties
+++ b/icu4j/eclipse-build/features.template/com.ibm.icu.base/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2011 IBM Corporation and others.
+# Copyright (c) 2011,2016 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -13,7 +13,7 @@ epl-v10.html,\
 eclipse_update_120.jpg,\
 feature.xml,\
 feature.properties,\
-license.html
+LICENSE.txt
 outputUpdateJars = true
 
 generate.plugin@com.ibm.icu.base.source=com.ibm.icu.base
diff --git a/icu4j/eclipse-build/features.template/com.ibm.icu/build.properties b/icu4j/eclipse-build/features.template/com.ibm.icu/build.properties
index e9000a47e50..8737f751b65 100644
--- a/icu4j/eclipse-build/features.template/com.ibm.icu/build.properties
+++ b/icu4j/eclipse-build/features.template/com.ibm.icu/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000,2016 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -13,7 +13,7 @@ epl-v10.html,\
 eclipse_update_120.jpg,\
 feature.xml,\
 feature.properties,\
-license.html
+LICENSE.txt
 outputUpdateJars = true
 
 generate.plugin@com.ibm.icu.source=com.ibm.icu
diff --git a/icu4j/eclipse-build/misc/about_icu.html b/icu4j/eclipse-build/misc/about_icu.html
index ae12b7f245a..075e33fc6ac 100644
--- a/icu4j/eclipse-build/misc/about_icu.html
+++ b/icu4j/eclipse-build/misc/about_icu.html
@@ -37,12 +37,12 @@ and such source code may be obtained at <a href="http://www.eclipse.org/">http:/
 		<br/><br/>
 		ICU4J is:
 		<blockquote>
-		Copyright (c) 1995-2015 International Business Machines Corporation and others<br/>
+		Copyright (c) 1995,2016 International Business Machines Corporation and others<br/>
 		All rights reserved. 
 		</blockquote>
 		<p>
 		Your use of ICU4J is subject to the terms and conditions of the ICU4J license.  A copy of the
-		license is contained in the file <a href="about_files/license.html" target="_blank">about_files/license.html</a>.</p>
+		license is contained in the file <a href="about_files/LICENSE.txt" target="_blank">about_files/LICENSE.txt</a>.</p>
 		<p>
 		The project information including source code, documentations and demo programs are available on
 		the <a href="http://www.icu-project.org">ICU public web site</a>.</p>
diff --git a/icu4j/eclipse-build/misc/about_icu_base.html b/icu4j/eclipse-build/misc/about_icu_base.html
index 4c9ab999773..19781952462 100644
--- a/icu4j/eclipse-build/misc/about_icu_base.html
+++ b/icu4j/eclipse-build/misc/about_icu_base.html
@@ -37,12 +37,12 @@ and such source code may be obtained at <a href="http://www.eclipse.org/">http:/
 		<br/><br/>
 		ICU4J is:
 		<blockquote>
-		Copyright (c) 1995-2015 International Business Machines Corporation and others<br/>
+		Copyright (c) 1995,2016 International Business Machines Corporation and others<br/>
 		All rights reserved. 
 		</blockquote>
 		<p>
 		Your use of ICU4J is subject to the terms and conditions of the ICU4J license.  A copy of the
-		license is contained in the file <a href="about_files/license.html" target="_blank">about_files/license.html</a>.</p>
+		license is contained in the file <a href="about_files/LICENSE.txt" target="_blank">about_files/LICENSE.txt</a>.</p>
 		<p>
 		The project information including source code, documentations and demo programs are available on
 		the <a href="http://www.icu-project.org">ICU public web site</a>.</p>
diff --git a/icu4j/main/shared/build/common-targets.xml b/icu4j/main/shared/build/common-targets.xml
index f9a0999ff9f..834ce3bc5ba 100644
--- a/icu4j/main/shared/build/common-targets.xml
+++ b/icu4j/main/shared/build/common-targets.xml
@@ -81,7 +81,7 @@
         <jar jarfile="${jar.dir}/${jar.name}" manifest="${out.dir}/manifest.stub" compress="true">
             <fileset dir="${bin.dir}" includes="**/*"/>
             <fileset dir="${shared.dir}/licenses">
-                <include name="license.html"/>
+                <include name="LICENSE.txt"/>
             </fileset>
         </jar>
     </target>
@@ -91,7 +91,7 @@
         <jar jarfile="${jar.dir}/${src.jar.name}" compress="true">
             <fileset dir="${src.dir}" includes="**/*.java"/>
             <fileset dir="${shared.dir}/licenses">
-                <include name="license.html"/>
+                <include name="LICENSE.txt"/>
             </fileset>
         </jar>
     </target>
diff --git a/icu4j/pom.xml b/icu4j/pom.xml
index c64b58f1843..c61b1f25218 100644
--- a/icu4j/pom.xml
+++ b/icu4j/pom.xml
@@ -23,7 +23,7 @@
   <licenses>
     <license>
       <name>ICU License</name>
-      <url>http://source.icu-project.org/repos/icu/icu/trunk/license.html</url>
+      <url>http://source.icu-project.org/repos/icu/icu/trunk/LICENSE.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
diff --git a/icu4j/readme.html b/icu4j/readme.html
index c03784c3e20..8d3859791e2 100644
--- a/icu4j/readme.html
+++ b/icu4j/readme.html
@@ -5,7 +5,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Style-Type" content="text/css2">
   <title>ReadMe for ICU4J</title>
-  <meta name="COPYRIGHT" content="Copyright 2000-2015, International Business Machines Corporation and others. All Rights Reserved.">
+  <meta name="COPYRIGHT" content="Copyright 2000-2016, International Business Machines Corporation and others. All Rights Reserved.">
   <style type="text/css">
 h3.doc { background: #CCCCFF }
 h4.doc { text-decoration: underline }
@@ -173,7 +173,7 @@ mean that projects using ICU become subject to GPL.
 <p>
  The IBM version contains the essential text of the license, omitting the
 X-specific trademarks and copyright notices. The full copy of <a
- href="http://source.icu-project.org/repos/icu/icu4j/tags/release-56-rc/main/shared/licenses/license.html">ICU's license</a> is included in the download
+ href="./main/shared/licenses/LICENSE.txt">ICU's license</a> is included in the download
 package.
 </p>
 <h2 class="doc"><a name="PlatformDependencies"></a>Platform Dependencies</h2>
-- 
2.40.0