You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hama.apache.org by ed...@apache.org on 2012/03/06 01:04:57 UTC

svn commit: r1297303 - in /incubator/hama/trunk: CHANGES.txt core/pom.xml core/src/test/java/org/apache/hama/ipc/TestIPC.java pom.xml

Author: edwardyoon
Date: Tue Mar  6 00:04:56 2012
New Revision: 1297303

URL: http://svn.apache.org/viewvc?rev=1297303&view=rev
Log:
Switch the trunk to Hadoop 1.0 based

Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/core/pom.xml
    incubator/hama/trunk/core/src/test/java/org/apache/hama/ipc/TestIPC.java
    incubator/hama/trunk/pom.xml

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1297303&r1=1297302&r2=1297303&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Tue Mar  6 00:04:56 2012
@@ -12,6 +12,7 @@ Release 0.5 - Unreleased
 
   IMPROVEMENTS
 
+    HAMA-497: Switch the trunk to Hadoop 1.0 based (edwardyoon) 
     HAMA-445: Make configurable checkpointing (Suraj Menon via edwardyoon)
     HAMA-498: BSPTask should periodically ping its parent (Suraj Menon via edwardyoon)
     HAMA-513: Move message classes to somewhere from bsp package. (tjungblut)

Modified: incubator/hama/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/pom.xml?rev=1297303&r1=1297302&r2=1297303&view=diff
==============================================================================
--- incubator/hama/trunk/core/pom.xml (original)
+++ incubator/hama/trunk/core/pom.xml Tue Mar  6 00:04:56 2012
@@ -59,6 +59,14 @@
       <artifactId>commons-cli</artifactId>
     </dependency>
     <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>${ant.version}</version>

Modified: incubator/hama/trunk/core/src/test/java/org/apache/hama/ipc/TestIPC.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/test/java/org/apache/hama/ipc/TestIPC.java?rev=1297303&r1=1297302&r2=1297303&view=diff
==============================================================================
--- incubator/hama/trunk/core/src/test/java/org/apache/hama/ipc/TestIPC.java (original)
+++ incubator/hama/trunk/core/src/test/java/org/apache/hama/ipc/TestIPC.java Tue Mar  6 00:04:56 2012
@@ -88,8 +88,7 @@ public class TestIPC extends TestCase {
       for (int i = 0; i < count; i++) {
         try {
           LongWritable param = new LongWritable(RANDOM.nextLong());
-          LongWritable value = (LongWritable) client.call(param, server, null,
-              null);
+          LongWritable value = (LongWritable) client.call(param, server);
           if (!param.equals(value)) {
             LOG.fatal("Call failed!");
             failed = true;
@@ -214,7 +213,7 @@ public class TestIPC extends TestCase {
     Client client = new Client(LongWritable.class, conf);
     InetSocketAddress address = new InetSocketAddress("127.0.0.1", 10);
     try {
-      client.call(new LongWritable(RANDOM.nextLong()), address, null, null);
+      client.call(new LongWritable(RANDOM.nextLong()), address);
       fail("Expected an exception to have been thrown");
     } catch (IOException e) {
       String message = e.getMessage();

Modified: incubator/hama/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/pom.xml?rev=1297303&r1=1297302&r2=1297303&view=diff
==============================================================================
--- incubator/hama/trunk/pom.xml (original)
+++ incubator/hama/trunk/pom.xml Tue Mar  6 00:04:56 2012
@@ -88,7 +88,9 @@
     <!-- Dependencies -->
     <commons-logging.version>1.1.1</commons-logging.version>
     <commons-cli.version>1.2</commons-cli.version>
-    <hadoop.version>0.20.2</hadoop.version>
+    <commons-configuration>1.6</commons-configuration>
+    <commons-lang>2.6</commons-lang>
+    <hadoop.version>1.0.0</hadoop.version>
     <jetty.version>6.1.14</jetty.version>
     <junit.version>4.8.1</junit.version>
     <slf4j.version>1.5.8</slf4j.version>
@@ -121,6 +123,16 @@
         <version>${commons-cli.version}</version>
       </dependency>
       <dependency>
+        <groupId>commons-configuration</groupId>
+        <artifactId>commons-configuration</artifactId>
+        <version>${commons-configuration}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>${commons-lang}</version>
+      </dependency>
+      <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty</artifactId>
         <version>${jetty.version}</version>