incubator-hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r726076 - in /incubator/hama/trunk: ./ conf/ src/java/org/apache/hama/io/ src/java/org/apache/hama/shell/ src/java/org/apache/hama/shell/execution/
Date Fri, 12 Dec 2008 17:32:48 GMT
Author: edwardyoon
Date: Fri Dec 12 09:32:48 2008
New Revision: 726076

URL: http://svn.apache.org/viewvc?rev=726076&view=rev
Log:
remove findbugs warning in shell package

Added:
    incubator/hama/trunk/conf/findbugs-exclude-filter.xml
Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/build.xml
    incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java
    incubator/hama/trunk/src/java/org/apache/hama/shell/HamaShell.java
    incubator/hama/trunk/src/java/org/apache/hama/shell/execution/HamaExpression.java
    incubator/hama/trunk/src/java/org/apache/hama/shell/execution/LoadOperation.java

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=726076&r1=726075&r2=726076&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Fri Dec 12 09:32:48 2008
@@ -88,6 +88,7 @@
 
   BUG FIXES
    
+    HAMA-120: remove findbugs warning in shell package (samuel via edwardyoon)
     HAMA-130: Computing Block's range will miss some cell during blocking
               (samuel)
     HAMA-126: In random_mapred, (m) should be (m-1) 

