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

HBASE-1966 Apply the fix from site/ to remove the forrest dependency on java5 

HBASE-1967  [Transactional] client.TestTransactions.testPutPutScan fails sometimes
               Temporary fix


git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@834294 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Daniel Cryans 2009-11-10 01:40:04 +00:00
parent 9ea1470180
commit 9ae54b277b
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -101,6 +101,9 @@ Release 0.21.0 - Unreleased
not usable) if the designated regionServer dies before the not usable) if the designated regionServer dies before the
assignment is complete (Yannis Pavlidis via Stack) assignment is complete (Yannis Pavlidis via Stack)
HBASE-1962 Bulk loading script makes regions incorrectly (loadtable.rb) 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 IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable HBASE-1760 Cleanup TODOs in HTable

12
build.xml
View File

@ -274,7 +274,7 @@
<!-- Package --> <!-- Package -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="package" depends="jar,javadoc" <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" /> <echo message="Be sure to run 'docs' target before this one else package will be missing site documentation" />
<mkdir dir="${dist.dir}"/> <mkdir dir="${dist.dir}"/>
<copy todir="${dist.dir}" includeEmptyDirs="false" flatten="true"> <copy todir="${dist.dir}" includeEmptyDirs="false" flatten="true">
@ -383,9 +383,7 @@
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="docs" depends="forrest.check" <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"> 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" > <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest" failonerror="true" />
<env key="JAVA_HOME" value="${java5.home}"/>
</exec>
<copy todir="${build.docs}"> <copy todir="${build.docs}">
<fileset dir="${docs.src}/build/site/" /> <fileset dir="${docs.src}/build/site/" />
</copy> </copy>
@ -397,14 +395,10 @@
</copy> </copy>
</target> </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." /> <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>
<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 --> <!-- Javadoc -->
<target name="javadoc" description="Generate javadoc"> <target name="javadoc" description="Generate javadoc">
<mkdir dir="${build.javadoc}"/> <mkdir dir="${build.javadoc}"/>

5
src/contrib/transactional/src/test/org/apache/hadoop/hbase/client/transactional/TestTransactions.java
View File

@ -176,6 +176,11 @@ public class TestTransactions extends HBaseClusterTestCase {
int row2Value = 199; int row2Value = 199;
table.put(transactionState, new Put(ROW2).add(FAMILY, QUAL_A, Bytes table.put(transactionState, new Put(ROW2).add(FAMILY, QUAL_A, Bytes
.toBytes(row2Value))); .toBytes(row2Value)));
try {
Thread.sleep(500);
} catch (InterruptedException ex) {
// just ignore
}
row2Value = 299; row2Value = 299;
table.put(transactionState, new Put(ROW2).add(FAMILY, QUAL_A, Bytes table.put(transactionState, new Put(ROW2).add(FAMILY, QUAL_A, Bytes

2
src/docs/forrest.properties
View File

@ -65,7 +65,7 @@
# This set of properties determine if validation is performed # This set of properties determine if validation is performed
# Values are inherited unless overridden. # Values are inherited unless overridden.
# e.g. if forrest.validate=false then all others are false unless set to true. # 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.xdocs=${forrest.validate}
#forrest.validate.skinconf=${forrest.validate} #forrest.validate.skinconf=${forrest.validate}
#forrest.validate.sitemap=${forrest.validate} #forrest.validate.sitemap=${forrest.validate}