svn commit: r834292 - in /hadoop/hbase/branches/0.20: CHANGES.txt build.xml src/contrib/transactional/src/test/org/apache/hadoop/hbase/client/transactional/TestTransactions.java src/docs/forrest.properties

[jdcryans]

Author: jdcryans
Date: Tue Nov 10 01:35:24 2009
New Revision: 834292

URL: http://svn.apache.org/viewvc?rev=834292&view=rev
Log:
HBASE-1966  Apply the fix from site/ to remove the forrest dependency on java5
HBASE-1967  [Transactional] client.TestTransactions.testPutPutScan fails 
sometimes
               Temporary fix

Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    hadoop/hbase/branches/0.20/build.xml
    
hadoop/hbase/branches/0.20/src/contrib/transactional/src/test/org/apache/hadoop/hbase/client/transactional/TestTransactions.java
    hadoop/hbase/branches/0.20/src/docs/forrest.properties

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=834292&r1=834291&r2=834292&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Tue Nov 10 01:35:24 2009
@@ -41,6 +41,9 @@
                not usable) if the designated regionServer dies before the
                assignment is complete (Yannis Pavlidis via Stack)
    HBASE-1962  Bulk loading script makes regions incorrectly (loadtable.rb)
+   HBASE-1966  Apply the fix from site/ to remove the forrest dependency on 
java5
+   HBASE-1967  [Transactional] client.TestTransactions.testPutPutScan fails 
sometimes
+               Temporary fix
 
   IMPROVEMENTS
    HBASE-1899  Use scanner caching in shell count

Modified: hadoop/hbase/branches/0.20/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/build.xml?rev=834292&r1=834291&r2=834292&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/build.xml (original)
+++ hadoop/hbase/branches/0.20/build.xml Tue Nov 10 01:35:24 2009
@@ -274,7 +274,7 @@
   <!-- Package                                                            -->
   <!-- ================================================================== -->
   <target name="package" depends="jar,javadoc" 
-      description="Build distribution; must define -Djava5.home and 
-Dforrest.home so can generate doc"> 
+      description="Build distribution; must define -Dforrest.home so can 
generate doc"> 
     <echo message="Be sure to run 'docs' target before this one else package 
will be missing site documentation" />
     <mkdir dir="${dist.dir}"/>
     <copy todir="${dist.dir}" includeEmptyDirs="false" flatten="true">
@@ -383,9 +383,7 @@
   <!-- ================================================================== -->
   <target name="docs" depends="forrest.check"
       description="Generate forrest-based documentation. To use, specify 
-Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command 
line." if="forrest.home">
-    <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest" 
failonerror="true" >
-      <env key="JAVA_HOME" value="${java5.home}"/>
-    </exec>
+    <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest" 
failonerror="true" />
     <copy todir="${build.docs}">
       <fileset dir="${docs.src}/build/site/" />
     </copy>
@@ -397,14 +395,10 @@
     </copy>
   </target>
 
-  <target name="forrest.check" unless="forrest.home" depends="java5.check">
+  <target name="forrest.check" unless="forrest.home">
     <fail message="'forrest.home' is not defined. Please pass 
-Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the 
command-line." />
   </target>
 
-  <target name="java5.check" unless="java5.home">
-    <fail message="'java5.home' is not defined.  Forrest requires Java 5.  
Please pass -Djava5.home=&lt;base of Java 5 distribution&gt; to Ant on the 
command-line." />
-  </target>
-
   <!-- Javadoc -->
   <target name="javadoc" description="Generate javadoc">
     <mkdir dir="${build.javadoc}"/>

Modified: 
hadoop/hbase/branches/0.20/src/contrib/transactional/src/test/org/apache/hadoop/hbase/client/transactional/TestTransactions.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/transactional/src/test/org/apache/hadoop/hbase/client/transactional/TestTransactions.java?rev=834292&r1=834291&r2=834292&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/contrib/transactional/src/test/org/apache/hadoop/hbase/client/transactional/TestTransactions.java
 (original)
+++ 
hadoop/hbase/branches/0.20/src/contrib/transactional/src/test/org/apache/hadoop/hbase/client/transactional/TestTransactions.java
 Tue Nov 10 01:35:24 2009
@@ -177,6 +177,11 @@
     int row2Value = 199;
     table.put(transactionState, new Put(ROW2).add(FAMILY, QUAL_A, Bytes
         .toBytes(row2Value)));
+    try {
+      Thread.sleep(500);
+    } catch (InterruptedException ex) {
+      // just ignore
+    }
     
     row2Value = 299;
     table.put(transactionState, new Put(ROW2).add(FAMILY, QUAL_A, Bytes

Modified: hadoop/hbase/branches/0.20/src/docs/forrest.properties
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/docs/forrest.properties?rev=834292&r1=834291&r2=834292&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/docs/forrest.properties (original)
+++ hadoop/hbase/branches/0.20/src/docs/forrest.properties Tue Nov 10 01:35:24 
2009
@@ -65,7 +65,7 @@
 # This set of properties determine if validation is performed
 # Values are inherited unless overridden.
 # e.g. if forrest.validate=false then all others are false unless set to true.
-#forrest.validate=true
+forrest.validate=false
 #forrest.validate.xdocs=${forrest.validate}
 #forrest.validate.skinconf=${forrest.validate}
 #forrest.validate.sitemap=${forrest.validate}