Modified: incubator/hama/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/build.xml?rev=726076&r1=726075&r2=726076&view=diff
==============================================================================
--- incubator/hama/trunk/build.xml (original)
+++ incubator/hama/trunk/build.xml Fri Dec 12 09:32:48 2008
@@ -1,326 +1,327 @@
-<?xml version="1.0"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<project name="hama" default="jar">
-    <property name="version" value="0.1.0-dev" />
-    <property name="Name" value="Hama" />
-    <property name="final.name" value="hama-${version}" />
-    <property name="year" value="2008" />
-
-    <!-- Load all the default properties, and any the user wants    -->
-    <!-- to contribute (without having to type -D or edit this file -->
-    <property file="${user.home}/${name}.build.properties" />
-    <property file="${basedir}/build.properties" />
-
-    <property name="src.dir" location="${basedir}/src/java" />
-    <property name="src.gen.dir" location="${basedir}/src-gen" />
-    <property name="src.test" location="${basedir}/src/test" />
-    <property name="src.examples" location="${basedir}/src/examples" />
-
-    <property name="lib.dir" value="${basedir}/lib" />
-    <property name="conf.dir" value="${basedir}/conf" />
-    <property name="docs.dir" value="${basedir}/docs" />
-    <property name="docs.src" value="${basedir}/src/docs" />
-
-	<!-- javacc properties -->
-    <property name="javacc.home" value="${basedir}/lib" />
-
-    <property name="src.gen.parser.expression.dir" value="${src.gen.dir}/org/apache/hama/shell/parser/expression" />
-    <property name="src.gen.parser.script.dir" value="${src.gen.dir}/org/apache/hama/shell/parser/script" />
-
-	<!-- build properties -->
-	
-    <property name="test.output" value="no" />
-    <property name="test.timeout" value="600000" />
-
-    <property name="build.dir" location="${basedir}/build" />
-    <property name="build.lib" location="${build.dir}/lib" />
-    <property name="build.classes" location="${build.dir}/classes" />
-    <property name="build.test" location="${build.dir}/test" />
-    <property name="build.examples" location="${build.dir}/examples" />
-    <property name="build.docs" value="${build.dir}/docs/site" />
-    <property name="build.javadoc" value="${build.docs}/api" />
-    <property name="build.encoding" value="ISO-8859-1" />
-    <property name="build.src" value="${build.dir}/src" />
-    
-    <property name="build.report" value="${build.dir}/reports" />
-    <property name="build.report.findbugs" value="${build.report}/findbugs" />
-    <property name="build.report.tests" value="${build.report}/tests" />
-    
-    <property name="test.build.dir" value="${build.dir}/test" />
-    <property name="test.junit.output.format" value="plain" />
-
-    <property name="dist.dir" value="${build.dir}/${final.name}" />
-
-    <property name="javac.deprecation" value="off" />
-    <property name="javac.debug" value="on" />
-
-    <property name="javadoc.link.java" 
-                 value="http://java.sun.com/javase/6/docs/api/" />
-    <property name="javadoc.packages" value="org.apache.hama.*" />
-
-    <fileset id="lib.jars" dir="${basedir}" includes="lib/*.jar" />
-    <path id="classpath">
-        <fileset refid="lib.jars" />
-        <fileset dir="${lib.dir}/jetty-ext/">
-            <include name="*jar" />
-        </fileset>
-        <fileset dir="${lib.dir}/findbugs/">
-            <include name="*jar" />
-        </fileset>
-        <pathelement location="${build.classes}" />
-        <pathelement location="${conf.dir}" />
-    </path>
-
-    <taskdef name="findbugs" classpathref="classpath" 
-    	classname="edu.umd.cs.findbugs.anttask.FindBugsTask" />
-
-    <target name="init">
-        <mkdir dir="${src.gen.dir}" />
-        <mkdir dir="${src.gen.parser.script.dir}" />
-        <mkdir dir="${src.gen.parser.expression.dir}" />
-        <mkdir dir="${build.dir}" />
-        <mkdir dir="${build.classes}" />
-        <mkdir dir="${build.test}" />
-        <mkdir dir="${build.examples}" />
-        <mkdir dir="${build.report.findbugs}" />
-        <mkdir dir="${build.report.tests}" />
-        <!--Copy bin, lib, and conf. too-->
-        <mkdir dir="${build.lib}" />
-        <copy todir="${build.lib}">
-            <fileset dir="${lib.dir}" />
-        </copy>
-    </target>
-	
-	<!-- ================================================================== -->
-    <!-- Java Compiler Compiler, generate Parsers                           -->
-    <!-- ================================================================== -->
-    <target name="cc-compile" depends="init" description="Create and Compile Parser">
-        <jjtree target="${src.dir}/org/apache/hama/shell/parser/expression/HamaExpressionParser.jjt" outputdirectory="${src.gen.parser.expression.dir}" javacchome="${javacc.home}" />
-        <javacc target="${src.gen.parser.expression.dir}/HamaExpressionParser.jj" outputdirectory="${src.gen.parser.expression.dir}" javacchome="${javacc.home}" />
-        <javacc target="${src.dir}/org/apache/hama/shell/parser/script/HamaScriptParser.jj" outputdirectory="${src.gen.parser.script.dir}" javacchome="${javacc.home}" />
-    </target>
-
-    <target name="compile" depends="init, cc-compile">
-        <!--Compile whats under src and generated java classes made from jsp-->
-        <mkdir dir="${build.src}" />
-        <javac encoding="${build.encoding}" 
-                srcdir="${src.dir};${src.gen.dir};${build.src}" includes="**/*.java" 
-        	destdir="${build.classes}" debug="${javac.debug}" 
-                deprecation="${javac.deprecation}">
-            <classpath refid="classpath" />
-        </javac>
-    </target>
-
-    <target name="compile-examples" depends="compile">
-        <javac encoding="${build.encoding}" srcdir="${src.examples}" 
-                includes="**/*.java" 
-        	destdir="${build.examples}" debug="${javac.debug}" 
-                deprecation="${javac.deprecation}">
-            <classpath refid="classpath" />
-        </javac>
-    </target>
-
-    <!-- Override jar target to specify main class -->
-    <target name="jar" depends="compile">
-        <jar jarfile="${build.dir}/${final.name}.jar" 
-              basedir="${build.classes}">
-            <manifest>
-                <attribute name="Main-Class" 
-                    value="org/apache/hama/shell/HamaShell" />
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="examples" depends="jar, compile-examples" 
-    	description="Make the hama examples jar.">
-        <jar jarfile="${build.dir}/${final.name}-examples.jar" 
-                basedir="${build.examples}">
-            <manifest>
-                <attribute name="Main-Class" 
-                    value="org/apache/hama/examples/ExampleDriver" />
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="package" depends="jar,javadoc,compile-test, examples" 
-    	description="Build distribution">
-        <mkdir dir="${dist.dir}" />
-        <copy todir="${dist.dir}" includeEmptyDirs="false" flatten="true">
-            <fileset dir="${build.dir}">
-                <include name="${final.name}.jar" />
-                <include name="${final.name}-test.jar" />
-            </fileset>
-        </copy>
-        <mkdir dir="${dist.dir}/lib" />
-        <copy todir="${dist.dir}/lib">
-            <fileset dir="${build.lib}" />
-        </copy>
-        <copy todir="${dist.dir}">
-            <fileset dir=".">
-                <include name="*.txt" />
-            </fileset>
-        </copy>
-        <mkdir dir="${dist.dir}/src" />
-        <copy todir="${dist.dir}/src" includeEmptyDirs="true">
-            <fileset dir="src" excludes="**/*.template **/docs/build/**/*" />
-        </copy>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Make release tarball                                               -->
-    <!-- ================================================================== -->
-    <macrodef name="macro_tar" description="Worker Macro for tar">
-        <attribute name="param.destfile" />
-        <element name="param.listofitems" />
-        <sequential>
-            <tar compression="gzip" longfile="gnu" destfile="@{param.destfile}">
-                <param.listofitems />
-            </tar>
-        </sequential>
-    </macrodef>
-    <target name="tar" depends="package" description="Make release tarball">
-        <macro_tar param.destfile="${build.dir}/${final.name}.tar.gz">
-            <param.listofitems>
-                <tarfileset dir="${build.dir}" mode="664">
-                    <exclude name="${final.name}/bin/*" />
-                    <include name="${final.name}/**" />
-                </tarfileset>
-                <tarfileset dir="${build.dir}" mode="755">
-                    <include name="${final.name}/bin/*" />
-                </tarfileset>
-            </param.listofitems>
-        </macro_tar>
-    </target>
-
-    <target name="binary" depends="package" 
-    	description="Make tarball without source and documentation">
-        <macro_tar param.destfile="${build.dir}/${final.name}-bin.tar.gz">
-            <param.listofitems>
-                <tarfileset dir="${build.dir}" mode="664">
-                    <exclude name="${final.name}/bin/*" />
-                    <exclude name="${final.name}/src/**" />
-                    <exclude name="${final.name}/docs/**" />
-                    <include name="${final.name}/**" />
-                </tarfileset>
-                <tarfileset dir="${build.dir}" mode="755">
-                    <include name="${final.name}/bin/*" />
-                </tarfileset>
-            </param.listofitems>
-        </macro_tar>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Doc                                                                -->
-    <!-- ================================================================== -->
-    <target name="docs" depends="forrest.check" description="Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line." if="forrest.home">
-        <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest" 
-               failonerror="true">
-        	<env key="JAVA_HOME" value="${java5.home}"/>
-        </exec>
-        <copy todir="${build.docs}">
-          <fileset dir="${docs.src}/build/site/" />
-        </copy>
-    	<delete dir="${docs.src}/build/"/>
-    </target>
-
-    <target name="forrest.check" unless="forrest.home">
-        <fail message="'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line." />
-    </target>
-
-    <!-- Javadoc -->
-    <target name="javadoc" depends="cc-compile" description="Generate javadoc">
-        <mkdir dir="${build.javadoc}" />
-        <javadoc overview="${src.dir}/overview.html" packagenames="org.apache.hama.*" 
-        	    destdir="${build.javadoc}" author="true" version="true" use="true" 
-        	    windowtitle="${Name} ${version} API" doctitle="${Name} ${version} API" 
-        	    bottom="Copyright &amp;copy; ${year} The Apache Software Foundation">
-            <packageset dir="${src.dir}">
-                <include name="org/apache/**" />
-            </packageset>
-            <packageset dir="${src.gen.dir}">
-                <include name="org/apache/**" />
-            </packageset>
-            <link href="${javadoc.link.java}" />
-            <classpath>
-                <path refid="classpath" />
-                <pathelement path="${java.class.path}" />
-            </classpath>
-            <group title="${Name}" packages="org.apache.hama.*" />
-        </javadoc>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Run unit tests                                                     -->
-    <!-- ================================================================== -->
-    <path id="test.classpath">
-        <pathelement location="${src.test}" />
-        <pathelement location="${build.test}" />
-        <path refid="classpath" />
-        <pathelement location="${build.dir}" />
-    </path>
-
-    <target name="compile-test" depends="compile">
-        <javac encoding="${build.encoding}" srcdir="${src.test}" 
-           includes="**/*.java" destdir="${build.test}" debug="${javac.debug}">
-            <classpath refid="test.classpath" />
-        </javac>
-        <jar jarfile="${build.dir}/${final.name}-test.jar">
-            <fileset dir="${build.test}" includes="org/**" />
-            <fileset dir="${build.classes}" />
-            <fileset dir="${src.test}" includes="**/*.properties" />
-            <manifest>
-              <attribute name="Main-Class" value="org/apache/hama/Benchmarks" />
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="test" depends="compile-test, compile">
-        <junit printsummary="yes" showoutput="${test.output}" haltonfailure="no"
-              fork="yes" maxmemory="512m" errorProperty="tests.failed" 
-        	     failureProperty="tests.failed" timeout="${test.timeout}">
-            <classpath refid="test.classpath" />
-            <formatter type="${test.junit.output.format}" />
-            <batchtest todir="${build.report.tests}">
-                <fileset dir="${src.test}" includes="**/Test*.java" 
-                	 excludes="**/${test.exclude}.java" />
-            </batchtest>
-        </junit>
-        <fail if="tests.failed">Tests failed!</fail>
-    </target>
-
-    <target name="findbugs" depends="init, jar">
-        <findbugs home="${lib.dir}/findbugs" output="xml" 
-        	     outputFile="${build.report.findbugs}/hama-findbugs.xml" 
-        	     auxClasspathRef="classpath">
-            <sourcePath path="${src.dir}" />
-            <class location="${build.dir}/${final.name}.jar" />
-        </findbugs>
-    </target>
-    
-    <target name="report" depends="findbugs,test"></target>
-    
-    <!-- ================================================================== -->
-    <!-- Clean.  Delete the build files, and their directories              -->
-    <!-- ================================================================== -->
-    <target name="clean">
-        <delete dir="${src.gen.dir}" />
-        <delete dir="${build.dir}" />
-    </target>
-</project>
+<?xml version="1.0"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<project name="hama" default="jar">
+    <property name="version" value="0.1.0-dev" />
+    <property name="Name" value="Hama" />
+    <property name="final.name" value="hama-${version}" />
+    <property name="year" value="2008" />
+
+    <!-- Load all the default properties, and any the user wants    -->
+    <!-- to contribute (without having to type -D or edit this file -->
+    <property file="${user.home}/${name}.build.properties" />
+    <property file="${basedir}/build.properties" />
+
+    <property name="src.dir" location="${basedir}/src/java" />
+    <property name="src.gen.dir" location="${basedir}/src-gen" />
+    <property name="src.test" location="${basedir}/src/test" />
+    <property name="src.examples" location="${basedir}/src/examples" />
+
+    <property name="lib.dir" value="${basedir}/lib" />
+    <property name="conf.dir" value="${basedir}/conf" />
+    <property name="docs.dir" value="${basedir}/docs" />
+    <property name="docs.src" value="${basedir}/src/docs" />
+
+	<!-- javacc properties -->
+    <property name="javacc.home" value="${basedir}/lib" />
+
+    <property name="src.gen.parser.expression.dir" value="${src.gen.dir}/org/apache/hama/shell/parser/expression" />
+    <property name="src.gen.parser.script.dir" value="${src.gen.dir}/org/apache/hama/shell/parser/script" />
+
+	<!-- build properties -->
+	
+    <property name="test.output" value="no" />
+    <property name="test.timeout" value="600000" />
+
+    <property name="build.dir" location="${basedir}/build" />
+    <property name="build.lib" location="${build.dir}/lib" />
+    <property name="build.classes" location="${build.dir}/classes" />
+    <property name="build.test" location="${build.dir}/test" />
+    <property name="build.examples" location="${build.dir}/examples" />
+    <property name="build.docs" value="${build.dir}/docs/site" />
+    <property name="build.javadoc" value="${build.docs}/api" />
+    <property name="build.encoding" value="ISO-8859-1" />
+    <property name="build.src" value="${build.dir}/src" />
+    
+    <property name="build.report" value="${build.dir}/reports" />
+    <property name="build.report.findbugs" value="${build.report}/findbugs" />
+    <property name="build.report.tests" value="${build.report}/tests" />
+    
+    <property name="test.build.dir" value="${build.dir}/test" />
+    <property name="test.junit.output.format" value="plain" />
+
+    <property name="dist.dir" value="${build.dir}/${final.name}" />
+
+    <property name="javac.deprecation" value="off" />
+    <property name="javac.debug" value="on" />
+
+    <property name="javadoc.link.java" 
+                 value="http://java.sun.com/javase/6/docs/api/" />
+    <property name="javadoc.packages" value="org.apache.hama.*" />
+
+    <fileset id="lib.jars" dir="${basedir}" includes="lib/*.jar" />
+    <path id="classpath">
+        <fileset refid="lib.jars" />
+        <fileset dir="${lib.dir}/jetty-ext/">
+            <include name="*jar" />
+        </fileset>
+        <fileset dir="${lib.dir}/findbugs/">
+            <include name="*jar" />
+        </fileset>
+        <pathelement location="${build.classes}" />
+        <pathelement location="${conf.dir}" />
+    </path>
+
+    <taskdef name="findbugs" classpathref="classpath" 
+    	classname="edu.umd.cs.findbugs.anttask.FindBugsTask" />
+
+    <target name="init">
+        <mkdir dir="${src.gen.dir}" />
+        <mkdir dir="${src.gen.parser.script.dir}" />
+        <mkdir dir="${src.gen.parser.expression.dir}" />
+        <mkdir dir="${build.dir}" />
+        <mkdir dir="${build.classes}" />
+        <mkdir dir="${build.test}" />
+        <mkdir dir="${build.examples}" />
+        <mkdir dir="${build.report.findbugs}" />
+        <mkdir dir="${build.report.tests}" />
+        <!--Copy bin, lib, and conf. too-->
+        <mkdir dir="${build.lib}" />
+        <copy todir="${build.lib}">
+            <fileset dir="${lib.dir}" />
+        </copy>
+    </target>
+	
+	<!-- ================================================================== -->
+    <!-- Java Compiler Compiler, generate Parsers                           -->
+    <!-- ================================================================== -->
+    <target name="cc-compile" depends="init" description="Create and Compile Parser">
+        <jjtree target="${src.dir}/org/apache/hama/shell/parser/expression/HamaExpressionParser.jjt" outputdirectory="${src.gen.parser.expression.dir}" javacchome="${javacc.home}" />
+        <javacc target="${src.gen.parser.expression.dir}/HamaExpressionParser.jj" outputdirectory="${src.gen.parser.expression.dir}" javacchome="${javacc.home}" />
+        <javacc target="${src.dir}/org/apache/hama/shell/parser/script/HamaScriptParser.jj" outputdirectory="${src.gen.parser.script.dir}" javacchome="${javacc.home}" />
+    </target>
+
+    <target name="compile" depends="init, cc-compile">
+        <!--Compile whats under src and generated java classes made from jsp-->
+        <mkdir dir="${build.src}" />
+        <javac encoding="${build.encoding}" 
+                srcdir="${src.dir};${src.gen.dir};${build.src}" includes="**/*.java" 
+        	destdir="${build.classes}" debug="${javac.debug}" 
+                deprecation="${javac.deprecation}">
+            <classpath refid="classpath" />
+        </javac>
+    </target>
+
+    <target name="compile-examples" depends="compile">
+        <javac encoding="${build.encoding}" srcdir="${src.examples}" 
+                includes="**/*.java" 
+        	destdir="${build.examples}" debug="${javac.debug}" 
+                deprecation="${javac.deprecation}">
+            <classpath refid="classpath" />
+        </javac>
+    </target>
+
+    <!-- Override jar target to specify main class -->
+    <target name="jar" depends="compile">
+        <jar jarfile="${build.dir}/${final.name}.jar" 
+              basedir="${build.classes}">
+            <manifest>
+                <attribute name="Main-Class" 
+                    value="org/apache/hama/shell/HamaShell" />
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="examples" depends="jar, compile-examples" 
+    	description="Make the hama examples jar.">
+        <jar jarfile="${build.dir}/${final.name}-examples.jar" 
+                basedir="${build.examples}">
+            <manifest>
+                <attribute name="Main-Class" 
+                    value="org/apache/hama/examples/ExampleDriver" />
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="package" depends="jar,javadoc,compile-test, examples" 
+    	description="Build distribution">
+        <mkdir dir="${dist.dir}" />
+        <copy todir="${dist.dir}" includeEmptyDirs="false" flatten="true">
+            <fileset dir="${build.dir}">
+                <include name="${final.name}.jar" />
+                <include name="${final.name}-test.jar" />
+            </fileset>
+        </copy>
+        <mkdir dir="${dist.dir}/lib" />
+        <copy todir="${dist.dir}/lib">
+            <fileset dir="${build.lib}" />
+        </copy>
+        <copy todir="${dist.dir}">
+            <fileset dir=".">
+                <include name="*.txt" />
+            </fileset>
+        </copy>
+        <mkdir dir="${dist.dir}/src" />
+        <copy todir="${dist.dir}/src" includeEmptyDirs="true">
+            <fileset dir="src" excludes="**/*.template **/docs/build/**/*" />
+        </copy>
+    </target>
+
+    <!-- ================================================================== -->
+    <!-- Make release tarball                                               -->
+    <!-- ================================================================== -->
+    <macrodef name="macro_tar" description="Worker Macro for tar">
+        <attribute name="param.destfile" />
+        <element name="param.listofitems" />
+        <sequential>
+            <tar compression="gzip" longfile="gnu" destfile="@{param.destfile}">
+                <param.listofitems />
+            </tar>
+        </sequential>
+    </macrodef>
+    <target name="tar" depends="package" description="Make release tarball">
+        <macro_tar param.destfile="${build.dir}/${final.name}.tar.gz">
+            <param.listofitems>
+                <tarfileset dir="${build.dir}" mode="664">
+                    <exclude name="${final.name}/bin/*" />
+                    <include name="${final.name}/**" />
+                </tarfileset>
+                <tarfileset dir="${build.dir}" mode="755">
+                    <include name="${final.name}/bin/*" />
+                </tarfileset>
+            </param.listofitems>
+        </macro_tar>
+    </target>
+
+    <target name="binary" depends="package" 
+    	description="Make tarball without source and documentation">
+        <macro_tar param.destfile="${build.dir}/${final.name}-bin.tar.gz">
+            <param.listofitems>
+                <tarfileset dir="${build.dir}" mode="664">
+                    <exclude name="${final.name}/bin/*" />
+                    <exclude name="${final.name}/src/**" />
+                    <exclude name="${final.name}/docs/**" />
+                    <include name="${final.name}/**" />
+                </tarfileset>
+                <tarfileset dir="${build.dir}" mode="755">
+                    <include name="${final.name}/bin/*" />
+                </tarfileset>
+            </param.listofitems>
+        </macro_tar>
+    </target>
+
+    <!-- ================================================================== -->
+    <!-- Doc                                                                -->
+    <!-- ================================================================== -->
+    <target name="docs" depends="forrest.check" description="Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line." if="forrest.home">
+        <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest" 
+               failonerror="true">
+        	<env key="JAVA_HOME" value="${java5.home}"/>
+        </exec>
+        <copy todir="${build.docs}">
+          <fileset dir="${docs.src}/build/site/" />
+        </copy>
+    	<delete dir="${docs.src}/build/"/>
+    </target>
+
+    <target name="forrest.check" unless="forrest.home">
+        <fail message="'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line." />
+    </target>
+
+    <!-- Javadoc -->
+    <target name="javadoc" depends="cc-compile" description="Generate javadoc">
+        <mkdir dir="${build.javadoc}" />
+        <javadoc overview="${src.dir}/overview.html" packagenames="org.apache.hama.*" 
+        	    destdir="${build.javadoc}" author="true" version="true" use="true" 
+        	    windowtitle="${Name} ${version} API" doctitle="${Name} ${version} API" 
+        	    bottom="Copyright &amp;copy; ${year} The Apache Software Foundation">
+            <packageset dir="${src.dir}">
+                <include name="org/apache/**" />
+            </packageset>
+            <packageset dir="${src.gen.dir}">
+                <include name="org/apache/**" />
+            </packageset>
+            <link href="${javadoc.link.java}" />
+            <classpath>
+                <path refid="classpath" />
+                <pathelement path="${java.class.path}" />
+            </classpath>
+            <group title="${Name}" packages="org.apache.hama.*" />
+        </javadoc>
+    </target>
+
+    <!-- ================================================================== -->
+    <!-- Run unit tests                                                     -->
+    <!-- ================================================================== -->
+    <path id="test.classpath">
+        <pathelement location="${src.test}" />
+        <pathelement location="${build.test}" />
+        <path refid="classpath" />
+        <pathelement location="${build.dir}" />
+    </path>
+
+    <target name="compile-test" depends="compile">
+        <javac encoding="${build.encoding}" srcdir="${src.test}" 
+           includes="**/*.java" destdir="${build.test}" debug="${javac.debug}">
+            <classpath refid="test.classpath" />
+        </javac>
+        <jar jarfile="${build.dir}/${final.name}-test.jar">
+            <fileset dir="${build.test}" includes="org/**" />
+            <fileset dir="${build.classes}" />
+            <fileset dir="${src.test}" includes="**/*.properties" />
+            <manifest>
+              <attribute name="Main-Class" value="org/apache/hama/Benchmarks" />
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="test" depends="compile-test, compile">
+        <junit printsummary="yes" showoutput="${test.output}" haltonfailure="no"
+              fork="yes" maxmemory="512m" errorProperty="tests.failed" 
+        	     failureProperty="tests.failed" timeout="${test.timeout}">
+            <classpath refid="test.classpath" />
+            <formatter type="${test.junit.output.format}" />
+            <batchtest todir="${build.report.tests}">
+                <fileset dir="${src.test}" includes="**/Test*.java" 
+                	 excludes="**/${test.exclude}.java" />
+            </batchtest>
+        </junit>
+        <fail if="tests.failed">Tests failed!</fail>
+    </target>
+
+    <target name="findbugs" depends="init, jar">
+        <findbugs home="${lib.dir}/findbugs" output="xml" 
+        	     outputFile="${build.report.findbugs}/hama-findbugs.xml" 
+               excludeFilter="${conf.dir}/findbugs-exclude-filter.xml"
+        	     auxClasspathRef="classpath">
+            <sourcePath path="${src.dir}" />
+            <class location="${build.dir}/${final.name}.jar" />
+        </findbugs>
+    </target>
+    
+    <target name="report" depends="findbugs,test"></target>
+    
+    <!-- ================================================================== -->
+    <!-- Clean.  Delete the build files, and their directories              -->
+    <!-- ================================================================== -->
+    <target name="clean">
+        <delete dir="${src.gen.dir}" />
+        <delete dir="${build.dir}" />
+    </target>
+</project>

Added: incubator/hama/trunk/conf/findbugs-exclude-filter.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/conf/findbugs-exclude-filter.xml?rev=726076&view=auto
==============================================================================
--- incubator/hama/trunk/conf/findbugs-exclude-filter.xml (added)
+++ incubator/hama/trunk/conf/findbugs-exclude-filter.xml Fri Dec 12 09:32:48 2008
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
++-->
+
+<FindBugsFilter>
+  <!-- Disable the warnings for the generated classes -->
+  <Match>
+    <Class name="~org.apache.hama.shell.parser.script.*" />
+  </Match>
+  <Match>
+    <Class name="~org.apache.hama.shell.parser.expression.*" />
+  </Match>
+</FindBugsFilter>

Modified: incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java?rev=726076&r1=726075&r2=726076&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/io/BlockID.java Fri Dec 12 09:32:48 2008
@@ -1,122 +1,129 @@
-/**
- * Copyright 2007 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hama.io;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.apache.hadoop.io.WritableComparable;
-
-/** A WritableComparable for BlockIDs. */
-@SuppressWarnings("unchecked")
-public class BlockID implements WritableComparable, java.io.Serializable {
-  private static final long serialVersionUID = 1L;
-  private int row;
-  private int column;
-
-  public BlockID() {
-  }
-
-  public BlockID(int row, int column) {
-    set(row, column);
-  }
-
-  public BlockID(byte[] bytes) throws IOException {
-    ByteArrayInputStream bos = new ByteArrayInputStream(bytes);
-    ObjectInputStream oos = new ObjectInputStream(bos);
-    Object obj = null;
-    try {
-      obj = oos.readObject();
-      this.row = ((BlockID)obj).getRow();
-      this.column = ((BlockID)obj).getColumn();
-    } catch (ClassNotFoundException e) {
-      e.printStackTrace();
-    }
-    oos.close();
-    bos.close();
-  }
-
-  public void set(int row, int column) {
-    this.row = row;
-    this.column = column;
-  }
-
-  public int getRow() {
-    return row;
-  }
-
-  public int getColumn() {
-    return column;
-  }
-
-  public void readFields(DataInput in) throws IOException {
-    row = in.readInt();
-    column = in.readInt();
-  }
-
-  public void write(DataOutput out) throws IOException {
-    out.writeInt(row);
-    // out.write(column);
-    out.writeInt(column);
-  }
-
-  /**
-   * Make BlockID's string representation be same format.
-   */
-  public String toString() {
-    return row + "," + column;
-  }
-
-  @Override
-  public int hashCode() {
-    // simply use a prime number
-    // may be need a more balance hash function
-    return row * 37 + column;
-  }
-
-  public int compareTo(Object o) {
-    int thisRow = this.row;
-    int thatRow = ((BlockID) o).row;
-    int thisColumn = this.column;
-    int thatColumn = ((BlockID) o).column;
-
-    if (thisRow != thatRow) {
-      return (thisRow < thatRow ? -1 : 1);
-    } else {
-      return (thisColumn < thatColumn ? -1 : (thisColumn == thatColumn ? 0 : 1));
-    }
-  }
-
-  public byte[] getBytes() throws IOException {
-    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    ObjectOutputStream oos = new ObjectOutputStream(bos);
-    oos.writeObject(this);
-    oos.flush();
-    oos.close();
-    bos.close();
-    byte[] data = bos.toByteArray();
-    return data;
-  }
-}
+/**
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.io;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.apache.hadoop.io.WritableComparable;
+
+/** A WritableComparable for BlockIDs. */
+@SuppressWarnings("unchecked")
+public class BlockID implements WritableComparable, java.io.Serializable {
+  private static final long serialVersionUID = 1L;
+  private int row;
+  private int column;
+
+  public BlockID() {
+  }
+
+  public BlockID(int row, int column) {
+    set(row, column);
+  }
+
+  public BlockID(byte[] bytes) throws IOException {
+    ByteArrayInputStream bos = new ByteArrayInputStream(bytes);
+    ObjectInputStream oos = new ObjectInputStream(bos);
+    Object obj = null;
+    try {
+      obj = oos.readObject();
+      this.row = ((BlockID)obj).getRow();
+      this.column = ((BlockID)obj).getColumn();
+    } catch (ClassNotFoundException e) {
+      e.printStackTrace();
+    }
+    oos.close();
+    bos.close();
+  }
+
+  public void set(int row, int column) {
+    this.row = row;
+    this.column = column;
+  }
+
+  public int getRow() {
+    return row;
+  }
+
+  public int getColumn() {
+    return column;
+  }
+
+  public void readFields(DataInput in) throws IOException {
+    row = in.readInt();
+    column = in.readInt();
+  }
+
+  public void write(DataOutput out) throws IOException {
+    out.writeInt(row);
+    // out.write(column);
+    out.writeInt(column);
+  }
+
+  /**
+   * Make BlockID's string representation be same format.
+   */
+  public String toString() {
+    return row + "," + column;
+  }
+
+  @Override
+  public int hashCode() {
+    // simply use a prime number
+    // may be need a more balance hash function
+    return row * 37 + column;
+  }
+
+  public int compareTo(Object o) {
+    int thisRow = this.row;
+    int thatRow = ((BlockID) o).row;
+    int thisColumn = this.column;
+    int thatColumn = ((BlockID) o).column;
+
+    if (thisRow != thatRow) {
+      return (thisRow < thatRow ? -1 : 1);
+    } else {
+      return (thisColumn < thatColumn ? -1 : (thisColumn == thatColumn ? 0 : 1));
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if(o == null) return false;
+    if(!(o instanceof BlockID)) return false;
+    return compareTo(o) == 0;
+  }
+
+  public byte[] getBytes() throws IOException {
+    ByteArrayOutputStream bos = new ByteArrayOutputStream();
+    ObjectOutputStream oos = new ObjectOutputStream(bos);
+    oos.writeObject(this);
+    oos.flush();
+    oos.close();
+    bos.close();
+    byte[] data = bos.toByteArray();
+    return data;
+  }
+}

Modified: incubator/hama/trunk/src/java/org/apache/hama/shell/HamaShell.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/shell/HamaShell.java?rev=726076&r1=726075&r2=726076&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/shell/HamaShell.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/shell/HamaShell.java Fri Dec 12 09:32:48 2008
@@ -1,95 +1,93 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hama.shell;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hama.HamaConfiguration;
-
-/**
- * HamaShell
- * 
- */
-// TODO : improve to make it executed in batch mode.
-// now it parse the input stream to expression by expression.
-// so we only can execute expression by expression.
-// it is not efficient.
-public class HamaShell {
-
-  private final Log log = LogFactory.getLog(getClass());
-
-  BufferedReader in;
-  HamaShellEnv env;
-  HamaShellParser parser;
-  HamaConfiguration conf;
-
-  /**
-   * HamaShell Constructor.
-   * 
-   * @param in input stream to be parsed
-   * @param shellEnv shell environment
-   * @param conf Hama Configuration
-   */
-  public HamaShell(BufferedReader in, HamaShellEnv shellEnv,
-      HamaConfiguration conf) {
-    this.in = in;
-    this.env = shellEnv;
-    this.conf = conf;
-
-    if (in != null) {
-      parser = new HamaShellParser(in, env, this.conf);
-    }
-  }
-
-  /**
-   * HamaShell Executed in interactive mode.
-   */
-  public void run() {
-    parser.setInteractive(true);
-    parser.parseContOnError();
-  }
-
-  /**
-   * HamaShell Executed in batch mode.
-   */
-  public void exec() {
-    try {
-      parser.setInteractive(false);
-      parser.parseStopOnError();
-    } catch (Exception e) {
-      ByteArrayOutputStream bs = new ByteArrayOutputStream();
-      e.printStackTrace(new PrintStream(bs));
-      log.error(bs.toString());
-      log.error(e.getMessage());
-    }
-  }
-
-  public static void main(String[] args) {
-    HamaShellEnv shellEnv = new HamaShellEnv();
-    HamaShell shell = new HamaShell(new BufferedReader(new InputStreamReader(
-        System.in)), shellEnv, new HamaConfiguration());
-    shell.run();
-    shellEnv.clearAliases();
-  }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.shell;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hama.HamaConfiguration;
+
+/**
+ * HamaShell
+ * 
+ */
+// TODO : improve to make it executed in batch mode.
+// now it parse the input stream to expression by expression.
+// so we only can execute expression by expression.
+// it is not efficient.
+public class HamaShell {
+
+  private final Log log = LogFactory.getLog(getClass());
+
+  HamaShellEnv env;
+  HamaShellParser parser;
+  HamaConfiguration conf;
+
+  /**
+   * HamaShell Constructor.
+   * 
+   * @param in input stream to be parsed
+   * @param shellEnv shell environment
+   * @param conf Hama Configuration
+   */
+  public HamaShell(BufferedReader in, HamaShellEnv shellEnv,
+      HamaConfiguration conf) {
+    this.env = shellEnv;
+    this.conf = conf;
+
+    if (in != null) {
+      parser = new HamaShellParser(in, env, this.conf);
+    }
+  }
+
+  /**
+   * HamaShell Executed in interactive mode.
+   */
+  public void run() {
+    parser.setInteractive(true);
+    parser.parseContOnError();
+  }
+
+  /**
+   * HamaShell Executed in batch mode.
+   */
+  public void exec() {
+    try {
+      parser.setInteractive(false);
+      parser.parseStopOnError();
+    } catch (Exception e) {
+      ByteArrayOutputStream bs = new ByteArrayOutputStream();
+      e.printStackTrace(new PrintStream(bs));
+      log.error(bs.toString());
+      log.error(e.getMessage());
+    }
+  }
+
+  public static void main(String[] args) {
+    HamaShellEnv shellEnv = new HamaShellEnv();
+    HamaShell shell = new HamaShell(new BufferedReader(new InputStreamReader(
+        System.in)), shellEnv, new HamaConfiguration());
+    shell.run();
+    shellEnv.clearAliases();
+  }
+
+}

Modified: incubator/hama/trunk/src/java/org/apache/hama/shell/execution/HamaExpression.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/shell/execution/HamaExpression.java?rev=726076&r1=726075&r2=726076&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/shell/execution/HamaExpression.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/shell/execution/HamaExpression.java Fri Dec 12 09:32:48 2008
@@ -1,39 +1,37 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hama.shell.execution;
-
-import org.apache.hama.HamaConfiguration;
-import org.apache.hama.shell.HamaShellEnv;
-
-/** HamaExpression **/
-abstract public class HamaExpression {
-
-  HamaShellEnv env;
-  HamaConfiguration conf;
-  
-  public HamaExpression(HamaConfiguration conf, HamaShellEnv env) {
-    this.env = env;
-    this.conf = conf;
-  }
-  
-  /**
-   * execute the expression.
-   */
-  abstract public void execute() ;
-  
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.shell.execution;
+
+import org.apache.hama.HamaConfiguration;
+import org.apache.hama.shell.HamaShellEnv;
+
+/** HamaExpression **/
+abstract public class HamaExpression {
+
+  HamaShellEnv env;
+  
+  public HamaExpression(HamaConfiguration conf, HamaShellEnv env) {
+    this.env = env;
+  }
+  
+  /**
+   * execute the expression.
+   */
+  abstract public void execute() ;
+  
+}

Modified: incubator/hama/trunk/src/java/org/apache/hama/shell/execution/LoadOperation.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/shell/execution/LoadOperation.java?rev=726076&r1=726075&r2=726076&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/shell/execution/LoadOperation.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/shell/execution/LoadOperation.java Fri Dec 12 09:32:48 2008
@@ -1,56 +1,54 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hama.shell.execution;
-
-import java.io.IOException;
-
-import org.apache.hama.HamaConfiguration;
-
-/**
- * Load Matrix from a file in HDFS.
- * 
- * A = load 'file' as matrix using 'class' ;
- *
- */
-public class LoadOperation extends HamaOperation {
-
-  String filename;
-  String asTypename;
-  String classname;
-  
-  public LoadOperation(HamaConfiguration conf, String filename, String typename, 
-      String classname) {
-    super(conf);
-    this.filename = filename;
-    this.asTypename = typename;
-    this.classname = classname;
-  }
-  
-  public LoadOperation(HamaConfiguration conf, String filename, String typename, 
-      String classname, int map, int reduce) {
-    super(conf, map, reduce);
-    this.filename = filename;
-    this.asTypename = typename;
-    this.classname = classname;
-  }
-
-  public Object operate() throws IOException {
-    throw new UnsupportedOperationException("*load* is not supported now.");
-  }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.shell.execution;
+
+import java.io.IOException;
+
+import org.apache.hama.HamaConfiguration;
+
+/**
+ * Load Matrix from a file in HDFS.
+ * 
+ * A = load 'file' as matrix using 'class' ;
+ *
+ */
+public class LoadOperation extends HamaOperation {
+
+  // unsupported now.
+//  String filename;
+//  String classname;
+  
+  public LoadOperation(HamaConfiguration conf, String filename, String typename, 
+      String classname) {
+    super(conf);
+//    this.filename = filename;
+//    this.classname = classname;
+  }
+  
+  public LoadOperation(HamaConfiguration conf, String filename, String typename, 
+      String classname, int map, int reduce) {
+    super(conf, map, reduce);
+//    this.filename = filename;
+//    this.classname = classname;
+  }
+
+  public Object operate() throws IOException {
+    throw new UnsupportedOperationException("*load* is not supported now.");
+  }
+
+}



Mime
View raw message