giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject git commit: updated refs/heads/trunk to 2e8c2c6
Date Mon, 09 Jun 2014 04:42:03 GMT
Repository: giraph
Updated Branches:
  refs/heads/trunk a00c4ecbb -> 2e8c2c694


GIRAPH-849. generated site has a few dangling links (Mirko Kaempf via rvs)


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/2e8c2c69
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/2e8c2c69
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/2e8c2c69

Branch: refs/heads/trunk
Commit: 2e8c2c694c98c4ac7c371a7b9dc0b28abba79ffd
Parents: a00c4ec
Author: Roman Shaposhnik <rvs@apache.org>
Authored: Sun Jun 8 21:40:47 2014 -0700
Committer: Roman Shaposhnik <rvs@apache.org>
Committed: Sun Jun 8 21:41:03 2014 -0700

----------------------------------------------------------------------
 pom.xml                         | 171 ++++++++++++++++++++++-------------
 src/site/site.xml               |  51 +++++++----
 src/site/xdoc/build.xml         |  17 ++--
 src/site/xdoc/index.xml         |   1 +
 src/site/xdoc/intro.xml         |  26 ++++--
 src/site/xdoc/literature.xml    | 106 ++++++++++++++++++++++
 src/site/xdoc/presentations.xml |  19 ++--
 src/site/xdoc/releases.xml      |   9 ++
 8 files changed, 297 insertions(+), 103 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/2e8c2c69/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f01c057..183f2df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,13 @@ under the License.
       <organization>LSDS group, VU Amsterdam</organization>
     </developer>
     <developer>
+      <id>rvs</id>
+      <name>Roman Shaposhnik</name>
+      <email>rvs@apache.org</email>
+      <timezone>-8</timezone>
+      <organization>Pivotal Inc.</organization>
+    </developer>
+    <developer>
       <id>ssc</id>
       <name>Sebastian Schelter</name>
       <email>ssc@apache.org</email>
@@ -681,68 +688,6 @@ under the License.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <version>3.3</version>
-          <configuration>
-            <reportPlugins>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.2</version>
-                <reports>
-                  <report>index</report>
-                  <report>project-team</report>
-                  <report>license</report>
-                  <report>mailing-list</report>
-                  <report>dependencies</report>
-                  <report>dependency-convergence</report>
-                  <report>plugin-management</report>
-                  <report>cim</report>
-                  <report>issue-tracking</report>
-                  <report>scm</report>
-                  <report>summary</report>
-                </reports>
-              </plugin>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.6</version>
-              </plugin>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
-              </plugin>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.9</version>
-              </plugin>
-              <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jdepend-maven-plugin</artifactId>
-                <version>2.0-beta-2</version>
-              </plugin>
-              <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.4</version>
-              </plugin>
-              <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-                <version>2.4</version>
-              </plugin>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.1</version>
-              </plugin>
-              <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.5.1</version>
-              </plugin>
-           </reportPlugins>
-          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
@@ -845,6 +790,108 @@ under the License.
     </plugins>
   </build>
 
