hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1343081 - in /hbase/trunk: bin/hbase hbase-assembly/pom.xml hbase-server/pom.xml hbase-site/pom.xml pom.xml
Date Sun, 27 May 2012 19:31:48 GMT
Author: tedyu
Date: Sun May 27 19:31:47 2012
New Revision: 1343081

URL: http://svn.apache.org/viewvc?rev=1343081&view=rev
Log:
HBASE-6110 Revert due to increased number of failed tests

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=1343081&r1=1343080&r2=1343081&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Sun May 27 19:31:47 2012
@@ -156,6 +156,8 @@ 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
 }
 
@@ -177,10 +179,9 @@ fi
 
 # For releases, add hbase & webapps to CLASSPATH
 # Webapps must come first else it messes up Jetty
-if [ -d "$HBASE_HOME/hbase-webapps" ]; then
-  add_to_cp_if_exists "${HBASE_HOME}"
+if [ -d "$HBASE_HOME/hbase-server/src/main/resources/hbase-webapps" ]; then
+  add_to_cp_if_exists "$HBASE_HOME/hbase-server/"
 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=1343081&r1=1343080&r2=1343081&view=diff
==============================================================================
--- hbase/trunk/hbase-assembly/pom.xml (original)
+++ hbase/trunk/hbase-assembly/pom.xml Sun May 27 19:31:47 2012
@@ -31,7 +31,6 @@
   <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=1343081&r1=1343080&r2=1343081&view=diff
==============================================================================
--- hbase/trunk/hbase-server/pom.xml (original)
+++ hbase/trunk/hbase-server/pom.xml Sun May 27 19:31:47 2012
@@ -33,32 +33,6 @@
   <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>
@@ -193,6 +167,23 @@
               </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=1343081&r1=1343080&r2=1343081&view=diff
==============================================================================
--- hbase/trunk/hbase-site/pom.xml (original)
+++ hbase/trunk/hbase-site/pom.xml Sun May 27 19:31:47 2012
@@ -22,11 +22,10 @@
   <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=1343081&r1=1343080&r2=1343081&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Sun May 27 19:31:47 2012
@@ -457,11 +457,7 @@
               </configuration>
             </execution>
           </executions>
-        </plugin>
-        <plugin>
-          <artifactId>maven-surefire-report-plugin</artifactId>
-          <version>${surefire.version}</version>
-        </plugin>
+        </plugin>        
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
           <configuration>
@@ -475,6 +471,10 @@
           </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,6 +618,24 @@
       </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 -->



Mime
View raw message