Index: src/test/org/apache/hama/bsp/TestSerializePrinting.java =================================================================== --- src/test/org/apache/hama/bsp/TestSerializePrinting.java (revision 1081682) +++ src/test/org/apache/hama/bsp/TestSerializePrinting.java (working copy) @@ -23,15 +23,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.conf.Configuration; import org.apache.hama.Constants; import org.apache.hama.HamaCluster; +import org.apache.hama.HamaConfiguration; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; +import org.apache.zookeeper.ZooDefs.Ids; import org.apache.zookeeper.ZooKeeper; -import org.apache.zookeeper.ZooDefs.Ids; import org.apache.zookeeper.data.Stat; /** @@ -42,7 +42,7 @@ private int NUM_PEER = 10; List list = new ArrayList(NUM_PEER); List echo = new ArrayList(); - Configuration conf; + HamaConfiguration conf; public TestSerializePrinting() { this.conf = getConf(); @@ -100,11 +100,17 @@ private BSPPeer peer; private int myId; - public BSPPeerThread(Configuration conf, int myId) throws IOException { + public BSPPeerThread(HamaConfiguration conf, int myId) throws IOException { conf.set(Constants.ZOOKEEPER_QUORUM, "localhost"); this.peer = new BSPPeer(conf); this.myId = myId; + + TaskStatus currentTaskStatus = new TaskStatus(new BSPJobID(), + new TaskAttemptID(), 0, null, null, null, null); + peer.setCurrentTaskStatus(currentTaskStatus); + BSPJob jobConf = new BSPJob(conf, NUM_PEER); + peer.setJobConf((BSPJob) jobConf); } @Override Index: pom.xml =================================================================== --- pom.xml (revision 1081682) +++ pom.xml (working copy) @@ -86,46 +86,24 @@ commons-cli commons-cli - 2.0-SNAPSHOT - system - ${project.basedir}/lib/commons-cli-2.0-SNAPSHOT.jar + 1.2 - commons-el - commons-el-from-jetty - 5.1.4 - system - ${project.basedir}/lib/commons-el-from-jetty-5.1.4.jar - - commons-httpclient commons-httpclient 3.0.1 - commons-logging commons-logging 1.0.4 - commons-logging commons-logging-api 1.0.4 - - commons-math - commons-math - 1.1 - - - grobo-testing-junit grobo-testing-junit-core 1.2.1 @@ -135,61 +113,20 @@ org.apache.hadoop hadoop-core - 0.20.1 - system - ${project.basedir}/lib/hadoop-0.20.1-core.jar + 0.20.2 org.apache.hadoop hadoop-test - 0.20.1 - system - ${project.basedir}/lib/hadoop-0.20.1-test.jar + 0.20.2 - jasper - jasper-compiler - 5.5.12 - system - ${project.basedir}/lib/jasper-compiler-5.5.12.jar - - - jasper - jasper-runtime - 5.5.12 - system - ${project.basedir}/lib/jasper-runtime-5.5.12.jar - - - org.mortbay.jetty - jetty - 6.1.22 - system - ${project.basedir}/lib/jetty-6.1.14.jar - - - org.mortbay.jetty - jetty-util - 6.1.22 - system - ${project.basedir}/lib/jetty-util-6.1.14.jar - - junit junit 3.8.1 test - - org.apache.hadoop - libthrift - r771587 - system - ${project.basedir}/lib/libthrift-r771587.jar - - log4j log4j 1.2.15 @@ -217,29 +154,21 @@ javax.servlet servlet-api 2.5 - system - ${project.basedir}/lib/servlet-api-2.5-6.1.14.jar - umlgraph - umlgraph-doclet - 1.0 - system - ${project.basedir}/lib/UmlGraph.jar + gr.spinellis + UmlGraph + 4.6 xmlenc xmlenc 0.52 - org.apache.hadoop zookeeper 3.3.1 - Index: build.xml =================================================================== --- build.xml (revision 1081682) +++ build.xml (working copy) @@ -174,6 +174,7 @@ + @@ -291,9 +292,6 @@ - - -