+
+  <reporting>
+    <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-project-info-reports-plugin</artifactId>
+              <version>2.2</version>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>index</report>
+                    <report>project-team</report>
+                    <report>license</report>
+                    <report>mailing-list</report>
+                    <report>dependencies</report>
+                    <report>dependency-convergence</report>
+                    <report>plugin-management</report>
+                    <report>cim</report>
+                    <report>issue-tracking</report>
+                    <report>scm</report>
+                    <report>summary</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+          </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-report-plugin</artifactId>
+              <version>2.6</version>
+          </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>2.9</version>
+          </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-checkstyle-plugin</artifactId>
+              <version>2.10</version>
+              <configuration>
+                <configLocation>${top.dir}/checkstyle.xml</configLocation>
+                <consoleOutput>true</consoleOutput>
+                <enableRulesSummary>false</enableRulesSummary>
+                <headerLocation>${top.dir}/license-header.txt</headerLocation>
+                <failOnViolation>true</failOnViolation>
+                <includeTestSourceDirectory>false</includeTestSourceDirectory>
+              </configuration>
+          </plugin>
+          <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>jdepend-maven-plugin</artifactId>
+              <version>2.0-beta-2</version>
+              <configuration>
+                <aggregate>true</aggregate>
+              </configuration>
+          </plugin>
+          <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>cobertura-maven-plugin</artifactId>
+              <version>2.4</version>
+          </plugin>
+          <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>taglist-maven-plugin</artifactId>
+              <version>2.4</version>
+              <reportSets>
+                <reportSet>
+                  <!-- defines taglist reports in the modules -->
+                  <id>taglist-report</id>
+                  <reports>
+                    <report>taglist</report>
+                  </reports>
+                </reportSet>
+                <reportSet>
+                  <!-- defines taglist aggregate report -->
+                  <id>taglist-aggregate</id>
+                  <inherited>false</inherited>
+                  <reports>
+                    <report>taglist</report>
+                  </reports>
+                  <configuration>
+                    <aggregate>true</aggregate>
+                  </configuration>
+                </reportSet>
+              </reportSets>
+          </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jxr-plugin</artifactId>
+              <version>2.3</version>
+              <configuration>
+                  <aggregate>true</aggregate>
+              </configuration>
+          </plugin>
+          <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>findbugs-maven-plugin</artifactId>
+              <version>2.5.1</version>
+          </plugin>
+    </plugins>
+  </reporting>
+
   <profiles>
     <profile>
       <id>release</id>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2e8c2c69/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 9fc9810..de649e0 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -31,8 +31,11 @@
       <googlePlusOne />
       <topBarEnabled>true</topBarEnabled>
       <sideBarEnabled>false</sideBarEnabled>
+      <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
     </fluidoSkin>
   </custom>
+
+  
  
   <bannerLeft>
     <src>images/ApacheGiraph.svg</src>
@@ -59,38 +62,46 @@
       <item name="Dependencies" href="dependencies.html" />
       <item name="Reports" href="project-reports.html" collapse="true">
         <item name="Surefire Report" href="surefire-report.html" />
-        <item name="Checkstyle Results" href="checkstyle.html" />
-        <item name="Jdepend" href="jdepend-report.html" />
-        <item name="Cobertura Test Coverage" href="cobertura/index.html" />
-        <item name="Tag List" href="taglist.html" />
-        <item name="Source Xref" href="xref/index.html" />
-        <item name="Test Source Xref" href="xref-test/index.html" />
+        <item name="Checkstyle Results" href="checkstyle-aggregate.html" />
+        <item name="JavaDoc" href="apidocs/index.html" />
+        <item name="Test JavaDoc" href="testapidocs/index.html" />
       </item>
     </menu>
-    
+
     <menu name="User Docs" inherit="top">
       <item name="Introduction" href="intro.html"/>
+      <item name="Related Literature" href="literature.html"/>
+      <item name="Download Releases" href="releases.html"/>
       <item name="Quick Start" href="quick_start.html"/>
       <item name="Building and Testing" href="build.html"/>
-      <item name="FAQ" href="faq.html"/>
-      <item name="Implementation" href="implementation.html"/>
-      <item name="Download Releases" href="releases.html"/>
-      <item name="Page Rank Example" href="pagerank.html"/>
-      <item name="Input/Output in Giraph" href="io.html"/>
-      <item name="Hive" href="hive.html"/>
-      <item name="Gora" href="gora.html"/>
-      <item name="Rexster I/O" href="rexster.html"/>
-      <item name="Aggregators" href="aggregators.html"/>
-      <item name="Out-of-core" href="ooc.html"/>
-      <item name="Javadoc" href="javadoc_modules.html"/>
       <item name="Options List" href="options.html"/>
+      <item name="FAQ" href="faq.html"/>
       <item name="Presentations" href="presentations.html"/>
       <item name="External Community Wiki" href="https://cwiki.apache.org/confluence/display/GIRAPH"
/>
     </menu> 
 
     <menu name="Developer Docs" inherit="top">
