Author: smarthi
Date: Sun Apr 7 17:00:23 2013
New Revision: 1465425
URL: http://svn.apache.org/r1465425
Log:
Mahout-1187: Update Commons Lang to Commons Lang3
Modified:
mahout/trunk/core/pom.xml
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/RegressionResultAnalyzer.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ResultAnalyzer.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/DataConverter.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/Dataset.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/node/CategoricalNode.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/split/OptIgSplit.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth2/FPGrowthIds.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth2/FPGrowthObj.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtDenseOutJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/BtJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/YtYJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/QRLastStep.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommenderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/MockRecommender.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/builder/DecisionTreeBuilderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/builder/DefaultTreeBuilderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/Utils.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/cooccurrence/RowSimilarityJobTest.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToRecMapper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/benchmark/VectorBenchmarks.java
mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorMapper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaMapper.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java
mahout/trunk/pom.xml
Modified: mahout/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/pom.xml?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
--- mahout/trunk/core/pom.xml (original)
+++ mahout/trunk/core/pom.xml Sun Apr 7 17:00:23 2013
@@ -153,8 +153,8 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
Sun Apr 7 17:00:23 2013
@@ -21,7 +21,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.mahout.math.DenseMatrix;
import org.apache.mahout.math.Matrix;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/RegressionResultAnalyzer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/RegressionResultAnalyzer.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/RegressionResultAnalyzer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/RegressionResultAnalyzer.java
Sun Apr 7 17:00:23 2013
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Locale;
import com.google.common.collect.Lists;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
/**
* ResultAnalyzer captures the classification statistics and displays in a
tabular manner
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ResultAnalyzer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ResultAnalyzer.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ResultAnalyzer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ResultAnalyzer.java
Sun Apr 7 17:00:23 2013
@@ -21,7 +21,7 @@ import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.Collection;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.mahout.math.stats.OnlineSummarizer;
/**
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/DataConverter.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/DataConverter.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/DataConverter.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/DataConverter.java
Sun Apr 7 17:00:23 2013
@@ -18,7 +18,7 @@
package org.apache.mahout.classifier.df.data;
import com.google.common.base.Preconditions;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.mahout.math.DenseVector;
import java.util.regex.Pattern;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/Dataset.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/Dataset.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/Dataset.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/Dataset.java
Sun Apr 7 17:00:23 2013
@@ -19,7 +19,7 @@ package org.apache.mahout.classifier.df.
import com.google.common.base.Preconditions;
import com.google.common.io.Closeables;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/node/CategoricalNode.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/node/CategoricalNode.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/node/CategoricalNode.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/node/CategoricalNode.java
Sun Apr 7 17:00:23 2013
@@ -17,7 +17,7 @@
package org.apache.mahout.classifier.df.node;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.mahout.classifier.df.DFUtils;
import org.apache.mahout.classifier.df.data.Instance;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/split/OptIgSplit.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/split/OptIgSplit.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/split/OptIgSplit.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/split/OptIgSplit.java
Sun Apr 7 17:00:23 2013
@@ -17,7 +17,7 @@
package org.apache.mahout.classifier.df.split;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.mahout.classifier.df.data.Data;
import org.apache.mahout.classifier.df.data.DataUtils;
import org.apache.mahout.classifier.df.data.Dataset;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java
Sun Apr 7 17:00:23 2013
@@ -22,7 +22,7 @@ import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.mahout.classifier.df.data.Data;
import org.apache.mahout.classifier.df.data.Dataset;
import org.apache.mahout.classifier.df.data.Instance;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/ParallelFPGrowthReducer.java
Sun Apr 7 17:00:23 2013
@@ -25,7 +25,7 @@ import java.util.Map.Entry;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import org.apache.commons.lang.mutable.MutableLong;
+import org.apache.commons.lang3.mutable.MutableLong;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.Reducer;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/TransactionTree.java
Sun Apr 7 17:00:23 2013
@@ -28,7 +28,7 @@ import org.apache.mahout.math.list.IntAr
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.mutable.MutableLong;
+import org.apache.commons.lang3.mutable.MutableLong;
import org.apache.hadoop.io.VIntWritable;
import org.apache.hadoop.io.VLongWritable;
import org.apache.hadoop.io.Writable;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FPGrowth.java
Sun Apr 7 17:00:23 2013
@@ -29,7 +29,7 @@ import java.util.Map.Entry;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.apache.commons.lang.mutable.MutableLong;
+import org.apache.commons.lang3.mutable.MutableLong;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Writable;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth2/FPGrowthIds.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth2/FPGrowthIds.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth2/FPGrowthIds.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth2/FPGrowthIds.java
Sun Apr 7 17:00:23 2013
@@ -26,7 +26,7 @@ import java.util.Set;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.mutable.MutableLong;
+import org.apache.commons.lang3.mutable.MutableLong;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.mahout.common.Pair;
import org.apache.mahout.fpm.pfpgrowth.convertors.StatusUpdater;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth2/FPGrowthObj.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth2/FPGrowthObj.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth2/FPGrowthObj.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth2/FPGrowthObj.java
Sun Apr 7 17:00:23 2013
@@ -29,7 +29,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.apache.commons.lang.mutable.MutableLong;
+import org.apache.commons.lang3.mutable.MutableLong;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Writable;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtDenseOutJob.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtDenseOutJob.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtDenseOutJob.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtDenseOutJob.java
Sun Apr 7 17:00:23 2013
@@ -27,7 +27,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.regex.Matcher;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.FileStatus;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtJob.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtJob.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtJob.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/ABtJob.java
Sun Apr 7 17:00:23 2013
@@ -27,7 +27,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.regex.Matcher;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.FileStatus;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/BtJob.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/BtJob.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/BtJob.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/BtJob.java
Sun Apr 7 17:00:23 2013
@@ -23,7 +23,7 @@ import java.util.ArrayDeque;
import java.util.Deque;
import java.util.Iterator;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.FileStatus;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/YtYJob.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/YtYJob.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/YtYJob.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/YtYJob.java
Sun Apr 7 17:00:23 2013
@@ -19,7 +19,7 @@ package org.apache.mahout.math.hadoop.st
import java.io.IOException;
import java.util.Iterator;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.IntWritable;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/QRLastStep.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/QRLastStep.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/QRLastStep.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/qr/QRLastStep.java
Sun Apr 7 17:00:23 2013
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
import org.apache.mahout.common.iterator.CopyConstructorIterator;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Vector;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
Sun Apr 7 17:00:23 2013
@@ -17,7 +17,7 @@
package org.apache.mahout.cf.taste.impl.model.file;
-import org.apache.commons.lang.mutable.MutableBoolean;
+import org.apache.commons.lang3.mutable.MutableBoolean;
import org.apache.mahout.cf.taste.common.TasteException;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
import org.apache.mahout.cf.taste.impl.common.LongPrimitiveIterator;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommenderTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommenderTest.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommenderTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/CachingRecommenderTest.java
Sun Apr 7 17:00:23 2013
@@ -17,7 +17,7 @@
package org.apache.mahout.cf.taste.impl.recommender;
-import org.apache.commons.lang.mutable.MutableInt;
+import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
import org.apache.mahout.cf.taste.recommender.IDRescorer;
import org.apache.mahout.cf.taste.recommender.Recommender;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/MockRecommender.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/MockRecommender.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/MockRecommender.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/MockRecommender.java
Sun Apr 7 17:00:23 2013
@@ -17,7 +17,7 @@
package org.apache.mahout.cf.taste.impl.recommender;
-import org.apache.commons.lang.mutable.MutableInt;
+import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.mahout.cf.taste.common.Refreshable;
import org.apache.mahout.cf.taste.impl.TasteTestCase;
import org.apache.mahout.cf.taste.model.DataModel;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/builder/DecisionTreeBuilderTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/builder/DecisionTreeBuilderTest.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/builder/DecisionTreeBuilderTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/builder/DecisionTreeBuilderTest.java
Sun Apr 7 17:00:23 2013
@@ -21,7 +21,7 @@ import java.lang.reflect.Method;
import java.util.Random;
import java.util.Arrays;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.junit.Test;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/builder/DefaultTreeBuilderTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/builder/DefaultTreeBuilderTest.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/builder/DefaultTreeBuilderTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/builder/DefaultTreeBuilderTest.java
Sun Apr 7 17:00:23 2013
@@ -20,7 +20,7 @@ package org.apache.mahout.classifier.df.
import java.util.Random;
import java.util.Arrays;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
import org.junit.Test;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/Utils.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/Utils.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/Utils.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/data/Utils.java
Sun Apr 7 17:00:23 2013
@@ -26,7 +26,7 @@ import java.util.Random;
import com.google.common.base.Charsets;
import com.google.common.io.Closeables;
import com.google.common.io.Files;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/classify/ClusterClassificationDriverTest.java
Sun Apr 7 17:00:23 2013
@@ -23,7 +23,7 @@ import java.util.Set;
import com.google.common.collect.Sets;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java
Sun Apr 7 17:00:23 2013
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/cooccurrence/RowSimilarityJobTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/cooccurrence/RowSimilarityJobTest.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/cooccurrence/RowSimilarityJobTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/similarity/cooccurrence/RowSimilarityJobTest.java
Sun Apr 7 17:00:23 2013
@@ -47,6 +47,7 @@ public class RowSimilarityJobTest extend
* 0.666, 1, 0
* 0, 0, 1
* </pre>
+ * @throws Exception
*/
@Test
public void toyIntegration() throws Exception {
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToRecMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToRecMapper.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToRecMapper.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToRecMapper.java
Sun Apr 7 17:00:23 2013
@@ -17,7 +17,7 @@
package org.apache.mahout.cf.taste.example.email;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/benchmark/VectorBenchmarks.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/benchmark/VectorBenchmarks.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/benchmark/VectorBenchmarks.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/benchmark/VectorBenchmarks.java
Sun Apr 7 17:00:23 2013
@@ -38,7 +38,7 @@ import org.apache.commons.cli2.builder.A
import org.apache.commons.cli2.builder.DefaultOptionBuilder;
import org.apache.commons.cli2.builder.GroupBuilder;
import org.apache.commons.cli2.commandline.Parser;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorMapper.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorMapper.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorMapper.java
Sun Apr 7 17:00:23 2013
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
import com.google.common.collect.Sets;
import com.google.common.io.Closeables;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.DefaultStringifier;
import org.apache.hadoop.io.LongWritable;
@@ -63,7 +63,7 @@ public class WikipediaDatasetCreatorMapp
@Override
protected void map(LongWritable key, Text value, Context context) throws
IOException, InterruptedException {
String document = value.toString();
- document = StringEscapeUtils.unescapeHtml(CLOSE_TEXT_TAG_PATTERN.matcher(
+ document = StringEscapeUtils.unescapeHtml4(CLOSE_TEXT_TAG_PATTERN.matcher(
OPEN_TEXT_TAG_PATTERN.matcher(document).replaceFirst("")).replaceAll(""));
String catMatch = findMatchingCategory(document);
if (!"Unknown".equals(catMatch)) {
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaMapper.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaMapper.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaMapper.java
Sun Apr 7 17:00:23 2013
@@ -24,7 +24,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.google.common.collect.Sets;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.DefaultStringifier;
import org.apache.hadoop.io.LongWritable;
@@ -82,7 +82,7 @@ public class WikipediaMapper extends Map
return;
}
}
- document = StringEscapeUtils.unescapeHtml(document);
+ document = StringEscapeUtils.unescapeHtml4(document);
context.write(new
Text(SPACE_NON_ALPHA_PATTERN.matcher(title).replaceAll("_")), new
Text(document));
}
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java
Sun Apr 7 17:00:23 2013
@@ -27,7 +27,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.mahout.clustering.classify.WeightedVectorWritable;
import org.apache.mahout.clustering.iterator.ClusterWritable;
import org.apache.mahout.common.Pair;
Modified: mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1465425&r1=1465424&r2=1465425&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Sun Apr 7 17:00:23 2013
@@ -373,9 +373,9 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
</dependency>
<dependency>
