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 2010/06/01 04:57:54 UTC
svn commit: r949916 - in /incubator/hama/trunk: CHANGES.txt build.xml
lib/UmlGraph.jar src/java/org/apache/hama/util/ClusterUtil.java
Author: edwardyoon
Date: Tue Jun 1 02:57:54 2010
New Revision: 949916
URL: http://svn.apache.org/viewvc?rev=949916&view=rev
Log:
Add Ant target to generate the UML class diagrams
Added:
incubator/hama/trunk/lib/UmlGraph.jar (with props)
Modified:
incubator/hama/trunk/CHANGES.txt
incubator/hama/trunk/build.xml
incubator/hama/trunk/src/java/org/apache/hama/util/ClusterUtil.java
Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=949916&r1=949915&r2=949916&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Tue Jun 1 02:57:54 2010
@@ -4,6 +4,7 @@ Trunk (unreleased changes)
NEW FEATURES
+ HAMA-266: Add Ant target to generate the UML class diagrams (edwardyoon)
HAMA-209: Add example for Cosine Similarity Matrix (edwardyoon)
HAMA-195: Interface of the bsp (hyunsik via edwardyoon)
HAMA-185: Finds the eigenvalues and eigenvectors
Modified: incubator/hama/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/build.xml?rev=949916&r1=949915&r2=949916&view=diff
==============================================================================
--- incubator/hama/trunk/build.xml (original)
+++ incubator/hama/trunk/build.xml Tue Jun 1 02:57:54 2010
@@ -98,7 +98,7 @@
</copy>
</target>
- <!-- ================================================================== -->
+ <!-- ================================================================== -->
<!-- Java Compiler Compiler, generate Parsers -->
<!-- ================================================================== -->
@@ -106,7 +106,7 @@
<!--Compile whats under src and generated java classes made from jsp-->
<mkdir dir="${build.src}" />
<javac encoding="${build.encoding}"
- srcdir="${src.dir};${build.src};${src.examples}" includes="**/*.java"
+ srcdir="${src.dir};${build.src};${src.examples}" includes="**/*.java"
destdir="${build.classes}" debug="${javac.debug}"
deprecation="${javac.deprecation}">
<classpath refid="classpath" />
@@ -244,7 +244,25 @@
</javadoc>
</target>
- <!-- ================================================================== -->
+ <!-- Javadoc with UML diagrams -->
+ <target name="javadocs" depends="compile">
+ <javadoc sourcepath="${src.dir}" packagenames="org.apache.hama.*" destdir="${build.javadoc}" private="true">
+ <doclet name="org.umlgraph.doclet.UmlGraphDoc" path="${lib.dir}/UmlGraph.jar">
+ <param name="-inferrel"/>
+ <param name="-inferdep"/>
+ <param name="-hide" value="java.*"/>
+ <param name="-collpackages" value="java.util.*"/>
+ <param name="-qualify"/>
+ <param name="-postfixpackage"/>
+ <param name="-nodefontsize" value="9"/>
+ <param name="-nodefontpackagesize" value="7"/>
+ <param name="-link" value="http://java.sun.com/j2se/1.5.0/docs/guide/javadoc/doclet/spec"/>
+ <param name="-link" value="http://java.sun.com/j2se/1.5/docs/api"/>
+ </doclet>
+ </javadoc>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Run unit tests -->
<!-- ================================================================== -->
<path id="test.classpath">
Added: incubator/hama/trunk/lib/UmlGraph.jar
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/lib/UmlGraph.jar?rev=949916&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/hama/trunk/lib/UmlGraph.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=949916&r1=949915&r2=949916&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 Tue Jun 1 02:57:54 2010
@@ -4,14 +4,13 @@ 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.bsp.BSPMaster;
import org.apache.hama.bsp.GroomServer;
+import org.apache.log4j.Logger;
public class ClusterUtil {
- public static final Log LOG = LogFactory.getLog(ClusterUtil.class);
-
+ static final Logger LOG = Logger.getLogger(ClusterUtil.class);
/**
* Data Structure to hold GroomServer Thread and GroomServer instance
*/