-      <item name="How to generate patches" href="generating_patches.html" />
-      <item name="How to build this site" href="build_site.html" />
+      <item name="JavaDoc" href="apidocs/index.html" />
+      <item name="Test JavaDoc" href="testapidocs/index.html" />
+      <item name="Tag List" href="taglist.html" />
+      <item name="Cobertura Test Coverage" href="cobertura/index.html" />
+      <item name="Jdepend" href="giraph-core/jdepend-report.html" />
+      <item name="Source Xref" href="xref/index.html" />
+      <item name="Test Source Xref" href="xref-test/index.html" />
+  
+      <item name="Modules" href="javadoc_modules.html">
+        <item name="Aggregators" href="aggregators.html"/>
+        <item name="Out-of-core" href="ooc.html"/>
+        <item name="Implementation" href="implementation.html"/>
+        <item name="Page Rank Example" href="pagerank.html"/>
+        <item name="Input/Output in Giraph" href="io.html">
+          <item name="Hive" href="hive.html"/>
+	  <item name="Gora" href="gora.html"/>
+    	  <item name="Rexster I/O" href="rexster.html"/>
+        </item>
+      </item>
+      <item name="How to generate patches?" href="generating_patches.html" />
+      <item name="How to build this site?" href="build_site.html" />
     </menu>
   </body>
 </project>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2e8c2c69/src/site/xdoc/build.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/build.xml b/src/site/xdoc/build.xml
index c31880e..d99bff7 100644
--- a/src/site/xdoc/build.xml
+++ b/src/site/xdoc/build.xml
@@ -31,32 +31,33 @@ under the License.
 <section name="Building and Testing">
 
 <p>
-You can check out Giraph with <tt>git clone https://github.com/apache/giraph.git</tt>.
In order to build and test Giraph, you will need the following:</p>
+You can check out Giraph with <tt>git clone http://git-wip-us.apache.org/repos/asf/giraph.git</tt>.
In order to build and test Giraph, you will need the following:</p>
 <ul>
-  <li>Java 1.6</li>
+  <li>Java 1.7</li>
   <li>Maven 3 or higher. Giraph uses the <a href="http://sonatype.github.com/munge-maven-plugin/">munge
plugin</a>, which requires Maven 3, to support multiple versions of Hadoop. Also, the
web site plugin requires Maven 3.</li>
   <li>One of the supported versions of Apache Hadoop:
     <ul>
       <li>YARN version: Apache Hadoop 2.0.3-alpha, other versions may work as well</li>
       <li>Secure Hadoop versions: Apache Hadoop 0.20.203, 0.20.204, other secure versions
may work as well</li>
       <li>Unsecure Hadoop versions: Apache Hadoop 0.20.1, 0.20.2, 0.20.3. While we
provide support for unsecure Hadoop with the maven profile 'hadoop_non_secure', we have been
primarily focusing on secure Hadoop releases at this time.</li>
-      <li>Other distributions that included Apache Hadoop reported to work include:
Cloudera CDH3u0, CDH3u1</li>
+      <li>Other distributions that included Apache Hadoop reported to work include:
Cloudera CDH 4.4</li>
     </ul>
   </li>
 </ul>
 	  
 <p>Use the maven commands with secure Hadoop to:</p>
+
+
+
+
 <ul>
-  <li>compile (i.e <tt>mvn compile</tt>)</li>
-  <li>package (i.e. <tt>mvn package</tt>)</li>
+  <li>compile, package and install: <tt>mvn -Phadoop_2 -fae -DskipTests clean
install</tt></li>
   <li>test (i.e. <tt>mvn test</tt>) For testing, one can submit the test
to a running Hadoop instance (i.e. <tt>mvn test -Dprop.mapred.job.tracker=localhost:50300</tt>)</li>
 </ul>
 <p>For the non-secure versions of Hadoop, run the maven commands with the
 additional argument <tt>-Dhadoop=non_secure</tt> to enable the maven profile
 <tt>hadoop_non_secure</tt>.  An example compilation command is
-<tt>mvn -Dhadoop=non_secure compile</tt>.</p>
-
+<tt>mvn -Phadoop_2 -fae -DskipTests -Dhadoop=non_secure clean install</tt>.</p>
 </section>
-
   </body>
 </document>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2e8c2c69/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 29fd41c..4ece29d 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -37,6 +37,7 @@ under the License.
 
       <subsection name="News">
         <ul>
+          <li><strong><b>???</b>, 2014: Giraph 1.1.0 is comming ...
</strong> Please pick up a copy <a href="http://www.apache.org/dyn/closer.cgi/giraph/giraph-1.1.0">here</a>.</li>
           <li><strong>May 6, 2013: Giraph 1.0.0 is now released!</strong>
Please pick up a copy <a href="http://www.apache.org/dyn/closer.cgi/giraph/giraph-1.0.0">here</a>.</li>
           <li><strong>February 6, 2012: Giraph 0.1-incubating released.</strong>
