You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2012/05/27 07:29:44 UTC
svn commit: r1342995 - in /hbase/trunk: bin/hbase hbase-assembly/pom.xml
hbase-server/pom.xml hbase-site/pom.xml pom.xml
Author: tedyu
Date: Sun May 27 05:29:43 2012
New Revision: 1342995
URL: http://svn.apache.org/viewvc?rev=1342995&view=rev
Log:
HBASE-6110 Fix TestInfoServers (Jesse Yates)
Modified:
hbase/trunk/bin/hbase
hbase/trunk/hbase-assembly/pom.xml
hbase/trunk/hbase-server/pom.xml
hbase/trunk/hbase-site/pom.xml
hbase/trunk/pom.xml
Modified: hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=1342995&r1=1342994&r2=1342995&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Sun May 27 05:29:43 2012
@@ -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
Modified: hbase/trunk/hbase-assembly/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-assembly/pom.xml?rev=1342995&r1=1342994&r2=1342995&view=diff
==============================================================================
--- hbase/trunk/hbase-assembly/pom.xml (original)
+++ hbase/trunk/hbase-assembly/pom.xml Sun May 27 05:29:43 2012
@@ -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 -->
Modified: hbase/trunk/hbase-server/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/pom.xml?rev=1342995&r1=1342994&r2=1342995&view=diff
==============================================================================
--- hbase/trunk/hbase-server/pom.xml (original)
+++ hbase/trunk/hbase-server/pom.xml Sun May 27 05:29:43 2012
@@ -33,6 +33,32 @@
<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>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <excludes>
+ <exclude>hbase-site.xml</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+
<plugins>
<plugin>
<groupId>org.apache.avro</groupId>
@@ -167,23 +193,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>
Modified: hbase/trunk/hbase-site/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-site/pom.xml?rev=1342995&r1=1342994&r2=1342995&view=diff
==============================================================================
--- hbase/trunk/hbase-site/pom.xml (original)
+++ hbase/trunk/hbase-site/pom.xml Sun May 27 05:29:43 2012
@@ -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>
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1342995&r1=1342994&r2=1342995&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Sun May 27 05:29:43 2012
@@ -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>
@@ -471,10 +475,6 @@
</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>
<version>${findbugs.version}</version>
@@ -618,24 +618,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 -->