Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-6178 LoadTest tool no longer packaged after the modularization 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1387860 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-09-20 05:05:44 +00:00
parent 1afea63673
commit 94774e37b2
4 changed files with 133 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pom.xml
View File

@ -610,8 +610,8 @@
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<!-- Plugins inherited by all modules -->
<plugins> <plugins>
<!-- hbase parent only plugins -->
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly.version}</version> <version>${maven.assembly.version}</version>
@ -626,12 +626,7 @@
</descriptors> </descriptors>
</configuration> </configuration>
</plugin> </plugin>
<!-- All submodules build their javadocs --> <!--The below plugins are about site generation.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<!--The below plugins are about site generation.
They are all marked as not to be in herited by child They are all marked as not to be in herited by child
modules. The plugins are meant to run here in the modules. The plugins are meant to run here in the
parent project only. parent project only.
@ -797,7 +792,13 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> </build>
<properties> <properties>
<tar.name>${project.build.finalName}.tar.gz</tar.name> <tar.name>${project.build.finalName}.tar.gz</tar.name>

108
src/assembly/components.xml Normal file
View File

@ -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>

104
src/assembly/hadoop-one-compat.xml
View File

@ -22,112 +22,26 @@
*/ */
--> -->
<!--This 'all' id is not appended to the produced bundle because <!--This 'all' id is not appended to the produced bundle because we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers -->
we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers -->
<id>all</id> <id>all</id>
<formats> <formats>
<format>tar.gz</format> <format>tar.gz</format>
</formats> </formats>
<fileSets> <componentDescriptors>
<!--Copy over the site if built as docs dir--> <componentDescriptor>src/assembly/components.xml</componentDescriptor>
<fileSet> </componentDescriptors>
<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>${parent.basedir}/hbase-server/target/</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>${server.test.jar}</include>
</includes>
<fileMode>0644</fileMode>
</fileSet>
</fileSets>
<moduleSets> <moduleSets>
<moduleSet> <moduleSet>
<!-- Enable access to all projects in the current multimodule build. Eclipse <!-- Enable access to all projects in the current multimodule build. Eclipse
says this is an error, but builds from the command line just fine. --> says this is an error, but builds from the command line just fine. -->
<useAllReactorProjects>true</useAllReactorProjects> <useAllReactorProjects>true</useAllReactorProjects>
<!-- This should work with more than 1 source module --> <!-- This should work with more than 1 source module -->
<!-- Now, select which projects to include in this module-set. --> <!-- For now, select which projects to include in this module-set. -->
<!-- Just add future modules here assuming the wildcare doesn't match -->
<includes> <includes>
<include>org.apache.hbase:hbase-common</include> <include>org.apache.hbase:hbase-common</include>
<include>org.apache.hbase:hbase-hadoop-compat</include> <include>org.apache.hbase:hbase-hadoop-compat</include>
<include>org.apache.hbase:hbase-hadoop1-compat</include>
<include>org.apache.hbase:hbase-server</include> <include>org.apache.hbase:hbase-server</include>
<include>org.apache.hbase:hbase-hadoop1-compat</include>
</includes> </includes>
<!-- Include all the sources in the top directory --> <!-- Include all the sources in the top directory -->
<sources> <sources>
@ -143,14 +57,14 @@
</fileSet> </fileSet>
</fileSets> </fileSets>
</sources> </sources>
<!-- Binaries for the dependencies also go in the hbase-jars directory --> <!-- Binaries for the dependencies also go in the lib directory -->
<binaries> <binaries>
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
<dependencySets> <dependencySets>
<dependencySet/> <dependencySet />
</dependencySets> </dependencySets>
</binaries> </binaries>
</moduleSet> </moduleSet>
</moduleSets> </moduleSets>
</assembly> </assembly>

99
src/assembly/hadoop-two-compat.xml
View File

@ -22,99 +22,14 @@
*/ */
--> -->
<!--This 'all' id is not appended to the produced bundle because <!--This 'all' id is not appended to the produced bundle because we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers -->
we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers -->
<id>all</id> <id>all</id>
<formats> <formats>
<format>tar.gz</format> <format>tar.gz</format>
</formats> </formats>
<fileSets> <componentDescriptors>
<!--Copy over the site if built as docs dir--> <componentDescriptor>src/assembly/components.xml</componentDescriptor>
<fileSet> </componentDescriptors>
<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>${parent.basedir}/hbase-server/target/</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>${server.test.jar}</include>
</includes>
<fileMode>0644</fileMode>
</fileSet>
</fileSets>
<moduleSets> <moduleSets>
<moduleSet> <moduleSet>
<!-- Enable access to all projects in the current multimodule build. Eclipse <!-- Enable access to all projects in the current multimodule build. Eclipse
@ -126,8 +41,8 @@
<includes> <includes>
<include>org.apache.hbase:hbase-common</include> <include>org.apache.hbase:hbase-common</include>
<include>org.apache.hbase:hbase-hadoop-compat</include> <include>org.apache.hbase:hbase-hadoop-compat</include>
<include>org.apache.hbase:hbase-hadoop2-compat</include>
<include>org.apache.hbase:hbase-server</include> <include>org.apache.hbase:hbase-server</include>
<include>org.apache.hbase:hbase-hadoop1-compat</include>
</includes> </includes>
<!-- Include all the sources in the top directory --> <!-- Include all the sources in the top directory -->
<sources> <sources>
@ -148,9 +63,9 @@
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
<dependencySets> <dependencySets>
<dependencySet/> <dependencySet />
</dependencySets> </dependencySets>
</binaries> </binaries>
</moduleSet> </moduleSet>
</moduleSets> </moduleSets>
</assembly> </assembly>