The Giraph PPMC is excited to announce that version 0.1 has been released. Grab a copy of
the archived release <a href="http://archive.apache.org/dist/incubator/giraph">here</a>.</li>
         </ul>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2e8c2c69/src/site/xdoc/intro.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/intro.xml b/src/site/xdoc/intro.xml
index fc7cc1e..5da95e6 100644
--- a/src/site/xdoc/intro.xml
+++ b/src/site/xdoc/intro.xml
@@ -23,29 +23,43 @@ under the License.
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
   <properties>
-    <title>Introduction to Giraph</title>
+    <title>Introduction to Apache Giraph</title>
   </properties>
 
   <body>
 
     <section name="Introduction">
-<p>Giraph is an iterative graph processing system.</p>
+<p><b>Apache Giraph</b> is an iterative graph processing framework, built
on top of <b>Apache Hadoop</b>.</p>
 
-<p>The input to a Giraph computation is a graph composed of vertices and directed edges,
see Figure <a href="#Figure1">1</a>. For example vertices can represent people,
and edges friend requests. Each vertex stores a <i>value</i>, so does each edge.
The input, thus, not only determines the graph topology, but also the initial values of vertices
and edges.</p>
+<p>The input to a Giraph computation is a graph composed of vertices and directed edges,
see Figure <a href="#Figure1">1</a>. 
+For example vertices can represent people, and edges friend requests. Each vertex stores
a <i>value</i>, so does each edge. 
+The input, thus, not only determines the graph topology, but also the initial values of vertices
and edges.</p>
 
-<p>As an example, consider a computation that finds the distance from a predetermined
<i>source person s</i> to any person in the social graph. In this computation,
the value of an edge is a floating point number denoting distance between adjacent people.
The value of a vertex v is also a floating point number, representing an upper bound on the
distance along a shortest path from the predetermined vertex s to v. The initial value of
the predetermined source vertex s is 0, and the initial value for any other vertex is infinity.</p>
+<p>As an example, consider a computation that finds the distance from a predetermined
<i>source person <b>s</b></i> 
+to any person in the social graph. In this computation, the value of an <i>edge</i>
<b>E</b> is a floating point number 
+denoting distance between adjacent people. The value of a <i>vertex</i> 
+<b>V</b> is also a floating point number, representing an upper bound on the
distance 
+along a shortest path from the predetermined vertex s to v. The initial value of the predetermined

+source vertex <i>s</i> is 0, and the initial value for any other vertex is infinity.</p>
 
 <p>
 <table border="0" class="image" align="center" width="60%">
 <tr><td><img src="images/ExampleSSSP.svg" /></td></tr>
-<tr><td class="caption" id="Figure1">Figure 1: An illustration of an execution
of a single source shortest paths algorithm in Giraph. The input is a chain graph with three
vertices (black) and two edges (green). The values of edges are 1 and 3 respectively. The
algorithm computes distances from the leftmost vertex. The initial values of vertices are
0, &#8734; and &#8734; (top row). Distance upper bounds are sent as messages (blue),
resulting in updates to vertex values (successive rows going down). The execution lasts three
supersteps (separated by red lines).
+<tr><td class="caption" id="Figure1">Figure 1: An illustration of an execution
of a single source shortest paths algorithm in Giraph. The input is a chain graph with three
vertices (black) and two edges (green). The values of edges are 1 and 3 respectively. The
algorithm computes distances from the leftmost vertex. The initial values of vertices are
0, &#8734; and &#8734; (top row). Distance upper bounds are sent as messages (blue),
resulting in updates to vertex values (successive rows going down). 
+The execution lasts three supersteps (separated by red lines).
 </td></tr>
 </table>
 </p>
 
 <p></p>
 
-<p>Computation proceeds as a sequence of iterations, called <i>supersteps</i>
in BSP. Initially, every vertex is <i>active</i>. In each superstep each active
vertex invokes the <i>Compute method</i> provided by the user. The method implements
the graph algorithm that will be executed on the input graph. Intuitively, you should think
like a vertex when designing a Giraph algorithm. The Compute method:</p>
+<p>Computation proceeds as a sequence of iterations, called <i>supersteps</i>
in <a href="http://en.wikipedia.org/wiki/Bulk_Synchronous_Parallel">BSP</a>. 
+Initially, every vertex is <i>active</i>. In each superstep each active vertex
invokes the <i>Compute method</i> provided by the user. 
+The method implements the graph algorithm that will be executed on the input graph. 
+Intuitively, you should think like a vertex when designing a Giraph algorithm, it is vertex
oriented.
+A graph oriented approach is discussded in <a href="https://issues.apache.org/jira/browse/GIRAPH-818">GIRAPH-818</a>.
+</p>
+<p>The Compute method:</p>
 <p><ul>
 <li>receives messages sent to the vertex in the previous superstep,</li>
 <li>computes using the messages, and the vertex and outgoing edge values, which may
