svn commit: r1004973 - in /incubator/hama/trunk: bin/hama src/java/org/apache/hama/bsp/TaskScheduler.java

[ed...@apache.org]

Author: edwardyoon
Date: Wed Oct  6 10:32:29 2010
New Revision: 1004973

URL: http://svn.apache.org/viewvc?rev=1004973&view=rev
Log:
bin/hama missed in the HAMA-293 commit. and removed odd logs.

Modified:
    incubator/hama/trunk/bin/hama
    incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskScheduler.java

Modified: incubator/hama/trunk/bin/hama
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/bin/hama?rev=1004973&r1=1004972&r2=1004973&view=diff
==============================================================================
--- incubator/hama/trunk/bin/hama (original)
+++ incubator/hama/trunk/bin/hama Wed Oct  6 10:32:29 2010
@@ -155,13 +155,13 @@ unset IFS
 
 # figure out which class to run
 if [ "$COMMAND" = "bspmaster" ] ; then
-  CLASS='org.apache.hama.bsp.BSPMaster'
+  CLASS='org.apache.hama.BSPMasterRunner'
   BSP_OPTS="$BSP_OPTS $BSP_BSPMASTER_OPTS"
 elif [ "$COMMAND" = "groom" ] ; then
-  CLASS='org.apache.hama.bsp.GroomServer'
+  CLASS='org.apache.hama.GroomServerRunner'
   BSP_OPTS="$BSP_OPTS $BSP_GROOMSERVER_OPTS"
 elif [ "$COMMAND" = "zookeeper" ] ; then
-  CLASS='org.apache.hama.zookeeper.QuorumPeer'
+  CLASS='org.apache.hama.ZooKeeperRunner'
 elif [ "$COMMAND" = "jar" ] ; then
   CLASS=org.apache.hama.util.RunJar
   BSP_OPTS="$BSP_OPTS"

Modified: incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskScheduler.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskScheduler.java?rev=1004973&r1=1004972&r2=1004973&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskScheduler.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskScheduler.java Wed Oct  6 10:32:29 2010
@@ -23,7 +23,6 @@ import java.util.List;
 
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
-import org.mortbay.log.Log;
 
 /**
  * Used by a {@link BSPMaster} to schedule {@link Task}s on {@link GroomServer}
@@ -44,7 +43,6 @@ abstract class TaskScheduler implements 
 
   public synchronized void setGroomServerManager(
       GroomServerManager groomServerManager) {
-    Log.info("TaskScheduler.setGroomServermanager()");
     this.groomServerManager = groomServerManager;
   }