You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by st...@apache.org on 2016/09/27 09:28:15 UTC

[lang] Ensure UTF-8 file encoding

Repository: commons-lang
Updated Branches:
  refs/heads/master a04151819 -> 86a59601b


Ensure UTF-8 file encoding


Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/86a59601
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/86a59601
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/86a59601

Branch: refs/heads/master
Commit: 86a59601b570585dcb7a1ce3d1ccc8e16008f53a
Parents: a041518
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Sep 27 10:15:46 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Sep 27 10:19:32 2016 +0100

----------------------------------------------------------------------
 RELEASE-NOTES.txt                               |  12 +-
 pom.xml                                         |   1 +
 .../apache/commons/lang3/StringEscapeUtils.java |   2 +-
 .../lang3/text/translate/EntityArrays.java      | 128 +++++++++----------
 src/site/resources/.htaccess                    |   1 +
 .../release-notes/RELEASE-NOTES-3.3.2.txt       |   6 +-
 .../release-notes/RELEASE-NOTES-3.4.txt         |  12 +-
 7 files changed, 82 insertions(+), 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-lang/blob/86a59601/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index dc3f520..eb149d7 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -42,13 +42,13 @@ o LANG-1080: Add NoClassNameToStringStyle implementation of ToStringStyle.
              Thanks to Innokenty Shuvalov.
 o LANG-883:  Add StringUtils.containsAny(CharSequence, CharSequence...) method.
              Thanks to Daniel Stewart.
-o LANG-1052: Multiline recursive to string style. Thanks to Jan Mat\ufffdrne.
+o LANG-1052: Multiline recursive to string style. Thanks to Jan Mat�rne.
 o LANG-536:  Add isSorted() to ArrayUtils. Thanks to James Sawle.
 o LANG-1033: Add StringUtils.countMatches(CharSequence, char)
 o LANG-1021: Provide methods to retrieve all fields/methods annotated with a
-             specific type. Thanks to Alexander M\ufffdller.
+             specific type. Thanks to Alexander M�ller.
 o LANG-1016: NumberUtils#isParsable method(s). Thanks to
-             Juan Pablo Santos Rodr\ufffdguez.
+             Juan Pablo Santos Rodr�guez.
 o LANG-999:  Add fuzzy String matching logic to StringUtils. Thanks to
              Ben Ripkens.
 o LANG-994:  Add zero copy read method to StrBuilder. Thanks to
@@ -217,12 +217,12 @@ o LANG-943:  Test DurationFormatUtilsTest.testEdgeDuration fails in
 o LANG-613:  ConstructorUtils.getAccessibleConstructor() Does Not Check the
              Accessibility of Enclosing Classes
 o LANG-951:  Fragments are wrong by 1 day when using fragment YEAR or MONTH.
-             Thanks to Sebastian G\ufffdtz.
+             Thanks to Sebastian G�tz.
 o LANG-950:  FastDateParser does not handle two digit year parsing like
              SimpleDateFormat
 o LANG-949:  FastDateParserTest.testParses does not test FastDateParser
 o LANG-915:  Wrong locale handling in LocaleUtils.toLocale().
-             Thanks to Sergio Fern\ufffdndez.
+             Thanks to Sergio Fern�ndez.
 
 CHANGES
 =========
@@ -317,7 +317,7 @@ o LANG-462:  FastDateFormat supports parse methods.
 BUG FIXES
 ===========
 
-o LANG-932:  Spelling fixes. Thanks to Ville Skytt\ufffd.
+o LANG-932:  Spelling fixes. Thanks to Ville Skytt�.
 o LANG-929:  OctalUnescaper tried to parse all of \279.
 o LANG-928:  OctalUnescaper had bugs when parsing octals starting with a zero.
 o LANG-905:  EqualsBuilder returned true when comparing arrays, even when the

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/86a59601/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 88ad7f5..d6213ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -572,6 +572,7 @@
     <commons.site.path>lang</commons.site.path>
     <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-lang</commons.scmPubUrl>
     <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