result in modifications to the values, and</li>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2e8c2c69/src/site/xdoc/literature.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/literature.xml b/src/site/xdoc/literature.xml
new file mode 100644
index 0000000..796b27a
--- /dev/null
+++ b/src/site/xdoc/literature.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+  <properties>
+    <title>Literature about Apache Giraph</title>
+  </properties>
+
+  <body>
+
+    <section name="Books">
+		<table>
+	        <tr>
+				<td>		<b>Giraph in Action</b> (<a href="http://www.manning.com/martella">MANNING</a>)<br/>

+		Giraph in Action teaches you how to apply the Apache Giraph programming model to real-world
graph data examples. The book starts by showing you how to mine graph data 
+		using the most straightforward algorithms. Then, you'll dive into the Giraph architecture
and the main APIs as you discover how to model and process more complex scenarios. 
+		Along the way, you'll pick up techniques for handling data from disparate sources, swapping
data in and out of memory, and running Giraph in the cloud.
+                </td>
+                <td><img src="http://www.manning.com/martella/martella_cover150.jpg"/><br/>
+                <i>You can use coupon "<b>giraph38</b>" to get <b>38%</b>
off Giraph in Action (all formats)".</i></td>
+			</tr>
+		</table>
+    </section>
+ 
+    <section name="Research Articles">
+			
+	   	<p>Xin, R. S., Crankshaw, D., Dave, A., Gonzalez, J. E., Franklin, M. J., &amp;
Stoica, I. <i>GraphX: Unifying Data-Parallel and Graph-Parallel Analytics</i>.

+		arXiv preprint arXiv:1402.2394. (2014)<br/>
+         <a href="http://arxiv.org/pdf/1402.2394">http://arxiv.org/pdf/1402.2394</a>
+         </p>
+		
+		<p>Martella, Claudio et al. <i>Spinner: scalable graph partitioning for the
cloud.</i> arXiv, (2014). <br/>
+		<a href="http://arxiv.org/pdf/1404.3861v1.pdf">http://arxiv.org/pdf/1404.3861v1.pdf</a>
+        </p>
+		
+        <p>Khayyat, Zuhair, et al. <i>Mizan: a system for dynamic load balancing
in large-scale graph processing.</i> 
+        Proceedings of the 8th ACM European Conference on Computer Systems. ACM, (2013).
<br/>
+        <a href="http://www.cs.cornell.edu/~djwill/pubs/mizan.pdf">http://www.cs.cornell.edu/~djwill/pubs/mizan.pdf</a>
+        </p>
+		
+        <p>Salihoglu, Semih, &amp; Jennifer Widom. <i>Gps: A graph processing
system.</i> 
+        Proceedings of the 25th International Conference on Scientific and Statistical Database
Management. ACM, (2013).<br/>
+        <a href="http://ilpubs.stanford.edu:8090/1039/7/gps_ssdbm.pdf">http://ilpubs.stanford.edu:8090/1039/7/gps_ssdbm.pdf</a>
+        </p>		
+		
+		<p>Tian, Y., Balmin, A., Corsten, S. A., Tatikonda, S., &amp; McPherson, J. <i>From
<b>Think Like a Vertex</b> to <b>Think Like a Graph</b></i>.

