You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/05/26 22:35:31 UTC
svn commit: r1342958 - in /hbase/trunk: ./ hbase-assembly/src/assembly/
hbase-server/src/main/resources/hbase-webapps/static/
hbase-server/src/test/data/
hbase-server/src/test/resources/org/apache/hadoop/hbase/io/
hbase-server/src/test/resources/org/ap...
Author: stack
Date: Sat May 26 20:35:30 2012
New Revision: 1342958
URL: http://svn.apache.org/viewvc?rev=1342958&view=rev
Log:
HBASE-4336 Convert source tree into maven modules
Added:
hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_med.gif (with props)
hbase/trunk/hbase-server/src/test/data/
hbase/trunk/hbase-server/src/test/data/hbase-4388-root.dir.tgz (with props)
hbase/trunk/hbase-server/src/test/resources/org/apache/hadoop/hbase/io/
hbase/trunk/hbase-server/src/test/resources/org/apache/hadoop/hbase/io/hfile/
hbase/trunk/hbase-server/src/test/resources/org/apache/hadoop/hbase/io/hfile/8e8ab58dcf39412da19833fcd8f687ac (with props)
Modified:
hbase/trunk/hbase-assembly/src/assembly/all.xml
hbase/trunk/hbase-site/pom.xml
hbase/trunk/pom.xml
Modified: hbase/trunk/hbase-assembly/src/assembly/all.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-assembly/src/assembly/all.xml?rev=1342958&r1=1342957&r2=1342958&view=diff
==============================================================================
--- hbase/trunk/hbase-assembly/src/assembly/all.xml (original)
+++ hbase/trunk/hbase-assembly/src/assembly/all.xml Sat May 26 20:35:30 2012
@@ -73,14 +73,6 @@
<directoryMode>0755</directoryMode>
</fileSet>
- <!-- Move the site to docs -->
- <fileSet>
- <directory>${parent.basedir}/hbase-server/target/site</directory>
- <outputDirectory>docs</outputDirectory>
- <fileMode>0644</fileMode>
- <directoryMode>0644</directoryMode>
- </fileSet>
-
<!-- Move update script to sbin -->
<fileSet>
<directory>src/packages</directory>
Added: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_med.gif
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_med.gif?rev=1342958&view=auto
==============================================================================
Binary file - no diff available.
Propchange: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_med.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: hbase/trunk/hbase-server/src/test/data/hbase-4388-root.dir.tgz
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/data/hbase-4388-root.dir.tgz?rev=1342958&view=auto
==============================================================================
Binary file - no diff available.
Propchange: hbase/trunk/hbase-server/src/test/data/hbase-4388-root.dir.tgz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: hbase/trunk/hbase-server/src/test/resources/org/apache/hadoop/hbase/io/hfile/8e8ab58dcf39412da19833fcd8f687ac
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/resources/org/apache/hadoop/hbase/io/hfile/8e8ab58dcf39412da19833fcd8f687ac?rev=1342958&view=auto
==============================================================================
Binary file - no diff available.
Propchange: hbase/trunk/hbase-server/src/test/resources/org/apache/hadoop/hbase/io/hfile/8e8ab58dcf39412da19833fcd8f687ac
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: hbase/trunk/hbase-site/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-site/pom.xml?rev=1342958&r1=1342957&r2=1342958&view=diff
==============================================================================
--- hbase/trunk/hbase-site/pom.xml (original)
+++ hbase/trunk/hbase-site/pom.xml Sat May 26 20:35:30 2012
@@ -41,15 +41,31 @@
</dependencies>
<build>
- <plugins>
- <!-- Website/Reference Guide building -->
+ <plugins>
+ <!-- Assemble the javadocs from the dependent projects.
+ Relies on the use of javadoc:aggregate goal -->
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <inputEncoding>UTF-8</inputEncoding>
- <outputEncoding>UTF-8</outputEncoding>
- <templateFile>src/site/site.vm</templateFile>
- </configuration>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-javadocs</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/site/apidocs</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../target/apidocs</directory>
+ <includes>
+ <include>**/**</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<!-- This has to come before the docbx plugin so hbase-default.xml gets transformed
properly -->
@@ -125,6 +141,15 @@
</execution>
</executions>
</plugin>
+ <!-- Website/Reference Guide building -->
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <inputEncoding>UTF-8</inputEncoding>
+ <outputEncoding>UTF-8</outputEncoding>
+ <templateFile>src/site/site.vm</templateFile>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1342958&r1=1342957&r2=1342958&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Sat May 26 20:35:30 2012
@@ -339,9 +339,6 @@
</pluginRepositories>
<build>
- <!-- Some plugins (for example) can be used in the normal build- and the site phase.
- These plugins inherit their options from the <reporting> section below. These settings
- can be overwritten here. -->
<pluginManagement>
<plugins>
<plugin>
@@ -352,8 +349,7 @@
<execution>
<id>javadoc</id>
<goals>
- <goal>javadoc</goal>
- <goal>test-javadoc</goal>
+ <goal>aggregate</goal>
</goals>
<phase>pre-site</phase>
</execution>
@@ -647,28 +643,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
- <!-- All submodules move their javadocs to the apidocs directory -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-javadocs</id>
- <!-- fetch the before creating site documentation -->
- <phase>pre-site</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${javadoc.output.dir}</outputDirectory>
- <resources>
- <resource>
- <directory>target/apidocs</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- Ignore running the assembly in the top-level.
That's all handled by hbase-assembly -->
<plugin>
@@ -733,8 +707,6 @@
<package.pid.dir>/var/run/hbase</package.pid.dir>
<package.release>1</package.release>
<final.name>${project.artifactId}-${project.version}</final.name>
- <!-- Dependency on projects all being at hbase/{project} -->
- <javadoc.output.dir>../hbase-documentation/target/site/apidocs</javadoc.output.dir>
<!-- Intraproject jar naming properties -->
<!-- TODO this is pretty ugly, but works for the moment.