Author: srowen
Date: Wed Jun 1 16:38:45 2011
New Revision: 1130215
URL: http://svn.apache.org/viewvc?rev=1130215&view=rev
Log:
MAHOUT-708 related, updated to minor 0.20.203.0 Hadoop release along with very
minor compile changes that are required
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java
mahout/trunk/core/src/test/java/org/apache/mahout/common/AbstractJobTest.java
mahout/trunk/pom.xml
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java?rev=1130215&r1=1130214&r2=1130215&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java
(original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java
Wed Jun 1 16:38:45 2011
@@ -240,7 +240,7 @@ public abstract class AbstractJob extend
*
*
*/
- public Map<String, String> parseArguments(String[] args) {
+ public Map<String, String> parseArguments(String[] args) throws IOException {
Option helpOpt = addOption(DefaultOptionCreator.helpOption());
addOption("tempDir", null, "Intermediate output directory", "temp");
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java?rev=1130215&r1=1130214&r2=1130215&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java
Wed Jun 1 16:38:45 2011
@@ -17,6 +17,7 @@
package org.apache.mahout.common;
+import java.io.IOException;
import java.io.PrintWriter;
import org.apache.commons.cli.Options;
@@ -43,7 +44,7 @@ public final class CommandLineUtil {
*
* @param group job-specific command-line options.
*/
- public static void printHelpWithGenericOptions(Group group) {
+ public static void printHelpWithGenericOptions(Group group) throws
IOException {
Options ops = new Options();
new GenericOptionsParser(new Configuration(), ops, new String[0]);
org.apache.commons.cli.HelpFormatter fmt = new
org.apache.commons.cli.HelpFormatter();
@@ -61,7 +62,7 @@ public final class CommandLineUtil {
pw.flush();
}
- public static void printHelpWithGenericOptions(Group group, OptionException
oe) {
+ public static void printHelpWithGenericOptions(Group group, OptionException
oe) throws IOException {
Options ops = new Options();
new GenericOptionsParser(new Configuration(), ops, new String[0]);
org.apache.commons.cli.HelpFormatter fmt = new
org.apache.commons.cli.HelpFormatter();
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java?rev=1130215&r1=1130214&r2=1130215&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/decomposer/EigenVerificationJob.java
Wed Jun 1 16:38:45 2011
@@ -163,7 +163,7 @@ public class EigenVerificationJob extend
return 0;
}
- private Map<String, String> handleArgs(String[] args) {
+ private Map<String, String> handleArgs(String[] args) throws IOException {
addOutputOption();
addOption("eigenInput",
"ei",
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/common/AbstractJobTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/common/AbstractJobTest.java?rev=1130215&r1=1130214&r2=1130215&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/common/AbstractJobTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/common/AbstractJobTest.java
Wed Jun 1 16:38:45 2011
@@ -19,6 +19,7 @@
package org.apache.mahout.common;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -42,7 +43,7 @@ public final class AbstractJobTest exten
public AbstractJob getJob() {
return new AbstractJob() {
@Override
- public int run(String[] args) {
+ public int run(String[] args) throws IOException {
addFlag("testFlag", "t", "a simple test flag");
Map<String,String> argMap = parseArguments(args);
@@ -73,14 +74,14 @@ public final class AbstractJobTest exten
public AbstractJob getJob() {
return new AbstractJob() {
@Override
- public int run(String[] args) {
+ public int run(String[] args) throws IOException {
this.addOption(DefaultOptionCreator.overwriteOption().create());
this.addOption("option", "o", "option");
this.addOption("required", "r", "required", true /* required */);
this.addOption("notRequired", "nr", "not required", false /* not
required */);
this.addOption("hasDefault", "hd", "option w/ default",
"defaultValue");
-
-
+
+
Map<String,String> argMap = parseArguments(args);
if (argMap == null) {
return -1;
@@ -158,7 +159,7 @@ public final class AbstractJobTest exten
public AbstractJob getJob() {
return new AbstractJob() {
@Override
- public int run(String[] args) {
+ public int run(String[] args) throws IOException {
addInputOption();
addOutputOption();
Modified: mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1130215&r1=1130214&r2=1130215&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Wed Jun 1 16:38:45 2011
@@ -197,7 +197,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>0.20.2</version>
+ <version>0.20.203.0</version>
<exclusions>
<exclusion>
<groupId>net.sf.kosmosfs</groupId>
@@ -553,7 +553,7 @@
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.1</version>
<configuration>
- <skipTests>${skipTests}</skipTests>
+ <skipTests>${skipTests}</skipTests>
<appendedResourcesDirectory>./src/main/appended-resources</appendedResourcesDirectory>
<resourceBundles>
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
@@ -610,7 +610,7 @@
<profile>
<id>fastinstall</id>
<properties>
- <skipTests>true</skipTests>
+ <skipTests>true</skipTests>
<pmd.skip>true</pmd.skip>
<checkstyle.skip>true</checkstyle.skip>
</properties>
@@ -833,11 +833,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>2.4</version>
- <configuration>
+ <configuration>
<onlyCurrentVersion>true</onlyCurrentVersion>
<columnNames>Type,Key,Summary,Status,Resolution,Assignee</columnNames>
<sortColumnNames>Type,Key</sortColumnNames>
- </configuration>
+ </configuration>
<reportSets>
<reportSet>
<reports>