+		Proceedings of the VLDB Endowment, 7(3). (2013)<br/>
+        <a href="http://researcher.ibm.com/researcher/files/us-ytian/giraph++.pdf">http://researcher.ibm.com/researcher/files/us-ytian/giraph++.pdf</a>
+        </p>
+ 
+		<p>Schelter, S., Ewen, S., Tzoumas, K., &amp; Markl, V. <i>All roads lead
to Rome: optimistic recovery for distributed iterative data processing</i>. 
+		In Proceedings of the 22nd ACM international conference on Conference on information &amp;
knowledge management (pp. 1919-1928). ACM. (2013, October).<br/>
+         <a href="http://stratosphere.eu/assets/papers/optimistic.pdf">http://stratosphere.eu/assets/papers/optimistic.pdf</a>
+         </p>
+ 
+        <p>Ewen, S., Tzoumas, K., Kaufmann, M., &amp; Markl, V. <i>Spinning
fast iterative data flows</i>. Proceedings of the VLDB Endowment, 5(11), 1268-1279.
(2012).<br/>
+         <a href="http://arxiv.org/pdf/1208.0088.pdf?origin=publication_detail">http://arxiv.org/pdf/1208.0088.pdf?origin=publication_detail</a>
+        </p>
+		
+		<p>Malewicz, Grzegorz, et al. <i>Pregel: a system for large-scale graph processing.</i>
Proceedings of the 2010 ACM SIGMOD International Conference on Management of data. ACM, (2010).
<br/>
+		<a href="http://static.cs.brown.edu/courses/csci2270/papers/pregel.pdf">http://static.cs.brown.edu/courses/csci2270/papers/pregel.pdf</a>
+		</p>
+				
+     	<p>Valiant, Leslie G. <i>A bridging model for parallel computation.</i>
Communications of the ACM 33.8 : 103-111. (1990).<br/>
+	    <a href="http://web.mit.edu/6.976/www/handout/valiant2.pdf">http://web.mit.edu/6.976/www/handout/valiant2.pdf</a>
+		</p>
+		
+		
+		
+		
+		<p>Hong, Sungpack, et al. <i>Green-Marl: a DSL for easy and efficient graph
analysis.</i> ACM SIGARCH Computer Architecture News. Vol. 40. No. 1. ACM, (2012). <br/>
+		<a href="http://www.cl.cam.ac.uk/~ey204/teaching/ACS/R202_2012_2013/papers/S7_Network_Structure/papers/hong_asplos_2012.pdf">http://www.cl.cam.ac.uk/~ey204/teaching/ACS/R202_2012_2013/papers/S7_Network_Structure/papers/hong_asplos_2012.pdf</a>
+	    </p>
+	    
+		<p>Salihoglu, Semih, and Jennifer Widom. <i>Optimizing Graph Algorithms on
Pregel-like Systems.</i> (2014). <br/>
+		<a href="http://ilpubs.stanford.edu:8090/1077/3/p535-salihoglu.pdf">http://ilpubs.stanford.edu:8090/1077/3/p535-salihoglu.pdf</a>
+		</p>
+		
+		<p>Salihoglu, Semih, and Jennifer Widom. <i>HelP: High-level Primitives For
Large-Scale Graph Processing.</i> <br/>
+		<a href="http://ilpubs.stanford.edu:8090/1085/2/primitives_tr_sig_alternate.pdf">http://ilpubs.stanford.edu:8090/1085/2/primitives_tr_sig_alternate.pdf</a>
+ 		</p>
+ 		
+     </section>
+
+  </body>
+</document>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2e8c2c69/src/site/xdoc/presentations.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/presentations.xml b/src/site/xdoc/presentations.xml
index 96c46fd..24920bd 100644
--- a/src/site/xdoc/presentations.xml
+++ b/src/site/xdoc/presentations.xml
@@ -28,14 +28,19 @@ under the License.
 
   <body>
     <section name="Presentations">
-      We're working hard to build a community of users and developers around Giraph. As part
of that outreach, we're giving presentations and talks to help bring people up to speed.
+      We're working hard to build a community of users and developers around Giraph. 
+      As part of that outreach, we're giving presentations and talks to help bring people
up to speed.
+        
       <ul> 
