incubator-hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r1081723 - in /incubator/hama/trunk: CHANGES.txt build.xml lib/hadoop-0.20.1-core.jar lib/hadoop-0.20.1-test.jar lib/hadoop-0.20.2-core.jar lib/hadoop-0.20.2-test.jar pom.xml src/test/org/apache/hama/bsp/TestSerializePrinting.java
Date Tue, 15 Mar 2011 11:08:05 GMT
Author: edwardyoon
Date: Tue Mar 15 11:08:05 2011
New Revision: 1081723

URL: http://svn.apache.org/viewvc?rev=1081723&view=rev
Log:
Improvement an build scripts for removed dependencies.

Added:
    incubator/hama/trunk/lib/hadoop-0.20.2-core.jar   (with props)
    incubator/hama/trunk/lib/hadoop-0.20.2-test.jar   (with props)
Removed:
    incubator/hama/trunk/lib/hadoop-0.20.1-core.jar
    incubator/hama/trunk/lib/hadoop-0.20.1-test.jar
Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/build.xml
    incubator/hama/trunk/pom.xml
    incubator/hama/trunk/src/test/org/apache/hama/bsp/TestSerializePrinting.java

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1081723&r1=1081722&r2=1081723&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Tue Mar 15 11:08:05 2011
@@ -52,6 +52,7 @@ Trunk (unreleased changes)
 
   IMPROVEMENTS
  
+    HAMA-366: Remove unnecessary dependencies (Tommaso Teofili)
     HAMA-365: TestBSPPeer doesn't check if the correct 
                        number of messages have been received (Miklos Erdelyi via edwardyoon)
     HAMA-298: Implement the kill method for JobInProgress (edwardyoon)

Modified: incubator/hama/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/build.xml?rev=1081723&r1=1081722&r2=1081723&view=diff
==============================================================================
--- incubator/hama/trunk/build.xml (original)
+++ incubator/hama/trunk/build.xml Tue Mar 15 11:08:05 2011
@@ -174,6 +174,7 @@
 			</fileset>
 		</copy>
 	    <copy todir="${dist.dir}/" file="build.xml"/>
+		<copy todir="${dist.dir}/" file="pom.xml"/>
 		
 		<mkdir dir="${dist.dir}/src" />
 		<copy todir="${dist.dir}/src" includeEmptyDirs="true">
@@ -291,9 +292,6 @@
 	<!-- Run unit tests                                                     -->
 	<!-- ================================================================== -->
 	<path id="test.classpath">
-		<fileset dir="${lib.dir}/jsp-2.1/">
-			<include name="*.jar" />
-		</fileset>
 		<pathelement location="${conf.dir}" />
 		<pathelement location="${src.test}" />
 		<pathelement location="${build.test}" />

Added: incubator/hama/trunk/lib/hadoop-0.20.2-core.jar
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/lib/hadoop-0.20.2-core.jar?rev=1081723&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/hama/trunk/lib/hadoop-0.20.2-core.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/hama/trunk/lib/hadoop-0.20.2-test.jar
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/lib/hadoop-0.20.2-test.jar?rev=1081723&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/hama/trunk/lib/hadoop-0.20.2-test.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/hama/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/pom.xml?rev=1081723&r1=1081722&r2=1081723&view=diff
==============================================================================
--- incubator/hama/trunk/pom.xml (original)
+++ incubator/hama/trunk/pom.xml Tue Mar 15 11:08:05 2011
@@ -86,44 +86,22 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/commons-cli-2.0-SNAPSHOT.jar</systemPath>
-    </dependency>
-    <dependency>
-      <groupId>commons-el</groupId>
-      <artifactId>commons-el-from-jetty</artifactId>
-      <version>5.1.4</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/commons-el-from-jetty-5.1.4.jar</systemPath>
+      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
       <version>3.0.1</version>
-      <!--<scope>system</scope>
-      <systemPath>${project.basedir}/lib/commons-httpclient-3.0.1.jar</systemPath>-->
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.4</version>
-      <!--<scope>system</scope>
-      <systemPath>${project.basedir}/lib/commons-logging-1.0.4.jar</systemPath>-->
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging-api</artifactId>
       <version>1.0.4</version>
