Author: edwardyoon
Date: Tue Apr 24 06:58:11 2012
New Revision: 1329568
URL: http://svn.apache.org/viewvc?rev=1329568&view=rev
Log:
Minor mods/fixes and refactoring
Modified:
incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJob.java
incubator/hama/trunk/dist/pom.xml
incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJob.java
incubator/hama/trunk/src/assemble/src.xml
Modified:
incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJob.java
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJob.java?rev=1329568&r1=1329567&r2=1329568&view=diff
==============================================================================
--- incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJob.java
(original)
+++ incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJob.java Tue
Apr 24 06:58:11 2012
@@ -392,15 +392,11 @@ public class BSPJob extends BSPJobContex
conf);
}
- public void setMaxIteration(int maxIteration) {
- conf.setInt("hama.graph.max.iteration", maxIteration);
- }
-
- public void setCheckPointInterval(int checkPointInterval) {
+ protected void setCheckPointInterval(int checkPointInterval) {
conf.setInt(Constants.CHECKPOINT_INTERVAL, checkPointInterval);
}
- public void setCheckPointFlag(boolean enableCheckPoint) {
+ protected void setCheckPointFlag(boolean enableCheckPoint) {
conf.setBoolean(Constants.CHECKPOINT_ENABLED, enableCheckPoint);
}
}
Modified: incubator/hama/trunk/dist/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/dist/pom.xml?rev=1329568&r1=1329567&r2=1329568&view=diff
==============================================================================
--- incubator/hama/trunk/dist/pom.xml (original)
+++ incubator/hama/trunk/dist/pom.xml Tue Apr 24 06:58:11 2012
@@ -26,15 +26,8 @@
</parent>
<artifactId>hama-dist</artifactId>
-
<packaging>pom</packaging>
- <!-- NOTE: These dependency declarations are only required to sort this
project to the
- end of the line in the multimodule build.
-
- Since we only include the child1 module in our assembly, we only need
to ensure this
- distribution project builds AFTER that one...
- -->
<build>
<plugins>
@@ -53,6 +46,7 @@
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
+ <finalName>hama-${project.version}</finalName>
</configuration>
</execution>
<execution>
@@ -67,6 +61,7 @@
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>true</appendAssemblyId>
+ <finalName>hama-${project.version}</finalName>
</configuration>
</execution>
Modified:
incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJob.java
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJob.java?rev=1329568&r1=1329567&r2=1329568&view=diff
==============================================================================
---
incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJob.java
(original)
+++
incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJob.java
Tue Apr 24 06:58:11 2012
@@ -58,4 +58,7 @@ public class GraphJob extends BSPJob {
conf.setClass(VERTEX_MESSAGE_COMBINER_CLASS_ATTR, cls, Combiner.class);
}
+ public void setMaxIteration(int maxIteration) {
+ conf.setInt("hama.graph.max.iteration", maxIteration);
+ }
}
Modified: incubator/hama/trunk/src/assemble/src.xml
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/src/assemble/src.xml?rev=1329568&r1=1329567&r2=1329568&view=diff
==============================================================================
--- incubator/hama/trunk/src/assemble/src.xml (original)
+++ incubator/hama/trunk/src/assemble/src.xml Tue Apr 24 06:58:11 2012
@@ -17,7 +17,7 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
- <id>source</id>
+ <id>src</id>
<formats>
<format>dir</format>
<format>tar.gz</format>