-        <li>Claudio Martella gave a talk about Giraph at FOSDEM 2012. Watch <a href="http://www.youtube.com/watch?v=3ZrqPEIPRe4">part
1</a> and <a href="http://www.youtube.com/watch?v=BmRaejKGeDM">part 2</a>.
The presentation slides can be found <a href="http://prezi.com/9ake_klzwrga/apache-giraph-distributed-graph-processing-in-the-cloud/">here</a>.</li>
-        <li>André Kelpe presented an overview of the Giraph project at the Belgian
Big Data group. Slides are <a href="https://speakerdeck.com/u/fs111/p/large-scale-graph-processing-with-apache-giraph">available
here</a>.</li>
-        <li>Jakob Homan talked about Giraph at 2012 Berlin Buzzwords. Slides are <a
href="http://bit.ly/MDc4Dk">available here</a>.</li>
-          <li>Sebastian Schelter gave a talk about Giraph at the GameDuell Tech-talk
Berlin, in May 2012. Slides are <a href="http://s.apache.org/mks">available here</a>.</li>
-          <li>Sebastian Schelter introduced Giraph at Berlin's Hadoop Get-Together,
in April 2012. Slides are <a href="http://s.apache.org/WFf">available here</a>,
video is <a href="http://s.apache.org/A2o">available here</a>.</li>
-        <li>Avery Ching introduced Giraph at Hadoop Summit 2011. <a href="http://www.youtube.com/watch?v=l4nQjAG6fac">Watch
the video</a>.</li>
+        <li><b>Claudio Martella</b> presented Giraph at the Hadoop Summit
2014 in Amsterdam. Slides are <a href="http://www.slideshare.net/ClaudioMartella/giraph-at-hadoop-summit-2014">here</a>.</li>
+        <li><b>Roman Shaposhnik</b> presented Giraph at the ApacheCON 2014.
Slides are <a href="http://www.slideshare.net/rhatr/apache-giraph-start-analyzing-graph-relationships-in-your-bigdata-in-45-minutes-or-your-money-back">here</a>.</li>
+        <li><b>Paolo Castagna</b> gave a talk about Giraph at Oracle Big
Data Meetup in London 2014. Go to <a href="http://www.meetup.com/Oracle-UK-BigData/events/156264882/">meetup</a>
... </li>
+        <li><b>Claudio Martella</b> gave a talk about Giraph at FOSDEM
2012. Watch <a href="http://www.youtube.com/watch?v=3ZrqPEIPRe4">part 1</a> and
<a href="http://www.youtube.com/watch?v=BmRaejKGeDM">part 2</a>. The presentation
slides can be found <a href="http://prezi.com/9ake_klzwrga/apache-giraph-distributed-graph-processing-in-the-cloud/">here</a>.</li>
+        <li><b>André Kelpe</b> presented an overview of the Giraph project
at the Belgian Big Data group. Slides are <a href="https://speakerdeck.com/u/fs111/p/large-scale-graph-processing-with-apache-giraph">here</a>.</li>
+        <li><b>Jakob Homan</b> talked about Giraph at 2012 Berlin Buzzwords.
Slides are <a href="http://bit.ly/MDc4Dk">available here</a>.</li>
+        <li><b>Sebastian Schelter</b> gave a talk about Giraph at the GameDuell
Tech-talk Berlin, in May 2012. Slides are <a href="http://s.apache.org/mks">here</a>.</li>
+        <li><b>Sebastian Schelter</b> introduced Giraph at Berlin's Hadoop
Get-Together, in April 2012. Slides are <a href="http://s.apache.org/WFf">available
here</a>, video is <a href="http://s.apache.org/A2o">here</a>.</li>
+        <li><b>Avery Ching introduced</b> Giraph at Hadoop Summit 2011.
<a href="http://www.youtube.com/watch?v=l4nQjAG6fac">Watch the video</a>.</li>
       </ul>
     </section>
   </body>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2e8c2c69/src/site/xdoc/releases.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/releases.xml b/src/site/xdoc/releases.xml
index 189595b..0e6d702 100644
--- a/src/site/xdoc/releases.xml
+++ b/src/site/xdoc/releases.xml
@@ -33,9 +33,18 @@ under the License.
 <p>
 Here are our stable releases of Giraph.</p>
 <ul>
+  <li><strong>1.1.0</strong> is comming soon !</li>
+  <!-- - Download <a href="http://www.apache.org/dyn/closer.cgi/giraph/giraph-1.0.0">here</a>.</li>
-->
   <li><strong>1.0.0</strong> - Download <a href="http://www.apache.org/dyn/closer.cgi/giraph/giraph-1.0.0">here</a>.</li>
 </ul>
 
+<p>
+Giraph is also part of <b>grafos.ml</b>, which is the Real-Time graph processing
framework, developed at Telefonica.</p>
+<ul>
+  <li><strong>0.3.2</strong> - Download <a href="http://grafos.ml/Download.html">here</a>.</li>
+</ul>
+
+
 </section>
 
   </body>


Mime
View raw message