-      <!--<scope>system</scope>
-      <systemPath>${project.basedir}/lib/commons-logging-api-1.0.4.jar</systemPath>-->
-    </dependency>
-    <dependency>
-      <groupId>commons-math</groupId>
-      <artifactId>commons-math</artifactId>
-      <version>1.1</version>
-      <!--<scope>system</scope>
-      <systemPath>${project.basedir}/lib/commons-math-1.1.jar</systemPath>-->
     </dependency>
     <dependency>
       <groupId>grobo-testing-junit</groupId>
@@ -135,59 +113,18 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-core</artifactId>
-      <version>0.20.1</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/hadoop-0.20.1-core.jar</systemPath>
+      <version>0.20.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-test</artifactId>
-      <version>0.20.1</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/hadoop-0.20.1-test.jar</systemPath>
-    </dependency>
-    <dependency>
-      <groupId>jasper</groupId>
-      <artifactId>jasper-compiler</artifactId>
-      <version>5.5.12</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/jasper-compiler-5.5.12.jar</systemPath>
-    </dependency>
-    <dependency>
-      <groupId>jasper</groupId>
-      <artifactId>jasper-runtime</artifactId>
-      <version>5.5.12</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/jasper-runtime-5.5.12.jar</systemPath>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.22</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/jetty-6.1.14.jar</systemPath>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>6.1.22</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/jetty-util-6.1.14.jar</systemPath>
+      <version>0.20.2</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
-      <!--<scope>system</scope>
-      <systemPath>${project.basedir}/lib/junit-3.8.1.jar</systemPath>-->
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>libthrift</artifactId>
-      <version>r771587</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/libthrift-r771587.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
@@ -217,29 +154,21 @@
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.5</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/servlet-api-2.5-6.1.14.jar</systemPath>
     </dependency>
     <dependency>
-      <groupId>umlgraph</groupId>
-      <artifactId>umlgraph-doclet</artifactId>
-      <version>1.0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/UmlGraph.jar</systemPath>
+      <groupId>gr.spinellis</groupId>
+      <artifactId>UmlGraph</artifactId>
+      <version>4.6</version>
     </dependency>
     <dependency>
       <groupId>xmlenc</groupId>
       <artifactId>xmlenc</artifactId>
       <version>0.52</version>
-      <!--<scope>system</scope>
-      <systemPath>${project.basedir}/lib/xmlenc-0.52.jar</systemPath>-->
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>zookeeper</artifactId>
       <version>3.3.1</version>
-      <!--<scope>system</scope>
-      <systemPath>${project.basedir}/lib/zookeeper-3.3.1.jar</systemPath>-->
     </dependency>
   </dependencies>
   <build>

Modified: incubator/hama/trunk/src/test/org/apache/hama/bsp/TestSerializePrinting.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/test/org/apache/hama/bsp/TestSerializePrinting.java?rev=1081723&r1=1081722&r2=1081723&view=diff
==============================================================================
--- incubator/hama/trunk/src/test/org/apache/hama/bsp/TestSerializePrinting.java (original)
+++ incubator/hama/trunk/src/test/org/apache/hama/bsp/TestSerializePrinting.java Tue Mar 15
11:08:05 2011
@@ -23,15 +23,15 @@ 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.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.ZooKeeper;
 import org.apache.zookeeper.ZooDefs.Ids;
+import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 
 /**
@@ -42,7 +42,7 @@ public class TestSerializePrinting exten
   private int NUM_PEER = 10;
   List<BSPPeerThread> list = new ArrayList<BSPPeerThread>(NUM_PEER);
   List<String> echo = new ArrayList<String>();
-  Configuration conf;
+  HamaConfiguration conf;
 
   public TestSerializePrinting() {
     this.conf = getConf();
@@ -100,11 +100,17 @@ public class TestSerializePrinting exten
     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



Mime
View raw message