incubator-hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r1029533 - in /incubator/hama/trunk: CHANGES.txt lib/jruby-complete-1.2.0.jar lib/jruby-complete-LICENSE.txt src/java/org/apache/hama/util/ClusterUtil.java src/test/org/apache/hama/bsp/TestClusterStatus.java
Date Mon, 01 Nov 2010 03:03:32 GMT
Author: edwardyoon
Date: Mon Nov  1 03:03:31 2010
New Revision: 1029533

URL: http://svn.apache.org/viewvc?rev=1029533&view=rev
Log:
Removing javadoc warnings and useless libraries.

Removed:
    incubator/hama/trunk/lib/jruby-complete-1.2.0.jar
    incubator/hama/trunk/lib/jruby-complete-LICENSE.txt
Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/src/java/org/apache/hama/util/ClusterUtil.java
    incubator/hama/trunk/src/test/org/apache/hama/bsp/TestClusterStatus.java

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1029533&r1=1029532&r2=1029533&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Mon Nov  1 03:03:31 2010
@@ -175,6 +175,7 @@ Trunk (unreleased changes)
 
   BUG FIXES
   
+    HAMA-324: Removing javadoc warnings and useless libraries (edwardyoon)
     HAMA-322: Make sure failed assertions on test threads are reported
                (Filipe Manana via edwardyoon)  
     HAMA-316: Renaming and Refactoring methods in BSPPeerInterface (Filipe Manana)

Modified: incubator/hama/trunk/src/java/org/apache/hama/util/ClusterUtil.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/util/ClusterUtil.java?rev=1029533&r1=1029532&r2=1029533&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/util/ClusterUtil.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/util/ClusterUtil.java Mon Nov  1 03:03:31
2010
@@ -20,14 +20,16 @@ package org.apache.hama.util;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hama.HamaConfiguration;
 import org.apache.hama.bsp.BSPMaster;
 import org.apache.hama.bsp.GroomServer;
-import org.apache.log4j.Logger;
 
 public class ClusterUtil {
-  static final Logger LOG = Logger.getLogger(ClusterUtil.class);
+  private static final Log LOG = LogFactory.getLog(ClusterUtil.class);
+  
   /**
    * Data Structure to hold GroomServer Thread and GroomServer instance
    */

Modified: incubator/hama/trunk/src/test/org/apache/hama/bsp/TestClusterStatus.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/test/org/apache/hama/bsp/TestClusterStatus.java?rev=1029533&r1=1029532&r2=1029533&view=diff
==============================================================================
--- incubator/hama/trunk/src/test/org/apache/hama/bsp/TestClusterStatus.java (original)
+++ incubator/hama/trunk/src/test/org/apache/hama/bsp/TestClusterStatus.java Mon Nov  1 03:03:31
2010
@@ -31,7 +31,7 @@ import org.apache.hama.bsp.ClusterStatus
 
 public class TestClusterStatus extends TestCase {
   Random rnd = new Random();
-  
+
   protected void setUp() throws Exception {
     super.setUp();
   }
@@ -39,38 +39,40 @@ public class TestClusterStatus extends T
   public final void testWriteAndReadFields() throws IOException {
     DataOutputBuffer out = new DataOutputBuffer();
     DataInputBuffer in = new DataInputBuffer();
-    
+
     ClusterStatus status1;
     Map<String, String> grooms = new HashMap<String, String>();
-        
+
     for (int i = 0; i < 10; i++) {
       int num = rnd.nextInt();
       String groomName = "groom_" + num;
       String peerName = "peerhost:" + num;
       grooms.put(groomName, peerName);
     }
-    
+
     int tasks = rnd.nextInt(100);
     int maxTasks = rnd.nextInt(100);
     BSPMaster.State state = BSPMaster.State.RUNNING;
-    
-    status1 = new ClusterStatus(grooms, tasks, maxTasks, state);    
+
+    status1 = new ClusterStatus(grooms, tasks, maxTasks, state);
     status1.write(out);
-    
+
     in.reset(out.getData(), out.getLength());
-   
+
     ClusterStatus status2 = new ClusterStatus();
     status2.readFields(in);
-    
-    Map<String, String> grooms_s = new HashMap<String, String>(status1.getActiveGroomNames());
-    Map<String, String> grooms_o = new HashMap<String, String>(status2.getActiveGroomNames());
-    
+
+    Map<String, String> grooms_s = new HashMap<String, String>(status1
+        .getActiveGroomNames());
+    Map<String, String> grooms_o = new HashMap<String, String>(status2
+        .getActiveGroomNames());
+
     assertEquals(status1.getGroomServers(), status2.getGroomServers());
 
     assertTrue(grooms_s.entrySet().containsAll(grooms_o.entrySet()));
     assertTrue(grooms_o.entrySet().containsAll(grooms_s.entrySet()));
 
-    assertEquals(status1.getTasks(),status2.getTasks());
+    assertEquals(status1.getTasks(), status2.getTasks());
     assertEquals(status1.getMaxTasks(), status2.getMaxTasks());
   }
 }



Mime
View raw message