[tor-commits] [onionoo/master] Switch to Apache Commons Lang 3.

[karsten at torproject.org]

commit ec95efe6aa1e67b6d8b969edcd1e65ff6f3076d7
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Oct 29 11:54:49 2014 +0100

    Switch to Apache Commons Lang 3.
    
    Suggested by iwakeh to overcome memory problems with StringEscaleUtils in
    Apache Commons Lang 2.
---
 build.xml                                                      |    4 ++--
 src/main/java/org/torproject/onionoo/docs/DetailsDocument.java |    8 ++++----
 src/main/java/org/torproject/onionoo/docs/DetailsStatus.java   |    8 ++++----
 src/main/java/org/torproject/onionoo/docs/DocumentStore.java   |    2 +-
 vagrant/bootstrap.sh                                           |    2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index d6e1278..8f71f4d 100644
--- a/build.xml
+++ b/build.xml
@@ -18,7 +18,7 @@
     <fileset dir="/usr/share/java">
       <include name="commons-codec-1.6.jar"/>
       <include name="commons-compress-1.4.1.jar"/>
-      <include name="commons-lang-2.6.jar"/>
+      <include name="commons-lang3-3.1.jar"/>
       <include name="gson-2.1.jar"/>
       <include name="junit4-4.10.jar"/>
       <include name="servlet-api-3.0.jar"/>
@@ -101,7 +101,7 @@
         <include name="logback-core-1.0.4.jar"/>
         <include name="commons-codec-1.6.jar"/>
         <include name="commons-compress-1.4.1.jar"/>
-        <include name="commons-lang-2.6.jar"/>
+        <include name="commons-lang3-3.1.jar"/>
         <include name="gson-2.1.jar"/>
       </lib>
       <classes dir="${classes}"/>
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
index 7d351ee..620e908 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
@@ -5,8 +5,8 @@ package org.torproject.onionoo.docs;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class DetailsDocument extends Document {
 
@@ -19,11 +19,11 @@ public class DetailsDocument extends Document {
    * we'll have to do is to change back the '\\' that Gson writes for the
    * '\'. */
   private static String escapeJSON(String s) {
-    return StringUtils.replaceEach(StringEscapeUtils.escapeJavaScript(s),
+    return StringUtils.replaceEach(StringEscapeUtils.escapeEcmaScript(s),
         new String[] { "\\\\'" }, new String[] { "'" });
   }
   private static String unescapeJSON(String s) {
-    return StringEscapeUtils.unescapeJavaScript(StringUtils.replaceEach(s,
+    return StringEscapeUtils.unescapeEcmaScript(StringUtils.replaceEach(s,
         new String[] { "'" }, new String[] { "\\'" }));
   }
 
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
index 6d987df..42c835f 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
@@ -5,8 +5,8 @@ package org.torproject.onionoo.docs;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class DetailsStatus extends Document {
 
@@ -19,11 +19,11 @@ public class DetailsStatus extends Document {
    * we'll have to do is to change back the '\\' that Gson writes for the
    * '\'. */
   private static String escapeJSON(String s) {
-    return StringUtils.replaceEach(StringEscapeUtils.escapeJavaScript(s),
+    return StringUtils.replaceEach(StringEscapeUtils.escapeEcmaScript(s),
         new String[] { "\\\\'" }, new String[] { "'" });
   }
   private static String unescapeJSON(String s) {
-    return StringEscapeUtils.unescapeJavaScript(StringUtils.replaceEach(s,
+    return StringEscapeUtils.unescapeEcmaScript(StringUtils.replaceEach(s,
         new String[] { "'" }, new String[] { "\\'" }));
   }
 
diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
index 9a808ac..393904b 100644
--- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
+++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
@@ -21,7 +21,7 @@ import java.util.Stack;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.torproject.onionoo.util.FormattingUtils;
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index 280f08b..08d0ac5 100644
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -12,7 +12,7 @@ apt-get purge -y openjdk-6-jdk default-jre
 echo "Installing required packages."
 apt-get install -y openjdk-7-jdk
 apt-get install -y libcommons-codec-java libcommons-compress-java \
-libcommons-lang-java libgoogle-gson-java junit4 libservlet3.0-java \
+libcommons-lang3-java libgoogle-gson-java junit4 libservlet3.0-java \
 ant tomcat6 libslf4j-java liblogback-java unzip
 
 echo "Setting up paths and creating symbolic links."