Author: edwardyoon
Date: Mon Apr 9 10:18:06 2012
New Revision: 1311188
URL: http://svn.apache.org/viewvc?rev=1311188&view=rev
Log:
Include the API and other docs in the Hama release
Added:
incubator/hama/trunk/docs/ (with props)
Modified:
incubator/hama/trunk/CHANGES.txt
incubator/hama/trunk/pom.xml
incubator/hama/trunk/src/assemble/core.xml
Modified: incubator/hama/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1311188&r1=1311187&r2=1311188&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Mon Apr 9 10:18:06 2012
@@ -16,6 +16,7 @@ Release 0.5 - Unreleased
IMPROVEMENTS
+ HAMA-545: Include the API and other docs in the Hama release (Suraj Menon
via edwardyoon)
HAMA-543: Make best effort to start BSP Task on the host
where the input split is located. (Suraj Menon via edwardyoon)
HAMA-527: Update commons-configuration version (edwardyoon)
Propchange: incubator/hama/trunk/docs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 9 10:18:06 2012
@@ -0,0 +1 @@
+apidocs
Modified: incubator/hama/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/pom.xml?rev=1311188&r1=1311187&r2=1311188&view=diff
==============================================================================
--- incubator/hama/trunk/pom.xml (original)
+++ incubator/hama/trunk/pom.xml Mon Apr 9 10:18:06 2012
@@ -311,6 +311,7 @@
<excludes>
<exclude>**/*.asc</exclude>
<exclude>**/logs/**</exclude>
+ <exclude>**/docs/**</exclude>
<exclude>CHANGES.txt</exclude>
<exclude>conf/groomservers</exclude>
<exclude>src/site/resources/files/hama-eclipse-formatter.xml</exclude>
@@ -343,11 +344,28 @@
<includes>
<include>lib/**</include>
<include>logs/**</include>
+ <include>docs/apidocs/**</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ <outputDirectory>docs/apidocs</outputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>aggregate-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: incubator/hama/trunk/src/assemble/core.xml
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/src/assemble/core.xml?rev=1311188&r1=1311187&r2=1311188&view=diff
==============================================================================
--- incubator/hama/trunk/src/assemble/core.xml (original)
+++ incubator/hama/trunk/src/assemble/core.xml Mon Apr 9 10:18:06 2012
@@ -84,6 +84,10 @@
<outputDirectory>../hama-${project.version}/conf</outputDirectory>
<fileMode>755</fileMode>
</fileSet>
+ <fileSet>
+ <directory>../docs</directory>
+ <outputDirectory>../hama-${project.version}/docs</outputDirectory>
+ </fileSet>
</fileSets>
</sources>
<binaries>