+    <commons.encoding>utf-8</commons.encoding>
   </properties>
 
 

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/86a59601/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
index 28ee086..a244847 100644
--- a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
@@ -611,7 +611,7 @@ public class StringEscapeUtils {
      * escapes. Supports HTML 4.0 entities.</p>
      *
      * <p>For example, the string {@code "&lt;Fran&ccedil;ais&gt;"}
-     * will become {@code "<Fran\ufffdais>"}</p>
+     * will become {@code "<Fran�ais>"}</p>
      *
      * <p>If an entity is unrecognized, it is left alone, and inserted
      * verbatim into the result string. e.g. {@code "&gt;&zzzz;x"} will

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/86a59601/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java b/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java
index d8f754c..2c19402 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java
@@ -41,12 +41,12 @@ public class EntityArrays {
         {"\u00A6", "&brvbar;"}, // broken bar = broken vertical bar
         {"\u00A7", "&sect;"}, // section sign
         {"\u00A8", "&uml;"}, // diaeresis = spacing diaeresis
-        {"\u00A9", "&copy;"}, // \ufffd - copyright sign
+        {"\u00A9", "&copy;"}, // � - copyright sign
         {"\u00AA", "&ordf;"}, // feminine ordinal indicator
         {"\u00AB", "&laquo;"}, // left-pointing double angle quotation mark = left pointing guillemet
         {"\u00AC", "&not;"}, // not sign
         {"\u00AD", "&shy;"}, // soft hyphen = discretionary hyphen
-        {"\u00AE", "&reg;"}, // \ufffd - registered trademark sign
+        {"\u00AE", "&reg;"}, // � - registered trademark sign
         {"\u00AF", "&macr;"}, // macron = spacing macron = overline = APL overbar
         {"\u00B0", "&deg;"}, // degree sign
         {"\u00B1", "&plusmn;"}, // plus-minus sign = plus-or-minus sign
@@ -64,70 +64,70 @@ public class EntityArrays {
         {"\u00BD", "&frac12;"}, // vulgar fraction one half = fraction one half
         {"\u00BE", "&frac34;"}, // vulgar fraction three quarters = fraction three quarters
         {"\u00BF", "&iquest;"}, // inverted question mark = turned question mark
-        {"\u00C0", "&Agrave;"}, // \ufffd - uppercase A, grave accent
-        {"\u00C1", "&Aacute;"}, // \ufffd - uppercase A, acute accent
-        {"\u00C2", "&Acirc;"}, // \ufffd - uppercase A, circumflex accent
-        {"\u00C3", "&Atilde;"}, // \ufffd - uppercase A, tilde
-        {"\u00C4", "&Auml;"}, // \ufffd - uppercase A, umlaut
-        {"\u00C5", "&Aring;"}, // \ufffd - uppercase A, ring
-        {"\u00C6", "&AElig;"}, // \ufffd - uppercase AE
-        {"\u00C7", "&Ccedil;"}, // \ufffd - uppercase C, cedilla
-        {"\u00C8", "&Egrave;"}, // \ufffd - uppercase E, grave accent
-        {"\u00C9", "&Eacute;"}, // \ufffd - uppercase E, acute accent
-        {"\u00CA", "&Ecirc;"}, // \ufffd - uppercase E, circumflex accent
-        {"\u00CB", "&Euml;"}, // \ufffd - uppercase E, umlaut
-        {"\u00CC", "&Igrave;"}, // \ufffd - uppercase I, grave accent
-        {"\u00CD", "&Iacute;"}, // \ufffd - uppercase I, acute accent
-        {"\u00CE", "&Icirc;"}, // \ufffd - uppercase I, circumflex accent
-        {"\u00CF", "&Iuml;"}, // \ufffd - uppercase I, umlaut
-        {"\u00D0", "&ETH;"}, // \ufffd - uppercase Eth, Icelandic
-        {"\u00D1", "&Ntilde;"}, // \ufffd - uppercase N, tilde
-        {"\u00D2", "&Ograve;"}, // \ufffd - uppercase O, grave accent
-        {"\u00D3", "&Oacute;"}, // \ufffd - uppercase O, acute accent
-        {"\u00D4", "&Ocirc;"}, // \ufffd - uppercase O, circumflex accent
-        {"\u00D5", "&Otilde;"}, // \ufffd - uppercase O, tilde
-        {"\u00D6", "&Ouml;"}, // \ufffd - uppercase O, umlaut
+        {"\u00C0", "&Agrave;"}, // � - uppercase A, grave accent
+        {"\u00C1", "&Aacute;"}, // � - uppercase A, acute accent
+        {"\u00C2", "&Acirc;"}, // � - uppercase A, circumflex accent
+        {"\u00C3", "&Atilde;"}, // � - uppercase A, tilde
+        {"\u00C4", "&Auml;"}, // � - uppercase A, umlaut
+        {"\u00C5", "&Aring;"}, // � - uppercase A, ring
+        {"\u00C6", "&AElig;"}, // � - uppercase AE
+        {"\u00C7", "&Ccedil;"}, // � - uppercase C, cedilla
+        {"\u00C8", "&Egrave;"}, // � - uppercase E, grave accent
+        {"\u00C9", "&Eacute;"}, // � - uppercase E, acute accent
+        {"\u00CA", "&Ecirc;"}, // � - uppercase E, circumflex accent
+        {"\u00CB", "&Euml;"}, // � - uppercase E, umlaut
+        {"\u00CC", "&Igrave;"}, // � - uppercase I, grave accent
+        {"\u00CD", "&Iacute;"}, // � - uppercase I, acute accent
+        {"\u00CE", "&Icirc;"}, // � - uppercase I, circumflex accent
+        {"\u00CF", "&Iuml;"}, // � - uppercase I, umlaut
+        {"\u00D0", "&ETH;"}, // � - uppercase Eth, Icelandic
+        {"\u00D1", "&Ntilde;"}, // � - uppercase N, tilde
+        {"\u00D2", "&Ograve;"}, // � - uppercase O, grave accent
+        {"\u00D3", "&Oacute;"}, // � - uppercase O, acute accent
+        {"\u00D4", "&Ocirc;"}, // � - uppercase O, circumflex accent
+        {"\u00D5", "&Otilde;"}, // � - uppercase O, tilde
+        {"\u00D6", "&Ouml;"}, // � - uppercase O, umlaut
         {"\u00D7", "&times;"}, // multiplication sign
-        {"\u00D8", "&Oslash;"}, // \ufffd - uppercase O, slash
-        {"\u00D9", "&Ugrave;"}, // \ufffd - uppercase U, grave accent
-        {"\u00DA", "&Uacute;"}, // \ufffd - uppercase U, acute accent
-        {"\u00DB", "&Ucirc;"}, // \ufffd - uppercase U, circumflex accent
-        {"\u00DC", "&Uuml;"}, // \ufffd - uppercase U, umlaut
-        {"\u00DD", "&Yacute;"}, // \ufffd - uppercase Y, acute accent
-        {"\u00DE", "&THORN;"}, // \ufffd - uppercase THORN, Icelandic
-        {"\u00DF", "&szlig;"}, // \ufffd - lowercase sharps, German
-        {"\u00E0", "&agrave;"}, // \ufffd - lowercase a, grave accent
-        {"\u00E1", "&aacute;"}, // \ufffd - lowercase a, acute accent
-        {"\u00E2", "&acirc;"}, // \ufffd - lowercase a, circumflex accent
-        {"\u00E3", "&atilde;"}, // \ufffd - lowercase a, tilde
-        {"\u00E4", "&auml;"}, // \ufffd - lowercase a, umlaut
-        {"\u00E5", "&aring;"}, // \ufffd - lowercase a, ring
-        {"\u00E6", "&aelig;"}, // \ufffd - lowercase ae
-        {"\u00E7", "&ccedil;"}, // \ufffd - lowercase c, cedilla
-        {"\u00E8", "&egrave;"}, // \ufffd - lowercase e, grave accent
-        {"\u00E9", "&eacute;"}, // \ufffd - lowercase e, acute accent
-        {"\u00EA", "&ecirc;"}, // \ufffd - lowercase e, circumflex accent
-        {"\u00EB", "&euml;"}, // \ufffd - lowercase e, umlaut
-        {"\u00EC", "&igrave;"}, // \ufffd - lowercase i, grave accent
-        {"\u00ED", "&iacute;"}, // \ufffd - lowercase i, acute accent
-        {"\u00EE", "&icirc;"}, // \ufffd - lowercase i, circumflex accent
-        {"\u00EF", "&iuml;"}, // \ufffd - lowercase i, umlaut
-        {"\u00F0", "&eth;"}, // \ufffd - lowercase eth, Icelandic
-        {"\u00F1", "&ntilde;"}, // \ufffd - lowercase n, tilde
-        {"\u00F2", "&ograve;"}, // \ufffd - lowercase o, grave accent
-        {"\u00F3", "&oacute;"}, // \ufffd - lowercase o, acute accent
-        {"\u00F4", "&ocirc;"}, // \ufffd - lowercase o, circumflex accent
-        {"\u00F5", "&otilde;"}, // \ufffd - lowercase o, tilde
-        {"\u00F6", "&ouml;"}, // \ufffd - lowercase o, umlaut
+        {"\u00D8", "&Oslash;"}, // � - uppercase O, slash
+        {"\u00D9", "&Ugrave;"}, // � - uppercase U, grave accent
+        {"\u00DA", "&Uacute;"}, // � - uppercase U, acute accent
+        {"\u00DB", "&Ucirc;"}, // � - uppercase U, circumflex accent
+        {"\u00DC", "&Uuml;"}, // � - uppercase U, umlaut
+        {"\u00DD", "&Yacute;"}, // � - uppercase Y, acute accent
+        {"\u00DE", "&THORN;"}, // � - uppercase THORN, Icelandic
+        {"\u00DF", "&szlig;"}, // � - lowercase sharps, German
+        {"\u00E0", "&agrave;"}, // � - lowercase a, grave accent
+        {"\u00E1", "&aacute;"}, // � - lowercase a, acute accent
+        {"\u00E2", "&acirc;"}, // � - lowercase a, circumflex accent
+        {"\u00E3", "&atilde;"}, // � - lowercase a, tilde
+        {"\u00E4", "&auml;"}, // � - lowercase a, umlaut
+        {"\u00E5", "&aring;"}, // � - lowercase a, ring
+        {"\u00E6", "&aelig;"}, // � - lowercase ae
+        {"\u00E7", "&ccedil;"}, // � - lowercase c, cedilla
+        {"\u00E8", "&egrave;"}, // � - lowercase e, grave accent
+        {"\u00E9", "&eacute;"}, // � - lowercase e, acute accent
+        {"\u00EA", "&ecirc;"}, // � - lowercase e, circumflex accent
+        {"\u00EB", "&euml;"}, // � - lowercase e, umlaut
+        {"\u00EC", "&igrave;"}, // � - lowercase i, grave accent
+        {"\u00ED", "&iacute;"}, // � - lowercase i, acute accent
+        {"\u00EE", "&icirc;"}, // � - lowercase i, circumflex accent
+        {"\u00EF", "&iuml;"}, // � - lowercase i, umlaut
+        {"\u00F0", "&eth;"}, // � - lowercase eth, Icelandic
+        {"\u00F1", "&ntilde;"}, // � - lowercase n, tilde
+        {"\u00F2", "&ograve;"}, // � - lowercase o, grave accent
+        {"\u00F3", "&oacute;"}, // � - lowercase o, acute accent
+        {"\u00F4", "&ocirc;"}, // � - lowercase o, circumflex accent
+        {"\u00F5", "&otilde;"}, // � - lowercase o, tilde
+        {"\u00F6", "&ouml;"}, // � - lowercase o, umlaut
         {"\u00F7", "&divide;"}, // division sign
-        {"\u00F8", "&oslash;"}, // \ufffd - lowercase o, slash
-        {"\u00F9", "&ugrave;"}, // \ufffd - lowercase u, grave accent
-        {"\u00FA", "&uacute;"}, // \ufffd - lowercase u, acute accent
-        {"\u00FB", "&ucirc;"}, // \ufffd - lowercase u, circumflex accent
-        {"\u00FC", "&uuml;"}, // \ufffd - lowercase u, umlaut
-        {"\u00FD", "&yacute;"}, // \ufffd - lowercase y, acute accent
-        {"\u00FE", "&thorn;"}, // \ufffd - lowercase thorn, Icelandic
-        {"\u00FF", "&yuml;"}, // \ufffd - lowercase y, umlaut
+        {"\u00F8", "&oslash;"}, // � - lowercase o, slash
+        {"\u00F9", "&ugrave;"}, // � - lowercase u, grave accent
+        {"\u00FA", "&uacute;"}, // � - lowercase u, acute accent
+        {"\u00FB", "&ucirc;"}, // � - lowercase u, circumflex accent
+        {"\u00FC", "&uuml;"}, // � - lowercase u, umlaut
+        {"\u00FD", "&yacute;"}, // � - lowercase y, acute accent
+        {"\u00FE", "&thorn;"}, // � - lowercase thorn, Icelandic
+        {"\u00FF", "&yuml;"}, // � - lowercase y, umlaut
     };
 
     /**

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/86a59601/src/site/resources/.htaccess
----------------------------------------------------------------------
diff --git a/src/site/resources/.htaccess b/src/site/resources/.htaccess
new file mode 100644
index 0000000..069b878
--- /dev/null
+++ b/src/site/resources/.htaccess
@@ -0,0 +1 @@
+AddCharset utf-8 .txt .html

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/86a59601/src/site/resources/release-notes/RELEASE-NOTES-3.3.2.txt
----------------------------------------------------------------------
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.3.2.txt b/src/site/resources/release-notes/RELEASE-NOTES-3.3.2.txt
index a0923ed..1ad880a 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.3.2.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.3.2.txt
@@ -84,12 +84,12 @@ o LANG-943:  Test DurationFormatUtilsTest.testEdgeDuration fails in
 o LANG-613:  ConstructorUtils.getAccessibleConstructor() Does Not Check the
              Accessibility of Enclosing Classes
 o LANG-951:  Fragments are wrong by 1 day when using fragment YEAR or MONTH.
-             Thanks to Sebastian G\ufffdtz.
+             Thanks to Sebastian G�tz.
 o LANG-950:  FastDateParser does not handle two digit year parsing like
              SimpleDateFormat
 o LANG-949:  FastDateParserTest.testParses does not test FastDateParser
 o LANG-915:  Wrong locale handling in LocaleUtils.toLocale().
-             Thanks to Sergio Fern\ufffdndez.
+             Thanks to Sergio Fern�ndez.
 
 CHANGES
 =========
@@ -184,7 +184,7 @@ o LANG-462:  FastDateFormat supports parse methods.
 BUG FIXES
 ===========
 
-o LANG-932:  Spelling fixes. Thanks to Ville Skytt\ufffd.
+o LANG-932:  Spelling fixes. Thanks to Ville Skytt�.
 o LANG-929:  OctalUnescaper tried to parse all of \279.
 o LANG-928:  OctalUnescaper had bugs when parsing octals starting with a zero.
 o LANG-905:  EqualsBuilder returned true when comparing arrays, even when the

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/86a59601/src/site/resources/release-notes/RELEASE-NOTES-3.4.txt
----------------------------------------------------------------------
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.4.txt b/src/site/resources/release-notes/RELEASE-NOTES-3.4.txt
index dc3f520..eb149d7 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.4.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.4.txt
@@ -42,13 +42,13 @@ o LANG-1080: Add NoClassNameToStringStyle implementation of ToStringStyle.
              Thanks to Innokenty Shuvalov.
 o LANG-883:  Add StringUtils.containsAny(CharSequence, CharSequence...) method.
              Thanks to Daniel Stewart.
-o LANG-1052: Multiline recursive to string style. Thanks to Jan Mat\ufffdrne.
+o LANG-1052: Multiline recursive to string style. Thanks to Jan Mat�rne.
 o LANG-536:  Add isSorted() to ArrayUtils. Thanks to James Sawle.
 o LANG-1033: Add StringUtils.countMatches(CharSequence, char)
 o LANG-1021: Provide methods to retrieve all fields/methods annotated with a
-             specific type. Thanks to Alexander M\ufffdller.
+             specific type. Thanks to Alexander M�ller.
 o LANG-1016: NumberUtils#isParsable method(s). Thanks to
-             Juan Pablo Santos Rodr\ufffdguez.
+             Juan Pablo Santos Rodr�guez.
 o LANG-999:  Add fuzzy String matching logic to StringUtils. Thanks to
              Ben Ripkens.
 o LANG-994:  Add zero copy read method to StrBuilder. Thanks to
@@ -217,12 +217,12 @@ o LANG-943:  Test DurationFormatUtilsTest.testEdgeDuration fails in
 o LANG-613:  ConstructorUtils.getAccessibleConstructor() Does Not Check the
              Accessibility of Enclosing Classes
 o LANG-951:  Fragments are wrong by 1 day when using fragment YEAR or MONTH.
-             Thanks to Sebastian G\ufffdtz.
+             Thanks to Sebastian G�tz.
 o LANG-950:  FastDateParser does not handle two digit year parsing like
              SimpleDateFormat
 o LANG-949:  FastDateParserTest.testParses does not test FastDateParser
 o LANG-915:  Wrong locale handling in LocaleUtils.toLocale().
-             Thanks to Sergio Fern\ufffdndez.
+             Thanks to Sergio Fern�ndez.
 
 CHANGES
 =========
@@ -317,7 +317,7 @@ o LANG-462:  FastDateFormat supports parse methods.
 BUG FIXES
 ===========
 
-o LANG-932:  Spelling fixes. Thanks to Ville Skytt\ufffd.
+o LANG-932:  Spelling fixes. Thanks to Ville Skytt�.
 o LANG-929:  OctalUnescaper tried to parse all of \279.
 o LANG-928:  OctalUnescaper had bugs when parsing octals starting with a zero.
 o LANG-905:  EqualsBuilder returned true when comparing arrays, even when the