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/09/20 07:05:45 UTC
svn commit: r1387860 - in /hbase/trunk: pom.xml src/assembly/components.xml
src/assembly/hadoop-one-compat.xml src/assembly/hadoop-two-compat.xml
Author: stack
Date: Thu Sep 20 05:05:44 2012
New Revision: 1387860
URL: http://svn.apache.org/viewvc?rev=1387860&view=rev
Log:
HBASE-6178 LoadTest tool no longer packaged after the modularization
Added:
hbase/trunk/src/assembly/components.xml
Modified:
hbase/trunk/pom.xml
hbase/trunk/src/assembly/hadoop-one-compat.xml
hbase/trunk/src/assembly/hadoop-two-compat.xml
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1387860&r1=1387859&r2=1387860&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Thu Sep 20 05:05:44 2012
@@ -610,8 +610,8 @@
</plugin>
</plugins>
</pluginManagement>
- <!-- Plugins inherited by all modules -->
<plugins>
+ <!-- hbase parent only plugins -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly.version}</version>
@@ -626,12 +626,7 @@
</descriptors>
</configuration>
</plugin>
- <!-- All submodules build their javadocs -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <!--The below plugins are about site generation.
+ <!--The below plugins are about site generation.
They are all marked as not to be in herited by child
modules. The plugins are meant to run here in the
parent project only.
@@ -797,7 +792,13 @@
</execution>
</executions>
</plugin>
- </plugins>
+ <!-- Plugins inherited by all modules -->
+ <!-- All submodules build their javadocs -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
<properties>
<tar.name>${project.build.finalName}.tar.gz</tar.name>
Added: hbase/trunk/src/assembly/components.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/assembly/components.xml?rev=1387860&view=auto
==============================================================================
--- hbase/trunk/src/assembly/components.xml (added)
+++ hbase/trunk/src/assembly/components.xml Thu Sep 20 05:05:44 2012
@@ -0,0 +1,108 @@
+<!--
+/**
+ * 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.
+ */
+-->
+<component>
+ <fileSets>
+ <!--Copy over the site if built as docs dir -->
+ <fileSet>
+ <directory>target/site</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+ <!-- Include top level text files -->
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+ <!-- Include the top level conf directory -->
+ <fileSet>
+ <directory>conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <!-- Include top level bin directory -->
+ <fileSet>
+ <directory>bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <!--Include top-level src. Module src done down below -->
+ <fileSet>
+ <directory>src</directory>
+ <outputDirectory>src</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <!-- Include dev-support directory -->
+ <fileSet>
+ <directory>dev-support</directory>
+ <outputDirectory>dev-support</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <!-- Move the ruby code over -->
+ <fileSet>
+ <directory>hbase-server/src/main/ruby</directory>
+ <outputDirectory>lib/ruby</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <!-- Move the webapps to the webapp dir -->
+ <fileSet>
+ <directory>hbase-server/target/hbase-webapps</directory>
+ <outputDirectory>hbase-webapps</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <!-- Include native libraries -->
+ <fileSet>
+ <directory>hbase-server/target/native</directory>
+ <outputDirectory>native</outputDirectory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ <includes>
+ <include>*.so</include>
+ </includes>
+ </fileSet>
+ <!-- This is only necessary until maven fixes the intra-project dependency bug
+ in maven 3.0. Until then, we have to include the test jars for sub-projects. When
+ fixed, the below dependencySet stuff is sufficient for pulling in the test jars as
+ well, as long as they are added as dependencies in this project. Right now, we only
+ have 1 submodule to accumulate, but we can copy/paste as necessary until maven is
+ fixed. -->
+ <fileSet>
+ <directory>hbase-server/target/</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>${server.test.jar}</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ </fileSets>
+</component>
\ No newline at end of file
Modified: hbase/trunk/src/assembly/hadoop-one-compat.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/assembly/hadoop-one-compat.xml?rev=1387860&r1=1387859&r2=1387860&view=diff
==============================================================================
Binary files - no diff available.
Modified: hbase/trunk/src/assembly/hadoop-two-compat.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/assembly/hadoop-two-compat.xml?rev=1387860&r1=1387859&r2=1387860&view=diff
==============================================================================
Binary files - no diff available.