svn commit: r1204876 - in /incubator/hama/trunk: core/src/test/java/org/apache/hama/examples/ examples/src/main/java/org/apache/hama/examples/

[tommaso]

Author: tommaso
Date: Tue Nov 22 09:32:06 2011
New Revision: 1204876

URL: http://svn.apache.org/viewvc?rev=1204876&view=rev
Log:
[HAMA-477] - moved CombineExample and RandBench from core to examples and added 
to the ExampleDriver

Added:
    
incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/CombineExample.java
      - copied, changed from r1202912, 
incubator/hama/trunk/core/src/test/java/org/apache/hama/examples/CombineExample.java
    
incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/RandBench.java
      - copied, changed from r1202912, 
incubator/hama/trunk/core/src/test/java/org/apache/hama/examples/RandBench.java
Removed:
    
incubator/hama/trunk/core/src/test/java/org/apache/hama/examples/CombineExample.java
    
incubator/hama/trunk/core/src/test/java/org/apache/hama/examples/RandBench.java
Modified:
    
incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/ExampleDriver.java

Copied: 
incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/CombineExample.java
 (from r1202912, 
incubator/hama/trunk/core/src/test/java/org/apache/hama/examples/CombineExample.java)
URL: 
http://svn.apache.org/viewvc/incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/CombineExample.java?p2=incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/CombineExample.java&p1=incubator/hama/trunk/core/src/test/java/org/apache/hama/examples/CombineExample.java&r1=1202912&r2=1204876&rev=1204876&view=diff
==============================================================================
--- 
incubator/hama/trunk/core/src/test/java/org/apache/hama/examples/CombineExample.java
 (original)
+++ 
incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/CombineExample.java
 Tue Nov 22 09:32:06 2011
@@ -17,24 +17,16 @@
  */
 package org.apache.hama.examples;
 
-import java.io.IOException;
-import java.util.Iterator;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hama.HamaConfiguration;
-import org.apache.hama.bsp.BSP;
-import org.apache.hama.bsp.BSPJob;
-import org.apache.hama.bsp.BSPMessage;
-import org.apache.hama.bsp.BSPMessageBundle;
-import org.apache.hama.bsp.BSPPeer;
-import org.apache.hama.bsp.Combiner;
-import org.apache.hama.bsp.IntegerMessage;
-import org.apache.hama.bsp.NullInputFormat;
-import org.apache.hama.bsp.NullOutputFormat;
+import org.apache.hama.bsp.*;
 import org.apache.zookeeper.KeeperException;
 
+import java.io.IOException;
+import java.util.Iterator;
+
 public class CombineExample {
 
   public static class MyBSP extends

Modified: 
incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/ExampleDriver.java
URL: 
http://svn.apache.org/viewvc/incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/ExampleDriver.java?rev=1204876&r1=1204875&r2=1204876&view=diff
==============================================================================
--- 
incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/ExampleDriver.java
 (original)
+++ 
incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/ExampleDriver.java
 Tue Nov 22 09:32:06 2011
@@ -28,7 +28,8 @@ public class ExampleDriver {
     try {
       pgd.addClass("pi", PiEstimator.class, "Pi Estimator");
       pgd.addClass("sssp", ShortestPaths.class, "Single Shortest Path");
-
+      pgd.addClass("cmb", CombineExample.class, "Combine");
+      pgd.addClass("bench", RandBench.class, "Random Benchmark");
       pgd.driver(args);
     } catch (Throwable e) {
       e.printStackTrace();

Copied: 
incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/RandBench.java
 (from r1202912, 
incubator/hama/trunk/core/src/test/java/org/apache/hama/examples/RandBench.java)
URL: 
http://svn.apache.org/viewvc/incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/RandBench.java?p2=incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/RandBench.java&p1=incubator/hama/trunk/core/src/test/java/org/apache/hama/examples/RandBench.java&r1=1202912&r2=1204876&rev=1204876&view=diff
==============================================================================
--- 
incubator/hama/trunk/core/src/test/java/org/apache/hama/examples/RandBench.java 
(original)
+++ 
incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/RandBench.java
 Tue Nov 22 09:32:06 2011
@@ -17,25 +17,17 @@
  */
 package org.apache.hama.examples;
 
-import java.io.IOException;
-import java.util.Random;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hama.HamaConfiguration;
-import org.apache.hama.bsp.BSP;
-import org.apache.hama.bsp.BSPJob;
-import org.apache.hama.bsp.BSPJobClient;
-import org.apache.hama.bsp.BSPMessage;
-import org.apache.hama.bsp.BSPPeer;
-import org.apache.hama.bsp.ByteMessage;
-import org.apache.hama.bsp.ClusterStatus;
-import org.apache.hama.bsp.NullInputFormat;
-import org.apache.hama.bsp.NullOutputFormat;
+import org.apache.hama.bsp.*;
 import org.apache.hama.util.Bytes;
 import org.apache.zookeeper.KeeperException;
 
+import java.io.IOException;
+import java.util.Random;
+
 public class RandBench {
   private static final String SIZEOFMSG = "msg.size";
   private static final String N_COMMUNICATIONS = "communications.num";