HBASE-6110 Fix TestInfoServers, patch v3 (Jesse)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1343110 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2012-05-27 21:45:03 +00:00
parent 99613b8746
commit 3fa097b01c
6 changed files with 48 additions and 65 deletions

View File

@ -156,8 +156,6 @@ add_maven_main_classes_to_classpath() {
for module in `ls $HBASE_HOME | grep 'hbase-*'`
do
add_to_cp_if_exists "$HBASE_HOME/$module/target/classes"
# Add the root dir too. We need to do this so we can find hbase-webapps
#add_to_cp_if_exists "$HBASE_HOME/$module/target/"
done
}
@ -179,9 +177,10 @@ fi
# For releases, add hbase & webapps to CLASSPATH
# Webapps must come first else it messes up Jetty
if [ -d "$HBASE_HOME/hbase-server/src/main/resources/hbase-webapps" ]; then
add_to_cp_if_exists "$HBASE_HOME/hbase-server/"
if [ -d "$HBASE_HOME/hbase-webapps" ]; then
add_to_cp_if_exists "${HBASE_HOME}"
fi
#add if we are in a dev environment
if [ -d "$HBASE_HOME/hbase-server/target/hbase-webapps" ]; then
add_to_cp_if_exists "${HBASE_HOME}/hbase-server/target"
fi

View File

@ -31,6 +31,7 @@
<artifactId>hbase-assembly</artifactId>
<name>HBase - Assembly</name>
<description>Assembly all HBase modules into deployable packages</description>
<packaging>pom</packaging>
<properties>
<!-- Have to hardcode the final here because the submodule can't seem to resolve parent in ant tasks -->

View File

@ -33,6 +33,33 @@
<description>Main functionality for HBase</description>
<build>
<!-- Makes sure the resources get added before they are processed
by placing this first -->
<resources>
<!-- Add the build webabpps to the classpth -->
<resource>
<directory>${project.build.directory}</directory>
<includes>
<include>hbase-webapps/**</include>
</includes>
</resource>
<resource>
<directory>src/main/resources/</directory>
<includes>
<include>hbase-default.xml</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<includes>
<include>**/**</include>
</includes>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.avro</groupId>
@ -133,20 +160,6 @@
<goal>run</goal>
</goals>
</execution>
<!-- Update the default config with a version-->
<execution>
<phase>process-resources</phase>
<configuration>
<target>
<replace file="${project.build.outputDirectory}/hbase-default.xml"
token="@@@VERSION@@@" value="${project.version}" />
<mkdir dir="${project.build.directory}/nativelib" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
@ -167,23 +180,6 @@
</sources>
</configuration>
</execution>
<!-- Add hbase-site to the test resources -->
<execution>
<id>add-test-resource</id>
<goals>
<goal>add-test-resource</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>src/test/resources</directory>
<includes>
<include>hbase-site.xml</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>

View File

@ -754,9 +754,9 @@
<property skipInDoc="true">
<name>hbase.defaults.for.version</name>
<value>@@@VERSION@@@</value>
<value>${hbase.version}</value>
<description>
This defaults file was compiled for version @@@VERSION@@@. This variable is used
This defaults file was compiled for version ${hbase.version}. This variable is used
to make sure that a user doesn't have an old version of hbase-default.xml on the
classpath.
</description>
@ -770,7 +770,7 @@
the other side of a maven generation; i.e. running in an
ide. You'll want to set this boolean to true to avoid
seeing the RuntimException complaint: "hbase-default.xml file
seems to be for and old version of HBase (@@@VERSION@@@), this
seems to be for and old version of HBase (\${hbase.version}), this
version is X.X.X-SNAPSHOT"
</description>
</property>

View File

@ -22,10 +22,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
<version>0.95-SNAPSHOT</version>
</parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
<version>0.95-SNAPSHOT</version>
</parent>
<artifactId>hbase-site</artifactId>
<packaging>pom</packaging>

32
pom.xml
View File

@ -457,7 +457,11 @@
</configuration>
</execution>
</executions>
</plugin>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
@ -470,10 +474,6 @@
</filesets>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
@ -509,6 +509,9 @@
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven.resources.plugin.version}</version><!--$NO-MVN-MAN-VER$ -->
<configuration>
<escapeString>\</escapeString>
</configuration>
</plugin>
<!-- Make a jar and put the sources in the jar.
In the parent pom, so submodules will do the right thing. -->
@ -618,24 +621,6 @@
</plugins>
</pluginManagement>
<resources>
<resource>
<directory>src/main/resources/</directory>
<includes>
<include>hbase-default.xml</include>
</includes>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<excludes>
<exclude>hbase-site.xml</exclude>
</excludes>
</testResource>
</testResources>
<!-- Plugins inherited by all modules -->
<plugins>
<!-- All submodules build their javadocs -->
@ -661,6 +646,7 @@
</maven.build.timestamp.format>
<buildDate>${maven.build.timestamp}</buildDate>
<compileSource>1.6</compileSource>
<hbase.version>${project.version}</hbase.version>
<!-- Dependencies -->
<avro.version>1.5.3</avro.version>