incubator-hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r1151771 [1/3] - in /incubator/hama/trunk: ./ bin/ conf/ src/docs/ src/docs/src/documentation/ src/docs/src/documentation/classes/ src/docs/src/documentation/content/xdocs/ src/docs/src/documentation/content/xdocs/docs/r0.2.0/ src/docs/src/...
Date Thu, 28 Jul 2011 09:28:10 GMT
Author: edwardyoon
Date: Thu Jul 28 09:28:02 2011
New Revision: 1151771

URL: http://svn.apache.org/viewvc?rev=1151771&view=rev
Log:
Incorrect or missing SVN property settings

Modified:
    incubator/hama/trunk/CHANGES.txt   (props changed)
    incubator/hama/trunk/DISCLAIMER.txt   (props changed)
    incubator/hama/trunk/LICENSE.txt   (props changed)
    incubator/hama/trunk/NOTICE.txt   (props changed)
    incubator/hama/trunk/README.txt   (props changed)
    incubator/hama/trunk/bin/grooms.sh   (props changed)
    incubator/hama/trunk/bin/hama-config.sh   (props changed)
    incubator/hama/trunk/bin/hama-daemon.sh   (props changed)
    incubator/hama/trunk/bin/hama-daemons.sh   (props changed)
    incubator/hama/trunk/bin/start-bspd.sh   (props changed)
    incubator/hama/trunk/bin/stop-bspd.sh   (props changed)
    incubator/hama/trunk/bin/zookeepers.sh   (props changed)
    incubator/hama/trunk/conf/hama-default.xml   (props changed)
    incubator/hama/trunk/conf/log4j.properties   (props changed)
    incubator/hama/trunk/pom.xml   (props changed)
    incubator/hama/trunk/src/docs/forrest.properties   (props changed)
    incubator/hama/trunk/src/docs/src/documentation/classes/CatalogManager.properties   (props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/developers.xml   (props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/docs/r0.2.0/index.xml   (props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/docs/r0.3.0/index.xml   (props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/downloads.xml   (props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/index.xml   (contents, props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/irc_channel.xml   (contents, props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/issue_tracking.xml   (contents, props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/mailing_lists.xml   (props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/privacy_policy.xml   (props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/site.xml   (contents, props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/tabs.xml   (props changed)
    incubator/hama/trunk/src/docs/src/documentation/content/xdocs/who_we_are.xml   (props changed)
    incubator/hama/trunk/src/docs/src/documentation/resources/images/favicon.ico   (props changed)
    incubator/hama/trunk/src/docs/src/documentation/skinconf.xml   (props changed)
    incubator/hama/trunk/src/docs/status.xml   (props changed)
    incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java   (props changed)
    incubator/hama/trunk/src/examples/org/apache/hama/examples/PiEstimator.java   (props changed)
    incubator/hama/trunk/src/examples/org/apache/hama/examples/RandBench.java   (props changed)
    incubator/hama/trunk/src/examples/org/apache/hama/examples/SerializePrinting.java   (props changed)
    incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRank.java   (contents, props changed)
    incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankBase.java   (contents, props changed)
    incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankVertex.java   (contents, props changed)
    incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPathVertex.java   (props changed)
    incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPaths.java   (contents, props changed)
    incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPathsBase.java   (props changed)
    incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPathsGraphLoader.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/BSPMasterRunner.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/Constants.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/GroomServerRunner.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/HamaConfiguration.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/MiniZooKeeperCluster.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/ZooKeeperRunner.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSP.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPInterface.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJob.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobClient.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobContext.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPJobID.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPMaster.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPMessage.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPMessageBundle.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPPeer.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPPeerInterface.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPTask.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPTaskRunner.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BooleanMessage.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/ByteMessage.java   (contents, props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/ClusterStatus.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/CommitTaskAction.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/Directive.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/DirectiveException.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/DirectiveHandler.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/DispatchTasksDirective.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/DoubleMessage.java   (contents, props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/FCFSQueue.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/GroomServer.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/GroomServerAction.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/GroomServerManager.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/GroomServerStatus.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/ID.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/IntegerDoubleMessage.java   (contents, props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/IntegerMessage.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/JobChangeEvent.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/JobInProgress.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/JobInProgressListener.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/JobProfile.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/JobStatus.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/KillJobAction.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/KillTaskAction.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/LaunchTaskAction.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/LocalBSPRunner.java   (contents, props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/Messagable.java   (contents, props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/PeerNames.java   (contents, props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/Queue.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/QueueManager.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/ReinitGroomAction.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/ReportGroomStatusDirective.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/RunningJob.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/Schedulable.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/SimpleTaskScheduler.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/Task.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskAttemptContext.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskAttemptID.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskID.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskInProgress.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskLog.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskLogAppender.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskRunner.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskScheduler.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/TaskStatus.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/bsp/package.html   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/http/HttpServer.java   (contents, props changed)
    incubator/hama/trunk/src/java/org/apache/hama/http/package.html   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/ipc/BSPPeerProtocol.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/ipc/GroomProtocol.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/ipc/HamaRPCProtocolVersion.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/ipc/JobSubmissionProtocol.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/ipc/MasterProtocol.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/ipc/package.html   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/package.html   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/util/BSPServletUtil.java   (contents, props changed)
    incubator/hama/trunk/src/java/org/apache/hama/util/Bytes.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/util/ClusterUtil.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/util/RandomVariable.java   (contents, props changed)
    incubator/hama/trunk/src/java/org/apache/hama/util/RunJar.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/util/VersionInfo.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/util/package.html   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/zookeeper/QuorumPeer.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/zookeeper/ZKServerTool.java   (props changed)
    incubator/hama/trunk/src/java/org/apache/hama/zookeeper/package.html   (props changed)
    incubator/hama/trunk/src/java/overview.html   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/HamaCluster.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/HamaClusterTestCase.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/HamaTestCase.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/MiniBSPCluster.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/bsp/TestBSPMasterGroomServer.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/bsp/TestBSPMessageBundle.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/bsp/TestClusterStatus.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/bsp/TestMessages.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/ipc/TestIPC.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/ipc/TestRPC.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/util/TestBytes.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/util/TestNumeric.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/util/TestRandomVariable.java   (props changed)
    incubator/hama/trunk/src/test/org/apache/hama/zookeeper/TestZKTools.java   (props changed)
    incubator/hama/trunk/src/test/testjar/ClassSerializePrinting.java   (props changed)
    incubator/hama/trunk/src/webapps/bspmaster/bspjob.jsp   (contents, props changed)
    incubator/hama/trunk/src/webapps/bspmaster/bspmaster.jsp   (contents, props changed)
    incubator/hama/trunk/src/webapps/bspmaster/index.html   (contents, props changed)
    incubator/hama/trunk/src/webapps/bspmaster/machines.jsp   (contents, props changed)

Propchange: incubator/hama/trunk/CHANGES.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/DISCLAIMER.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/bin/grooms.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: incubator/hama/trunk/bin/hama-config.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: incubator/hama/trunk/bin/hama-daemon.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: incubator/hama/trunk/bin/hama-daemons.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: incubator/hama/trunk/bin/start-bspd.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: incubator/hama/trunk/bin/stop-bspd.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: incubator/hama/trunk/bin/zookeepers.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: incubator/hama/trunk/conf/hama-default.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/conf/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/forrest.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/src/documentation/classes/CatalogManager.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/developers.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/docs/r0.2.0/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/docs/r0.3.0/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/downloads.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/docs/src/documentation/content/xdocs/index.xml?rev=1151771&r1=1151770&r2=1151771&view=diff
==============================================================================
--- incubator/hama/trunk/src/docs/src/documentation/content/xdocs/index.xml (original)
+++ incubator/hama/trunk/src/docs/src/documentation/content/xdocs/index.xml Thu Jul 28 09:28:02 2011
@@ -23,7 +23,7 @@
   <header>
     <title>Welcome to Hama project</title>
   </header>
-  <body>
+  <body>
      <section>
       <title> Overview </title>
       <p>
@@ -56,7 +56,7 @@
         <li><a href="http://wiki.apache.org/hama/Jira">Jira usage guidelines</a></li>
       </ul>
     </section>
-    
+   
     <section>
     <title>Recent News</title>
        <section>
@@ -86,6 +86,6 @@
        <p>The Incubator PMC have voted to accept Hama to be a Apache incubator project.</p>
        </section>
     </section>
-    
+  
   </body>
 </document>

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/irc_channel.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/docs/src/documentation/content/xdocs/irc_channel.xml?rev=1151771&r1=1151770&r2=1151771&view=diff
==============================================================================
--- incubator/hama/trunk/src/docs/src/documentation/content/xdocs/irc_channel.xml (original)
+++ incubator/hama/trunk/src/docs/src/documentation/content/xdocs/irc_channel.xml Thu Jul 28 09:28:02 2011
@@ -1,46 +1,46 @@
-<?xml version="1.0"?>
-<!--
-  Copyright 2002-2004 The Apache Software Foundation
-
-  Licensed 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.
--->
-
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
-"http://forrest.apache.org/dtd/document-v20.dtd">
-
-<document>
-  
-  <header>
-    <title>IRC Channel</title>
-  </header>
-  
-  <body>
-
-    <section>
-    <title>IRC Channel</title>
-    <p>
-    There is an IRC channel dedicated to Hama at irc.freenode.org. 
-    The name of the channel is #hama. 
-    <br /><br />
-    The IRC channel can be used for online discussion about hama related stuff, 
-    but developers should be careful to transfer all the official decisions 
-    or useful discussions to the <a href="./issue_tracking.html">issue tracking 
-    </a>system. 
-    </p>
-    <ul>
-      <li><a href="http://www.xchat.org/">XChat: Multiplatform Chat Program</a>
-      </li>
-    </ul>
-  </section>
-  </body>
-</document>
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation
+
+  Licensed 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.
+-->
+
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
+"http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+  
+  <header>
+    <title>IRC Channel</title>
+  </header>
+  
+  <body>
+
+    <section>
+    <title>IRC Channel</title>
+    <p>
+    There is an IRC channel dedicated to Hama at irc.freenode.org. 
+    The name of the channel is #hama. 
+    <br /><br />
+    The IRC channel can be used for online discussion about hama related stuff, 
+    but developers should be careful to transfer all the official decisions 
+    or useful discussions to the <a href="./issue_tracking.html">issue tracking 
+    </a>system. 
+    </p>
+    <ul>
+      <li><a href="http://www.xchat.org/">XChat: Multiplatform Chat Program</a>
+      </li>
+    </ul>
+  </section>
+  </body>
+</document>

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/irc_channel.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/issue_tracking.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/docs/src/documentation/content/xdocs/issue_tracking.xml?rev=1151771&r1=1151770&r2=1151771&view=diff
==============================================================================
--- incubator/hama/trunk/src/docs/src/documentation/content/xdocs/issue_tracking.xml (original)
+++ incubator/hama/trunk/src/docs/src/documentation/content/xdocs/issue_tracking.xml Thu Jul 28 09:28:02 2011
@@ -24,21 +24,21 @@
     <title>Issue Tracking</title>
   </header>
   
-  <body>
+  <body>
 
-    <section>
-    <title>Issue Tracking</title>
-    <p>
-    Hama tracks both bugs and enhancement requests 
-    <a href="https://issues.apache.org/jira/browse/HAMA">here</a> using Apache JIRA. 
-    We welcome input, however, before filing a request, 
-    please make sure you do the following: 
-    </p>
-    <ul>
-      <li>Search the JIRA database.</li>
-      <li>Check the user <a href="./mailing_lists.html">mailing list</a>, 
-      both by searching the archives and by asking questions.</li>
-    </ul>
-  </section>
+    <section>
+    <title>Issue Tracking</title>
+    <p>
+    Hama tracks both bugs and enhancement requests 
+    <a href="https://issues.apache.org/jira/browse/HAMA">here</a> using Apache JIRA. 
+    We welcome input, however, before filing a request, 
+    please make sure you do the following: 
+    </p>
+    <ul>
+      <li>Search the JIRA database.</li>
+      <li>Check the user <a href="./mailing_lists.html">mailing list</a>, 
+      both by searching the archives and by asking questions.</li>
+    </ul>
+  </section>
   </body>
 </document>

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/issue_tracking.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/mailing_lists.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/privacy_policy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/docs/src/documentation/content/xdocs/site.xml?rev=1151771&r1=1151770&r2=1151771&view=diff
==============================================================================
--- incubator/hama/trunk/src/docs/src/documentation/content/xdocs/site.xml (original)
+++ incubator/hama/trunk/src/docs/src/documentation/content/xdocs/site.xml Thu Jul 28 09:28:02 2011
@@ -46,7 +46,7 @@ See http://forrest.apache.org/docs/linki
   <docs label="Resources">
     <developers label="Developers"     href="developers.html" />
     <issues     label="Issue Tracking" href="issue_tracking.html" />
-    <lists      label="Mailing Lists"  href="mailing_lists.html" />
+    <lists      label="Mailing Lists"  href="mailing_lists.html" />
     <irc        label="IRC channel"    href="irc_channel.html" />
   </docs>
 

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/tabs.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/src/documentation/content/xdocs/who_we_are.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/src/documentation/resources/images/favicon.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: incubator/hama/trunk/src/docs/src/documentation/skinconf.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/docs/status.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/examples/org/apache/hama/examples/PiEstimator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/examples/org/apache/hama/examples/RandBench.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/examples/org/apache/hama/examples/SerializePrinting.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRank.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRank.java?rev=1151771&r1=1151770&r2=1151771&view=diff
==============================================================================
--- incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRank.java (original)
+++ incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRank.java Thu Jul 28 09:28:02 2011
@@ -1,251 +1,251 @@
-/**
- * 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.examples.graph;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hama.HamaConfiguration;
-import org.apache.hama.bsp.BSPJob;
-import org.apache.hama.bsp.BSPJobClient;
-import org.apache.hama.bsp.BSPPeer;
-import org.apache.hama.bsp.ClusterStatus;
-import org.apache.hama.bsp.DoubleMessage;
-import org.apache.zookeeper.KeeperException;
-
-public class PageRank extends PageRankBase {
-  public static final Log LOG = LogFactory.getLog(PageRank.class);
-
-  private Configuration conf;
-
-  private HashMap<PageRankVertex, List<PageRankVertex>> adjacencyList;
-  private final HashMap<String, PageRankVertex> lookupMap = new HashMap<String, PageRankVertex>();
-  private final HashMap<PageRankVertex, Double> tentativePagerank = new HashMap<PageRankVertex, Double>();
-  // backup of the last pagerank to determine the error
-  private final HashMap<PageRankVertex, Double> lastTentativePagerank = new HashMap<PageRankVertex, Double>();
-  private String[] peerNames;
-
-  @Override
-  public void bsp(BSPPeer peer) throws IOException, KeeperException,
-      InterruptedException {
-    String master = conf.get(MASTER_TASK);
-    // setup the datasets
-    adjacencyList = PageRankBase.mapAdjacencyList(getConf(), peer);
-    // init the pageranks to 1/n where n is the number of all vertices
-    for (PageRankVertex vertex : adjacencyList.keySet()) {
-      tentativePagerank.put(vertex, Double.valueOf(1.0 / numOfVertices));
-      lookupMap.put(vertex.getUrl(), vertex);
-    }
-    // while the error not converges against epsilon do the pagerank stuff
-    double error = 1.0;
-    int iteration = 0;
-    // if MAX_ITERATIONS are set to 0, ignore the iterations and just go
-    // with the error
-    while ((MAX_ITERATIONS > 0 && iteration < MAX_ITERATIONS)
-        || error >= EPSILON) {
-      peer.sync();
-
-      if (iteration >= 1) {
-        // copy the old pagerank to the backup
-        copyTentativePageRankToBackup();
-        // sum up all incoming messages for a vertex
-        HashMap<PageRankVertex, Double> sumMap = new HashMap<PageRankVertex, Double>();
-        DoubleMessage msg = null;
-        while ((msg = (DoubleMessage) peer.getCurrentMessage()) != null) {
-          PageRankVertex k = lookupMap.get(msg.getTag());
-          if (!sumMap.containsKey(k)) {
-            sumMap.put(k, msg.getData());
-          } else {
-            sumMap.put(k, msg.getData() + sumMap.get(k));
-          }
-        }
-        // pregel formula:
-        // ALPHA = 0.15 / NumVertices()
-        // P(i) = ALPHA + 0.85 * sum
-        for (Entry<PageRankVertex, Double> entry : sumMap.entrySet()) {
-          tentativePagerank.put(entry.getKey(), ALPHA
-              + (entry.getValue() * DAMPING_FACTOR));
-        }
-
-        // determine the error and send this to the master
-        double err = determineError();
-        error = broadcastError(peer, master, err);
-      }
-      // in every step send the tentative pagerank of a vertex to its
-      // adjacent vertices
-      for (PageRankVertex vertex : adjacencyList.keySet()) {
-        sendMessageToNeighbors(peer, vertex);
-      }
-
-      iteration++;
-    }
-
-    // Clears all queues entries.
-    peer.clear();
-    // finally save the chunk of pageranks
-    PageRankBase.savePageRankMap(peer, conf, lastTentativePagerank);
-    LOG.info("Finished with iteration " + iteration + "!");
-  }
-
-  private double broadcastError(BSPPeer peer, String master,
-      double error) throws IOException, KeeperException, InterruptedException {
-    peer.send(master, new DoubleMessage("", error));
-    peer.sync();
-    if (peer.getPeerName().equals(master)) {
-      double errorSum = 0.0;
-      int count = 0;
-      DoubleMessage message;
-      while ((message = (DoubleMessage) peer.getCurrentMessage()) != null) {
-        errorSum += message.getData();
-        count++;
-      }
-      double avgError = errorSum / (double) count;
-      // LOG.info("Average error: " + avgError);
-      for (String name : peer.getAllPeerNames()) {
-        peer.send(name, new DoubleMessage("", avgError));
-      }
-    }
-
-    peer.sync();
-    DoubleMessage message = (DoubleMessage) peer.getCurrentMessage();
-    return message.getData();
-  }
-
-  private double determineError() {
-    double error = 0.0;
-    for (Entry<PageRankVertex, Double> entry : tentativePagerank.entrySet()) {
-      error += Math.abs(lastTentativePagerank.get(entry.getKey())
-          - entry.getValue());
-    }
-    return error;
-  }
-
-  private void copyTentativePageRankToBackup() {
-    for (Entry<PageRankVertex, Double> entry : tentativePagerank.entrySet()) {
-      lastTentativePagerank.put(entry.getKey(), entry.getValue());
-    }
-  }
-
-  private void sendMessageToNeighbors(BSPPeer peer, PageRankVertex v)
-      throws IOException {
-    List<PageRankVertex> outgoingEdges = adjacencyList.get(v);
-    for (PageRankVertex adjacent : outgoingEdges) {
-      int mod = Math.abs(adjacent.getId() % peerNames.length);
-      // send a message of the tentative pagerank divided by the size of
-      // the outgoing edges to all adjacents
-      peer.send(peerNames[mod], new DoubleMessage(adjacent.getUrl(),
-          tentativePagerank.get(v) / outgoingEdges.size()));
-    }
-  }
-
-  @Override
-  public void setConf(Configuration conf) {
-    this.conf = conf;
-    numOfVertices = Integer.parseInt(conf.get("num.vertices"));
-    DAMPING_FACTOR = Double.parseDouble(conf.get("damping.factor"));
-    ALPHA = (1 - DAMPING_FACTOR) / (double) numOfVertices;
-    EPSILON = Double.parseDouble(conf.get("epsilon.error"));
-    MAX_ITERATIONS = Integer.parseInt(conf.get("max.iterations"));
-    peerNames = conf.get(ShortestPaths.BSP_PEERS).split(";");
-  }
-
-  @Override
-  public Configuration getConf() {
-    return conf;
-  }
-
-  public static void printUsage() {
-    System.out.println("PageRank Example:");
-    System.out
-        .println("<damping factor> <epsilon error> <optional: output path> <optional: input path>");
-  }
-
-  public static void main(String[] args) throws IOException,
-      InterruptedException, ClassNotFoundException {
-    if (args.length == 0) {
-      printUsage();
-      System.exit(-1);
-    }
-
-    HamaConfiguration conf = new HamaConfiguration(new Configuration());
-    // set the defaults
-    conf.set("damping.factor", "0.85");
-    conf.set("epsilon.error", "0.000001");
-
-    if (args.length < 2) {
-      System.out.println("You have to provide a damping factor and an error!");
-      System.out.println("Try using 0.85 0.001 as parameter!");
-      System.exit(-1);
-    } else {
-      conf.set("damping.factor", args[0]);
-      conf.set("epsilon.error", args[1]);
-      LOG.info("Set damping factor to " + args[0]);
-      LOG.info("Set epsilon error to " + args[1]);
-      if (args.length > 2) {
-        conf.set("out.path", args[2]);
-        LOG.info("Set output path to " + args[2]);
-        if (args.length == 4) {
-          conf.set("in.path", args[3]);
-          LOG.info("Using custom input at " + args[3]);
-        } else {
-          LOG.info("Running default example graph!");
-        }
-      } else {
-        conf.set("out.path", "pagerank/output");
-        LOG.info("Set output path to default of pagerank/output!");
-      }
-    }
-
-    BSPJobClient jobClient = new BSPJobClient(conf);
-    ClusterStatus cluster = jobClient.getClusterStatus(true);
-    StringBuilder sb = new StringBuilder();
-    for (String peerName : cluster.getActiveGroomNames().values()) {
-      conf.set(MASTER_TASK, peerName);
-      sb.append(peerName + ";");
-    }
-
-    // put every peer into the configuration
-    conf.set(ShortestPaths.BSP_PEERS, sb.toString());
-    // leave the iterations on default
-    conf.set("max.iterations", "0");
-
-    if (conf.get("in.path") == null) {
-      conf = PageRankBase
-          .partitionExample(new Path(conf.get("out.path")), conf);
-    } else {
-      conf = PageRankBase
-          .partitionTextFile(new Path(conf.get("in.path")), conf);
-    }
-
-    BSPJob job = new BSPJob(conf);
-    job.setNumBspTask(cluster.getGroomServers());
-    job.setBspClass(PageRank.class);
-    job.setJarByClass(PageRank.class);
-    job.setJobName("Pagerank");
-    if (job.waitForCompletion(true)) {
-      PageRankBase.printOutput(FileSystem.get(conf), conf);
-    }
-  }
-}
+/**
+ * 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.examples.graph;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map.Entry;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hama.HamaConfiguration;
+import org.apache.hama.bsp.BSPJob;
+import org.apache.hama.bsp.BSPJobClient;
+import org.apache.hama.bsp.BSPPeer;
+import org.apache.hama.bsp.ClusterStatus;
+import org.apache.hama.bsp.DoubleMessage;
+import org.apache.zookeeper.KeeperException;
+
+public class PageRank extends PageRankBase {
+  public static final Log LOG = LogFactory.getLog(PageRank.class);
+
+  private Configuration conf;
+
+  private HashMap<PageRankVertex, List<PageRankVertex>> adjacencyList;
+  private final HashMap<String, PageRankVertex> lookupMap = new HashMap<String, PageRankVertex>();
+  private final HashMap<PageRankVertex, Double> tentativePagerank = new HashMap<PageRankVertex, Double>();
+  // backup of the last pagerank to determine the error
+  private final HashMap<PageRankVertex, Double> lastTentativePagerank = new HashMap<PageRankVertex, Double>();
+  private String[] peerNames;
+
+  @Override
+  public void bsp(BSPPeer peer) throws IOException, KeeperException,
+      InterruptedException {
+    String master = conf.get(MASTER_TASK);
+    // setup the datasets
+    adjacencyList = PageRankBase.mapAdjacencyList(getConf(), peer);
+    // init the pageranks to 1/n where n is the number of all vertices
+    for (PageRankVertex vertex : adjacencyList.keySet()) {
+      tentativePagerank.put(vertex, Double.valueOf(1.0 / numOfVertices));
+      lookupMap.put(vertex.getUrl(), vertex);
+    }
+    // while the error not converges against epsilon do the pagerank stuff
+    double error = 1.0;
+    int iteration = 0;
+    // if MAX_ITERATIONS are set to 0, ignore the iterations and just go
+    // with the error
+    while ((MAX_ITERATIONS > 0 && iteration < MAX_ITERATIONS)
+        || error >= EPSILON) {
+      peer.sync();
+
+      if (iteration >= 1) {
+        // copy the old pagerank to the backup
+        copyTentativePageRankToBackup();
+        // sum up all incoming messages for a vertex
+        HashMap<PageRankVertex, Double> sumMap = new HashMap<PageRankVertex, Double>();
+        DoubleMessage msg = null;
+        while ((msg = (DoubleMessage) peer.getCurrentMessage()) != null) {
+          PageRankVertex k = lookupMap.get(msg.getTag());
+          if (!sumMap.containsKey(k)) {
+            sumMap.put(k, msg.getData());
+          } else {
+            sumMap.put(k, msg.getData() + sumMap.get(k));
+          }
+        }
+        // pregel formula:
+        // ALPHA = 0.15 / NumVertices()
+        // P(i) = ALPHA + 0.85 * sum
+        for (Entry<PageRankVertex, Double> entry : sumMap.entrySet()) {
+          tentativePagerank.put(entry.getKey(), ALPHA
+              + (entry.getValue() * DAMPING_FACTOR));
+        }
+
+        // determine the error and send this to the master
+        double err = determineError();
+        error = broadcastError(peer, master, err);
+      }
+      // in every step send the tentative pagerank of a vertex to its
+      // adjacent vertices
+      for (PageRankVertex vertex : adjacencyList.keySet()) {
+        sendMessageToNeighbors(peer, vertex);
+      }
+
+      iteration++;
+    }
+
+    // Clears all queues entries.
+    peer.clear();
+    // finally save the chunk of pageranks
+    PageRankBase.savePageRankMap(peer, conf, lastTentativePagerank);
+    LOG.info("Finished with iteration " + iteration + "!");
+  }
+
+  private double broadcastError(BSPPeer peer, String master,
+      double error) throws IOException, KeeperException, InterruptedException {
+    peer.send(master, new DoubleMessage("", error));
+    peer.sync();
+    if (peer.getPeerName().equals(master)) {
+      double errorSum = 0.0;
+      int count = 0;
+      DoubleMessage message;
+      while ((message = (DoubleMessage) peer.getCurrentMessage()) != null) {
+        errorSum += message.getData();
+        count++;
+      }
+      double avgError = errorSum / (double) count;
+      // LOG.info("Average error: " + avgError);
+      for (String name : peer.getAllPeerNames()) {
+        peer.send(name, new DoubleMessage("", avgError));
+      }
+    }
+
+    peer.sync();
+    DoubleMessage message = (DoubleMessage) peer.getCurrentMessage();
+    return message.getData();
+  }
+
+  private double determineError() {
+    double error = 0.0;
+    for (Entry<PageRankVertex, Double> entry : tentativePagerank.entrySet()) {
+      error += Math.abs(lastTentativePagerank.get(entry.getKey())
+          - entry.getValue());
+    }
+    return error;
+  }
+
+  private void copyTentativePageRankToBackup() {
+    for (Entry<PageRankVertex, Double> entry : tentativePagerank.entrySet()) {
+      lastTentativePagerank.put(entry.getKey(), entry.getValue());
+    }
+  }
+
+  private void sendMessageToNeighbors(BSPPeer peer, PageRankVertex v)
+      throws IOException {
+    List<PageRankVertex> outgoingEdges = adjacencyList.get(v);
+    for (PageRankVertex adjacent : outgoingEdges) {
+      int mod = Math.abs(adjacent.getId() % peerNames.length);
+      // send a message of the tentative pagerank divided by the size of
+      // the outgoing edges to all adjacents
+      peer.send(peerNames[mod], new DoubleMessage(adjacent.getUrl(),
+          tentativePagerank.get(v) / outgoingEdges.size()));
+    }
+  }
+
+  @Override
+  public void setConf(Configuration conf) {
+    this.conf = conf;
+    numOfVertices = Integer.parseInt(conf.get("num.vertices"));
+    DAMPING_FACTOR = Double.parseDouble(conf.get("damping.factor"));
+    ALPHA = (1 - DAMPING_FACTOR) / (double) numOfVertices;
+    EPSILON = Double.parseDouble(conf.get("epsilon.error"));
+    MAX_ITERATIONS = Integer.parseInt(conf.get("max.iterations"));
+    peerNames = conf.get(ShortestPaths.BSP_PEERS).split(";");
+  }
+
+  @Override
+  public Configuration getConf() {
+    return conf;
+  }
+
+  public static void printUsage() {
+    System.out.println("PageRank Example:");
+    System.out
+        .println("<damping factor> <epsilon error> <optional: output path> <optional: input path>");
+  }
+
+  public static void main(String[] args) throws IOException,
+      InterruptedException, ClassNotFoundException {
+    if (args.length == 0) {
+      printUsage();
+      System.exit(-1);
+    }
+
+    HamaConfiguration conf = new HamaConfiguration(new Configuration());
+    // set the defaults
+    conf.set("damping.factor", "0.85");
+    conf.set("epsilon.error", "0.000001");
+
+    if (args.length < 2) {
+      System.out.println("You have to provide a damping factor and an error!");
+      System.out.println("Try using 0.85 0.001 as parameter!");
+      System.exit(-1);
+    } else {
+      conf.set("damping.factor", args[0]);
+      conf.set("epsilon.error", args[1]);
+      LOG.info("Set damping factor to " + args[0]);
+      LOG.info("Set epsilon error to " + args[1]);
+      if (args.length > 2) {
+        conf.set("out.path", args[2]);
+        LOG.info("Set output path to " + args[2]);
+        if (args.length == 4) {
+          conf.set("in.path", args[3]);
+          LOG.info("Using custom input at " + args[3]);
+        } else {
+          LOG.info("Running default example graph!");
+        }
+      } else {
+        conf.set("out.path", "pagerank/output");
+        LOG.info("Set output path to default of pagerank/output!");
+      }
+    }
+
+    BSPJobClient jobClient = new BSPJobClient(conf);
+    ClusterStatus cluster = jobClient.getClusterStatus(true);
+    StringBuilder sb = new StringBuilder();
+    for (String peerName : cluster.getActiveGroomNames().values()) {
+      conf.set(MASTER_TASK, peerName);
+      sb.append(peerName + ";");
+    }
+
+    // put every peer into the configuration
+    conf.set(ShortestPaths.BSP_PEERS, sb.toString());
+    // leave the iterations on default
+    conf.set("max.iterations", "0");
+
+    if (conf.get("in.path") == null) {
+      conf = PageRankBase
+          .partitionExample(new Path(conf.get("out.path")), conf);
+    } else {
+      conf = PageRankBase
+          .partitionTextFile(new Path(conf.get("in.path")), conf);
+    }
+
+    BSPJob job = new BSPJob(conf);
+    job.setNumBspTask(cluster.getGroomServers());
+    job.setBspClass(PageRank.class);
+    job.setJarByClass(PageRank.class);
+    job.setJobName("Pagerank");
+    if (job.waitForCompletion(true)) {
+      PageRankBase.printOutput(FileSystem.get(conf), conf);
+    }
+  }
+}

Propchange: incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRank.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankBase.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankBase.java?rev=1151771&r1=1151770&r2=1151771&view=diff
==============================================================================
--- incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankBase.java (original)
+++ incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankBase.java Thu Jul 28 09:28:02 2011
@@ -1,236 +1,236 @@
-/**
- * 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.examples.graph;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.DoubleWritable;
-import org.apache.hadoop.io.SequenceFile;
-import org.apache.hadoop.io.Text;
-import org.apache.hama.HamaConfiguration;
-import org.apache.hama.bsp.BSP;
-import org.apache.hama.bsp.BSPPeer;
-
-public abstract class PageRankBase extends BSP {
-  public static final Log LOG = LogFactory.getLog(PageRankBase.class);
-
-  protected static int MAX_ITERATIONS = 30;
-  protected static final String MASTER_TASK = "master.groom";
-  protected static double ALPHA;
-  protected static int numOfVertices;
-  protected static double DAMPING_FACTOR = 0.85;
-  protected static double EPSILON = 0.001;
-
-  static HashMap<PageRankVertex, List<PageRankVertex>> mapAdjacencyList(
-      Configuration conf, BSPPeer peer) throws FileNotFoundException,
-      IOException {
-    FileSystem fs = FileSystem.get(conf);
-    HashMap<PageRankVertex, List<PageRankVertex>> adjacencyList = new HashMap<PageRankVertex, List<PageRankVertex>>();
-    Path p = new Path(conf.get("in.path." + peer.getPeerName().split(":")[0]));
-    LOG.info(p.toString());
-    SequenceFile.Reader reader = new SequenceFile.Reader(fs, p, conf);
-    Text key = new Text();
-    Text value = new Text();
-    while (reader.next(key, value)) {
-      PageRankVertex k = new PageRankVertex(key.toString());
-      PageRankVertex v = new PageRankVertex(value.toString());
-      if (!adjacencyList.containsKey(k)) {
-        adjacencyList.put(k, new LinkedList<PageRankVertex>());
-        adjacencyList.get(k).add(v);
-      } else {
-        adjacencyList.get(k).add(v);
-      }
-    }
-    reader.close();
-    return adjacencyList;
-  }
-
-  static HamaConfiguration partitionExample(Path out, HamaConfiguration conf)
-      throws IOException {
-
-    String[] groomNames = conf.get(ShortestPaths.BSP_PEERS).split(";");
-    int sizeOfCluster = groomNames.length;
-
-    // setup the paths where the grooms can find their input
-    List<Path> partPaths = new ArrayList<Path>(sizeOfCluster);
-    List<SequenceFile.Writer> writers = new ArrayList<SequenceFile.Writer>(
-        sizeOfCluster);
-    FileSystem fs = FileSystem.get(conf);
-    for (String entry : groomNames) {
-      partPaths.add(new Path(out.getParent().toString() + Path.SEPARATOR
-          + ShortestPaths.PARTED + Path.SEPARATOR
-          + entry.split(ShortestPaths.NAME_VALUE_SEPARATOR)[0]));
-    }
-    // create a seq writer for that
-    for (Path p : partPaths) {
-      // LOG.info(p.toString());
-      fs.delete(p, true);
-      writers.add(SequenceFile
-          .createWriter(fs, conf, p, Text.class, Text.class));
-    }
-
-    /**
-     * 1:twitter.com <br/>
-     * 2:google.com <br/>
-     * 3:facebook.com <br/>
-     * 4:yahoo.com <br/>
-     * 5:nasa.gov <br/>
-     * 6:stackoverflow.com <br/>
-     * 7:youtube.com
-     */
-
-    String[] realNames = new String[] { null, "twitter.com", "google.com",
-        "facebook.com", "yahoo.com", "nasa.gov", "stackoverflow.com",
-        "youtube.com" };
-
-    String[] lineArray = new String[] { "1;2;3", "2", "3;1;2;5", "4;5;6",
-        "5;4;6", "6;4", "7;2;4" };
-
-    int numLines = 0;
-    for (String line : lineArray) {
-      String[] arr = line.split(";");
-      String vId = arr[0];
-      int indexKey = Integer.valueOf(vId);
-      LinkedList<String> list = new LinkedList<String>();
-      for (int i = 0; i < arr.length; i++) {
-        int index = Integer.valueOf(arr[i]);
-        list.add(realNames[index]);
-      }
-
-      int mod = Math.abs(realNames[indexKey].hashCode() % sizeOfCluster);
-      for (String value : list) {
-        writers.get(mod).append(new Text(realNames[indexKey]), new Text(value));
-      }
-      numLines++;
-    }
-
-    for (SequenceFile.Writer w : writers)
-      w.close();
-
-    for (Path p : partPaths) {
-      conf.set("in.path." + p.getName(), p.toString());
-    }
-    conf.set("num.vertices", "" + numLines);
-
-    return conf;
-  }
-
-  static HamaConfiguration partitionTextFile(Path in, HamaConfiguration conf)
-      throws IOException {
-
-    String[] groomNames = conf.get(ShortestPaths.BSP_PEERS).split(";");
-    int sizeOfCluster = groomNames.length;
-
-    // setup the paths where the grooms can find their input
-    List<Path> partPaths = new ArrayList<Path>(sizeOfCluster);
-    List<SequenceFile.Writer> writers = new ArrayList<SequenceFile.Writer>(
-        sizeOfCluster);
-    FileSystem fs = FileSystem.get(conf);
-    for (String entry : groomNames) {
-      partPaths.add(new Path(in.getParent().toString() + Path.SEPARATOR
-          + ShortestPaths.PARTED + Path.SEPARATOR
-          + entry.split(ShortestPaths.NAME_VALUE_SEPARATOR)[0]));
-    }
-    // create a seq writer for that
-    for (Path p : partPaths) {
-      // LOG.info(p.toString());
-      fs.delete(p, true);
-      writers.add(SequenceFile
-          .createWriter(fs, conf, p, Text.class, Text.class));
-    }
-
-    BufferedReader br = new BufferedReader(new InputStreamReader(fs.open(in)));
-
-    String line = null;
-    long numLines = 0;
-    while ((line = br.readLine()) != null) {
-      String[] arr = line.split("\t");
-      String vId = arr[0];
-      LinkedList<String> list = new LinkedList<String>();
-      for (int i = 0; i < arr.length; i++) {
-        list.add(arr[i]);
-      }
-
-      int mod = Math.abs(vId.hashCode() % sizeOfCluster);
-      for (String value : list) {
-        writers.get(mod).append(new Text(vId), new Text(value));
-      }
-      numLines++;
-    }
-
-    for (SequenceFile.Writer w : writers)
-      w.close();
-
-    for (Path p : partPaths) {
-      conf.set("in.path." + p.getName(), p.toString());
-    }
-    conf.set("num.vertices", "" + numLines);
-
-    return conf;
-  }
-
-  static void savePageRankMap(BSPPeer peer, Configuration conf,
-      Map<PageRankVertex, Double> tentativePagerank) throws IOException {
-    FileSystem fs = FileSystem.get(conf);
-    Path outPath = new Path(conf.get("out.path") + Path.SEPARATOR + "temp"
-        + Path.SEPARATOR
-        + peer.getPeerName().split(ShortestPaths.NAME_VALUE_SEPARATOR)[0]);
-    fs.delete(outPath, true);
-    final SequenceFile.Writer out = SequenceFile.createWriter(fs, conf,
-        outPath, Text.class, DoubleWritable.class);
-    for (Entry<PageRankVertex, Double> row : tentativePagerank.entrySet()) {
-      out.append(new Text(row.getKey().getUrl()), new DoubleWritable(row
-          .getValue()));
-    }
-    LOG.info("Closing...");
-    out.close();
-    LOG.info("Closed!");
-  }
-
-  static void printOutput(FileSystem fs, Configuration conf) throws IOException {
-    LOG.info("-------------------- RESULTS --------------------");
-    FileStatus[] stati = fs.listStatus(new Path(conf.get("out.path")
-        + Path.SEPARATOR + "temp"));
-    for (FileStatus status : stati) {
-      Path path = status.getPath();
-      SequenceFile.Reader reader = new SequenceFile.Reader(fs, path, conf);
-      Text key = new Text();
-      DoubleWritable value = new DoubleWritable();
-      while (reader.next(key, value)) {
-        LOG.info(key.toString() + " | " + value.get());
-      }
-      reader.close();
-    }
-  }
-
-}
+/**
+ * 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.examples.graph;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.DoubleWritable;
+import org.apache.hadoop.io.SequenceFile;
+import org.apache.hadoop.io.Text;
+import org.apache.hama.HamaConfiguration;
+import org.apache.hama.bsp.BSP;
+import org.apache.hama.bsp.BSPPeer;
+
+public abstract class PageRankBase extends BSP {
+  public static final Log LOG = LogFactory.getLog(PageRankBase.class);
+
+  protected static int MAX_ITERATIONS = 30;
+  protected static final String MASTER_TASK = "master.groom";
+  protected static double ALPHA;
+  protected static int numOfVertices;
+  protected static double DAMPING_FACTOR = 0.85;
+  protected static double EPSILON = 0.001;
+
+  static HashMap<PageRankVertex, List<PageRankVertex>> mapAdjacencyList(
+      Configuration conf, BSPPeer peer) throws FileNotFoundException,
+      IOException {
+    FileSystem fs = FileSystem.get(conf);
+    HashMap<PageRankVertex, List<PageRankVertex>> adjacencyList = new HashMap<PageRankVertex, List<PageRankVertex>>();
+    Path p = new Path(conf.get("in.path." + peer.getPeerName().split(":")[0]));
+    LOG.info(p.toString());
+    SequenceFile.Reader reader = new SequenceFile.Reader(fs, p, conf);
+    Text key = new Text();
+    Text value = new Text();
+    while (reader.next(key, value)) {
+      PageRankVertex k = new PageRankVertex(key.toString());
+      PageRankVertex v = new PageRankVertex(value.toString());
+      if (!adjacencyList.containsKey(k)) {
+        adjacencyList.put(k, new LinkedList<PageRankVertex>());
+        adjacencyList.get(k).add(v);
+      } else {
+        adjacencyList.get(k).add(v);
+      }
+    }
+    reader.close();
+    return adjacencyList;
+  }
+
+  static HamaConfiguration partitionExample(Path out, HamaConfiguration conf)
+      throws IOException {
+
+    String[] groomNames = conf.get(ShortestPaths.BSP_PEERS).split(";");
+    int sizeOfCluster = groomNames.length;
+
+    // setup the paths where the grooms can find their input
+    List<Path> partPaths = new ArrayList<Path>(sizeOfCluster);
+    List<SequenceFile.Writer> writers = new ArrayList<SequenceFile.Writer>(
+        sizeOfCluster);
+    FileSystem fs = FileSystem.get(conf);
+    for (String entry : groomNames) {
+      partPaths.add(new Path(out.getParent().toString() + Path.SEPARATOR
+          + ShortestPaths.PARTED + Path.SEPARATOR
+          + entry.split(ShortestPaths.NAME_VALUE_SEPARATOR)[0]));
+    }
+    // create a seq writer for that
+    for (Path p : partPaths) {
+      // LOG.info(p.toString());
+      fs.delete(p, true);
+      writers.add(SequenceFile
+          .createWriter(fs, conf, p, Text.class, Text.class));
+    }
+
+    /**
+     * 1:twitter.com <br/>
+     * 2:google.com <br/>
+     * 3:facebook.com <br/>
+     * 4:yahoo.com <br/>
+     * 5:nasa.gov <br/>
+     * 6:stackoverflow.com <br/>
+     * 7:youtube.com
+     */
+
+    String[] realNames = new String[] { null, "twitter.com", "google.com",
+        "facebook.com", "yahoo.com", "nasa.gov", "stackoverflow.com",
+        "youtube.com" };
+
+    String[] lineArray = new String[] { "1;2;3", "2", "3;1;2;5", "4;5;6",
+        "5;4;6", "6;4", "7;2;4" };
+
+    int numLines = 0;
+    for (String line : lineArray) {
+      String[] arr = line.split(";");
+      String vId = arr[0];
+      int indexKey = Integer.valueOf(vId);
+      LinkedList<String> list = new LinkedList<String>();
+      for (int i = 0; i < arr.length; i++) {
+        int index = Integer.valueOf(arr[i]);
+        list.add(realNames[index]);
+      }
+
+      int mod = Math.abs(realNames[indexKey].hashCode() % sizeOfCluster);
+      for (String value : list) {
+        writers.get(mod).append(new Text(realNames[indexKey]), new Text(value));
+      }
+      numLines++;
+    }
+
+    for (SequenceFile.Writer w : writers)
+      w.close();
+
+    for (Path p : partPaths) {
+      conf.set("in.path." + p.getName(), p.toString());
+    }
+    conf.set("num.vertices", "" + numLines);
+
+    return conf;
+  }
+
+  static HamaConfiguration partitionTextFile(Path in, HamaConfiguration conf)
+      throws IOException {
+
+    String[] groomNames = conf.get(ShortestPaths.BSP_PEERS).split(";");
+    int sizeOfCluster = groomNames.length;
+
+    // setup the paths where the grooms can find their input
+    List<Path> partPaths = new ArrayList<Path>(sizeOfCluster);
+    List<SequenceFile.Writer> writers = new ArrayList<SequenceFile.Writer>(
+        sizeOfCluster);
+    FileSystem fs = FileSystem.get(conf);
+    for (String entry : groomNames) {
+      partPaths.add(new Path(in.getParent().toString() + Path.SEPARATOR
+          + ShortestPaths.PARTED + Path.SEPARATOR
+          + entry.split(ShortestPaths.NAME_VALUE_SEPARATOR)[0]));
+    }
+    // create a seq writer for that
+    for (Path p : partPaths) {
+      // LOG.info(p.toString());
+      fs.delete(p, true);
+      writers.add(SequenceFile
+          .createWriter(fs, conf, p, Text.class, Text.class));
+    }
+
+    BufferedReader br = new BufferedReader(new InputStreamReader(fs.open(in)));
+
+    String line = null;
+    long numLines = 0;
+    while ((line = br.readLine()) != null) {
+      String[] arr = line.split("\t");
+      String vId = arr[0];
+      LinkedList<String> list = new LinkedList<String>();
+      for (int i = 0; i < arr.length; i++) {
+        list.add(arr[i]);
+      }
+
+      int mod = Math.abs(vId.hashCode() % sizeOfCluster);
+      for (String value : list) {
+        writers.get(mod).append(new Text(vId), new Text(value));
+      }
+      numLines++;
+    }
+
+    for (SequenceFile.Writer w : writers)
+      w.close();
+
+    for (Path p : partPaths) {
+      conf.set("in.path." + p.getName(), p.toString());
+    }
+    conf.set("num.vertices", "" + numLines);
+
+    return conf;
+  }
+
+  static void savePageRankMap(BSPPeer peer, Configuration conf,
+      Map<PageRankVertex, Double> tentativePagerank) throws IOException {
+    FileSystem fs = FileSystem.get(conf);
+    Path outPath = new Path(conf.get("out.path") + Path.SEPARATOR + "temp"
+        + Path.SEPARATOR
+        + peer.getPeerName().split(ShortestPaths.NAME_VALUE_SEPARATOR)[0]);
+    fs.delete(outPath, true);
+    final SequenceFile.Writer out = SequenceFile.createWriter(fs, conf,
+        outPath, Text.class, DoubleWritable.class);
+    for (Entry<PageRankVertex, Double> row : tentativePagerank.entrySet()) {
+      out.append(new Text(row.getKey().getUrl()), new DoubleWritable(row
+          .getValue()));
+    }
+    LOG.info("Closing...");
+    out.close();
+    LOG.info("Closed!");
+  }
+
+  static void printOutput(FileSystem fs, Configuration conf) throws IOException {
+    LOG.info("-------------------- RESULTS --------------------");
+    FileStatus[] stati = fs.listStatus(new Path(conf.get("out.path")
+        + Path.SEPARATOR + "temp"));
+    for (FileStatus status : stati) {
+      Path path = status.getPath();
+      SequenceFile.Reader reader = new SequenceFile.Reader(fs, path, conf);
+      Text key = new Text();
+      DoubleWritable value = new DoubleWritable();
+      while (reader.next(key, value)) {
+        LOG.info(key.toString() + " | " + value.get());
+      }
+      reader.close();
+    }
+  }
+
+}

Propchange: incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankVertex.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankVertex.java?rev=1151771&r1=1151770&r2=1151771&view=diff
==============================================================================
--- incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankVertex.java (original)
+++ incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankVertex.java Thu Jul 28 09:28:02 2011
@@ -1,66 +1,66 @@
-/**
- * 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.examples.graph;
-
-public class PageRankVertex {
-  
-  private final int id;
-  private final String url;
-
-  public PageRankVertex(String url) {
-    super();
-    this.id = url.hashCode();
-    this.url = url;
-  }
-
-  @Override
-  public int hashCode() {
-    final int prime = 31;
-    int result = 1;
-    result = prime * result + id;
-    return result;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj)
-      return true;
-    if (obj == null)
-      return false;
-    if (getClass() != obj.getClass())
-      return false;
-    PageRankVertex other = (PageRankVertex) obj;
-    if (id != other.id)
-      return false;
-    return true;
-  }
-
-  @Override
-  public String toString() {
-    return url;
-  }
-
-  public int getId() {
-    return id;
-  }
-
-  public String getUrl() {
-    return url;
-  }
-
-}
+/**
+ * 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.examples.graph;
+
+public class PageRankVertex {
+  
+  private final int id;
+  private final String url;
+
+  public PageRankVertex(String url) {
+    super();
+    this.id = url.hashCode();
+    this.url = url;
+  }
+
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + id;
+    return result;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    PageRankVertex other = (PageRankVertex) obj;
+    if (id != other.id)
+      return false;
+    return true;
+  }
+
+  @Override
+  public String toString() {
+    return url;
+  }
+
+  public int getId() {
+    return id;
+  }
+
+  public String getUrl() {
+    return url;
+  }
+
+}

Propchange: incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/PageRankVertex.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPathVertex.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPaths.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPaths.java?rev=1151771&r1=1151770&r2=1151771&view=diff
==============================================================================
--- incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPaths.java (original)
+++ incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPaths.java Thu Jul 28 09:28:02 2011
@@ -1,254 +1,254 @@
-/**
- * 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.examples.graph;
-
-import java.io.IOException;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hama.HamaConfiguration;
-import org.apache.hama.bsp.BSPJob;
-import org.apache.hama.bsp.BSPJobClient;
-import org.apache.hama.bsp.BSPPeer;
-import org.apache.hama.bsp.BooleanMessage;
-import org.apache.hama.bsp.ClusterStatus;
-import org.apache.hama.bsp.IntegerMessage;
-import org.apache.hama.examples.RandBench;
-import org.apache.zookeeper.KeeperException;
-
-public class ShortestPaths extends ShortestPathsBase {
-  public static final Log LOG = LogFactory.getLog(ShortestPaths.class);
-
-  private Configuration conf;
-  private Map<ShortestPathVertex, List<ShortestPathVertex>> adjacencyList = new HashMap<ShortestPathVertex, List<ShortestPathVertex>>();
-  private Map<String, ShortestPathVertex> vertexLookupMap = new HashMap<String, ShortestPathVertex>();
-  private String[] peerNames;
-
-  @Override
-  public void bsp(BSPPeer peer) throws IOException, KeeperException,
-      InterruptedException {
-    LOG.info("Mapping graph into ram...");
-    // map our input into ram
-    mapAdjacencyList(conf, peer, adjacencyList, vertexLookupMap);
-    LOG.info("Finished! Starting graph initialization...");
-    // parse the configuration to get the peerNames
-    parsePeerNames(conf);
-    // get our master groom
-    String master = conf.get(MASTER_TASK);
-
-    // initial message bypass
-    ShortestPathVertex v = vertexLookupMap.get(conf
-        .get(SHORTEST_PATHS_START_VERTEX_ID));
-    if (v != null) {
-      v.setCost(0);
-      sendMessageToNeighbors(peer, v);
-    }
-
-    LOG.info("Finished! Starting main loop...");
-    boolean updated = true;
-    while (updated) {
-      int updatesMade = 0;
-      peer.sync();
-
-      IntegerMessage msg = null;
-      Deque<ShortestPathVertex> updatedQueue = new LinkedList<ShortestPathVertex>();
-      while ((msg = (IntegerMessage) peer.getCurrentMessage()) != null) {
-        ShortestPathVertex vertex = vertexLookupMap.get(msg.getTag());
-        // check if we need an distance update
-        if (vertex.getCost() > msg.getData()) {
-          updatesMade++;
-          updatedQueue.add(vertex);
-          vertex.setCost(msg.getData());
-        }
-      }
-      // synchonize with all grooms if there were updates
-      updated = broadcastUpdatesMade(peer, master, updatesMade);
-      // send updates to the adjacents of the updated vertices
-      for (ShortestPathVertex vertex : updatedQueue) {
-        sendMessageToNeighbors(peer, vertex);
-      }
-    }
-    LOG.info("Finished!");
-    // finished, finally save our map to DFS.
-    saveVertexMap(conf, peer, adjacencyList);
-  }
-
-  /**
-   * Parses the peer names to fix inconsistency in bsp peer names from context.
-   * 
-   * @param conf
-   */
-  private void parsePeerNames(Configuration conf) {
-    peerNames = conf.get(BSP_PEERS).split(";");
-  }
-
-  /**
-   * This method broadcasts to a master groom how many updates were made. He
-   * simply sums them up and sends a message back to the grooms if sum is
-   * greater than zero.
-   * 
-   * @param peer The peer we got through the BSP method.
-   * @param master The assigned master groom name.
-   * @param updates How many updates were made?
-   * @return True if we need another iteration, False if no updates can be made
-   *         anymore.
-   * @throws IOException
-   * @throws KeeperException
-   * @throws InterruptedException
-   */
-  private boolean broadcastUpdatesMade(BSPPeer peer, String master,
-      int updates) throws IOException, KeeperException, InterruptedException {
-    peer.send(master, new IntegerMessage(peer.getPeerName(), updates));
-    peer.sync();
-    if (peer.getPeerName().equals(master)) {
-      int count = 0;
-      IntegerMessage message;
-      while ((message = (IntegerMessage) peer.getCurrentMessage()) != null) {
-        count += message.getData();
-        LOG.info("Received " + message.getData() + " updates from "
-            + message.getTag() + " in SuperStep " + peer.getSuperstepCount());
-      }
-
-      for (String name : peer.getAllPeerNames()) {
-        peer.send(name, new BooleanMessage("", count > 0 ? true : false));
-      }
-    }
-
-    peer.sync();
-    BooleanMessage message = (BooleanMessage) peer.getCurrentMessage();
-    return message.getData();
-  }
-
-  /**
-   * This method takes advantage of our partitioning: it uses the vertexID
-   * (simply hash of the name) to determine the host where the message belongs
-   * to. <br/>
-   * It sends the current cost to the adjacent vertex + the edge weight. If cost
-   * will be infinity we just going to send infinity, because summing the weight
-   * will cause an integer overflow resulting in negative weights.
-   * 
-   * @param peer The peer we got through the BSP method.
-   * @param id The vertex to all adjacent vertices the new cost has to be send.
-   * @throws IOException
-   */
-  private void sendMessageToNeighbors(BSPPeer peer,
-      ShortestPathVertex id) throws IOException {
-    List<ShortestPathVertex> outgoingEdges = adjacencyList.get(id);
-    for (ShortestPathVertex adjacent : outgoingEdges) {
-      int mod = Math.abs((adjacent.getId() % peer.getAllPeerNames().length));
-      peer.send(peerNames[mod], new IntegerMessage(adjacent.getName(), id
-          .getCost() == Integer.MAX_VALUE ? id.getCost() : id.getCost()
-          + adjacent.getWeight()));
-    }
-  }
-
-  @Override
-  public void setConf(Configuration conf) {
-    this.conf = conf;
-  }
-
-  @Override
-  public Configuration getConf() {
-    return conf;
-  }
-
-  public static void printUsage() {
-    System.out.println("Single Source Shortest Path Example:");
-    System.out
-        .println("<Startvertex name> <optional: output path> <optional: path to own adjacency list sequencefile>");
-  }
-
-  public static void main(String[] args) throws IOException,
-      InterruptedException, ClassNotFoundException {
-
-    printUsage();
-
-    // BSP job configuration
-    HamaConfiguration conf = new HamaConfiguration();
-    conf.set(SHORTEST_PATHS_START_VERTEX_ID, "Frankfurt");
-    System.out.println("Setting default start vertex to \"Frankfurt\"!");
-    conf.set(OUT_PATH, "sssp/output");
-    boolean skipPartitioning = false;
-    Path adjacencyListPath = null;
-
-    if (args.length > 0) {
-      conf.set(SHORTEST_PATHS_START_VERTEX_ID, args[0]);
-      System.out.println("Setting start vertex to " + args[0] + "!");
-
-      if (args.length > 1) {
-        conf.set(OUT_PATH, args[1]);
-        System.out.println("Using new output folder: " + args[1]);
-      }
-
-      if (args.length > 2) {
-        adjacencyListPath = new Path(args[2]);
-      }
-
-      if (args.length > 3) {
-        skipPartitioning = Boolean.valueOf(args[3]);
-      }
-
-    }
-
-    Map<ShortestPathVertex, List<ShortestPathVertex>> adjacencyList = null;
-    if (adjacencyListPath == null)
-      adjacencyList = ShortestPathsGraphLoader.loadGraph();
-
-    BSPJob bsp = new BSPJob(conf, RandBench.class);
-    // Set the job name
-    bsp.setJobName("Single Source Shortest Path");
-    bsp.setBspClass(ShortestPaths.class);
-
-    // Set the task size as a number of GroomServer
-    BSPJobClient jobClient = new BSPJobClient(conf);
-    ClusterStatus cluster = jobClient.getClusterStatus(true);
-    StringBuilder sb = new StringBuilder();
-    for (String peerName : cluster.getActiveGroomNames().values()) {
-      conf.set(MASTER_TASK, peerName);
-      sb.append(peerName);
-      sb.append(";");
-    }
-    LOG.info("Master is: " + conf.get(MASTER_TASK));
-    conf.set(BSP_PEERS, sb.toString());
-    LOG.info("Starting data partitioning...");
-    if (adjacencyList == null)
-      conf = partition(adjacencyListPath, conf, skipPartitioning);
-    else
-      conf = partition(adjacencyList, conf);
-    LOG.info("Finished!");
-
-    bsp.setNumBspTask(cluster.getGroomServers());
-
-    long startTime = System.currentTimeMillis();
-    if (bsp.waitForCompletion(true)) {
-      System.out.println("Job Finished in "
-          + (double) (System.currentTimeMillis() - startTime) / 1000.0
-          + " seconds");
-      printOutput(FileSystem.get(conf), conf);
-    }
-  }
-
-}
+/**
+ * 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.examples.graph;
+
+import java.io.IOException;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hama.HamaConfiguration;
+import org.apache.hama.bsp.BSPJob;
+import org.apache.hama.bsp.BSPJobClient;
+import org.apache.hama.bsp.BSPPeer;
+import org.apache.hama.bsp.BooleanMessage;
+import org.apache.hama.bsp.ClusterStatus;
+import org.apache.hama.bsp.IntegerMessage;
+import org.apache.hama.examples.RandBench;
+import org.apache.zookeeper.KeeperException;
+
+public class ShortestPaths extends ShortestPathsBase {
+  public static final Log LOG = LogFactory.getLog(ShortestPaths.class);
+
+  private Configuration conf;
+  private Map<ShortestPathVertex, List<ShortestPathVertex>> adjacencyList = new HashMap<ShortestPathVertex, List<ShortestPathVertex>>();
+  private Map<String, ShortestPathVertex> vertexLookupMap = new HashMap<String, ShortestPathVertex>();
+  private String[] peerNames;
+
+  @Override
+  public void bsp(BSPPeer peer) throws IOException, KeeperException,
+      InterruptedException {
+    LOG.info("Mapping graph into ram...");
+    // map our input into ram
+    mapAdjacencyList(conf, peer, adjacencyList, vertexLookupMap);
+    LOG.info("Finished! Starting graph initialization...");
+    // parse the configuration to get the peerNames
+    parsePeerNames(conf);
+    // get our master groom
+    String master = conf.get(MASTER_TASK);
+
+    // initial message bypass
+    ShortestPathVertex v = vertexLookupMap.get(conf
+        .get(SHORTEST_PATHS_START_VERTEX_ID));
+    if (v != null) {
+      v.setCost(0);
+      sendMessageToNeighbors(peer, v);
+    }
+
+    LOG.info("Finished! Starting main loop...");
+    boolean updated = true;
+    while (updated) {
+      int updatesMade = 0;
+      peer.sync();
+
+      IntegerMessage msg = null;
+      Deque<ShortestPathVertex> updatedQueue = new LinkedList<ShortestPathVertex>();
+      while ((msg = (IntegerMessage) peer.getCurrentMessage()) != null) {
+        ShortestPathVertex vertex = vertexLookupMap.get(msg.getTag());
+        // check if we need an distance update
+        if (vertex.getCost() > msg.getData()) {
+          updatesMade++;
+          updatedQueue.add(vertex);
+          vertex.setCost(msg.getData());
+        }
+      }
+      // synchonize with all grooms if there were updates
+      updated = broadcastUpdatesMade(peer, master, updatesMade);
+      // send updates to the adjacents of the updated vertices
+      for (ShortestPathVertex vertex : updatedQueue) {
+        sendMessageToNeighbors(peer, vertex);
+      }
+    }
+    LOG.info("Finished!");
+    // finished, finally save our map to DFS.
+    saveVertexMap(conf, peer, adjacencyList);
+  }
+
+  /**
+   * Parses the peer names to fix inconsistency in bsp peer names from context.
+   * 
+   * @param conf
+   */
+  private void parsePeerNames(Configuration conf) {
+    peerNames = conf.get(BSP_PEERS).split(";");
+  }
+
+  /**
+   * This method broadcasts to a master groom how many updates were made. He
+   * simply sums them up and sends a message back to the grooms if sum is
+   * greater than zero.
+   * 
+   * @param peer The peer we got through the BSP method.
+   * @param master The assigned master groom name.
+   * @param updates How many updates were made?
+   * @return True if we need another iteration, False if no updates can be made
+   *         anymore.
+   * @throws IOException
+   * @throws KeeperException
+   * @throws InterruptedException
+   */
+  private boolean broadcastUpdatesMade(BSPPeer peer, String master,
+      int updates) throws IOException, KeeperException, InterruptedException {
+    peer.send(master, new IntegerMessage(peer.getPeerName(), updates));
+    peer.sync();
+    if (peer.getPeerName().equals(master)) {
+      int count = 0;
+      IntegerMessage message;
+      while ((message = (IntegerMessage) peer.getCurrentMessage()) != null) {
+        count += message.getData();
+        LOG.info("Received " + message.getData() + " updates from "
+            + message.getTag() + " in SuperStep " + peer.getSuperstepCount());
+      }
+
+      for (String name : peer.getAllPeerNames()) {
+        peer.send(name, new BooleanMessage("", count > 0 ? true : false));
+      }
+    }
+
+    peer.sync();
+    BooleanMessage message = (BooleanMessage) peer.getCurrentMessage();
+    return message.getData();
+  }
+
+  /**
+   * This method takes advantage of our partitioning: it uses the vertexID
+   * (simply hash of the name) to determine the host where the message belongs
+   * to. <br/>
+   * It sends the current cost to the adjacent vertex + the edge weight. If cost
+   * will be infinity we just going to send infinity, because summing the weight
+   * will cause an integer overflow resulting in negative weights.
+   * 
+   * @param peer The peer we got through the BSP method.
+   * @param id The vertex to all adjacent vertices the new cost has to be send.
+   * @throws IOException
+   */
+  private void sendMessageToNeighbors(BSPPeer peer,
+      ShortestPathVertex id) throws IOException {
+    List<ShortestPathVertex> outgoingEdges = adjacencyList.get(id);
+    for (ShortestPathVertex adjacent : outgoingEdges) {
+      int mod = Math.abs((adjacent.getId() % peer.getAllPeerNames().length));
+      peer.send(peerNames[mod], new IntegerMessage(adjacent.getName(), id
+          .getCost() == Integer.MAX_VALUE ? id.getCost() : id.getCost()
+          + adjacent.getWeight()));
+    }
+  }
+
+  @Override
+  public void setConf(Configuration conf) {
+    this.conf = conf;
+  }
+
+  @Override
+  public Configuration getConf() {
+    return conf;
+  }
+
+  public static void printUsage() {
+    System.out.println("Single Source Shortest Path Example:");
+    System.out
+        .println("<Startvertex name> <optional: output path> <optional: path to own adjacency list sequencefile>");
+  }
+
+  public static void main(String[] args) throws IOException,
+      InterruptedException, ClassNotFoundException {
+
+    printUsage();
+
+    // BSP job configuration
+    HamaConfiguration conf = new HamaConfiguration();
+    conf.set(SHORTEST_PATHS_START_VERTEX_ID, "Frankfurt");
+    System.out.println("Setting default start vertex to \"Frankfurt\"!");
+    conf.set(OUT_PATH, "sssp/output");
+    boolean skipPartitioning = false;
+    Path adjacencyListPath = null;
+
+    if (args.length > 0) {
+      conf.set(SHORTEST_PATHS_START_VERTEX_ID, args[0]);
+      System.out.println("Setting start vertex to " + args[0] + "!");
+
+      if (args.length > 1) {
+        conf.set(OUT_PATH, args[1]);
+        System.out.println("Using new output folder: " + args[1]);
+      }
+
+      if (args.length > 2) {
+        adjacencyListPath = new Path(args[2]);
+      }
+
+      if (args.length > 3) {
+        skipPartitioning = Boolean.valueOf(args[3]);
+      }
+
+    }
+
+    Map<ShortestPathVertex, List<ShortestPathVertex>> adjacencyList = null;
+    if (adjacencyListPath == null)
+      adjacencyList = ShortestPathsGraphLoader.loadGraph();
+
+    BSPJob bsp = new BSPJob(conf, RandBench.class);
+    // Set the job name
+    bsp.setJobName("Single Source Shortest Path");
+    bsp.setBspClass(ShortestPaths.class);
+
+    // Set the task size as a number of GroomServer
+    BSPJobClient jobClient = new BSPJobClient(conf);
+    ClusterStatus cluster = jobClient.getClusterStatus(true);
+    StringBuilder sb = new StringBuilder();
+    for (String peerName : cluster.getActiveGroomNames().values()) {
+      conf.set(MASTER_TASK, peerName);
+      sb.append(peerName);
+      sb.append(";");
+    }
+    LOG.info("Master is: " + conf.get(MASTER_TASK));
+    conf.set(BSP_PEERS, sb.toString());
+    LOG.info("Starting data partitioning...");
+    if (adjacencyList == null)
+      conf = partition(adjacencyListPath, conf, skipPartitioning);
+    else
+      conf = partition(adjacencyList, conf);
+    LOG.info("Finished!");
+
+    bsp.setNumBspTask(cluster.getGroomServers());
+
+    long startTime = System.currentTimeMillis();
+    if (bsp.waitForCompletion(true)) {
+      System.out.println("Job Finished in "
+          + (double) (System.currentTimeMillis() - startTime) / 1000.0
+          + " seconds");
+      printOutput(FileSystem.get(conf), conf);
+    }
+  }
+
+}

Propchange: incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPaths.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPathsBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/hama/trunk/src/examples/org/apache/hama/examples/graph/ShortestPathsGraphLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message