Index: ivy.xml =================================================================== --- ivy.xml (revision 0) +++ ivy.xml (revision 0) @@ -0,0 +1,123 @@ + + + + + + + + Hadoop Core + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/test/org/apache/hadoop/hbase/TestInfoServers.java =================================================================== --- src/test/org/apache/hadoop/hbase/TestInfoServers.java (revision 896740) +++ src/test/org/apache/hadoop/hbase/TestInfoServers.java (working copy) @@ -40,6 +40,7 @@ // sourcing the src/test/hbase-default.xml. conf.setInt("hbase.master.info.port", 60011); conf.setInt("hbase.regionserver.info.port", 60031); + LOG.info("set configuration for hbase.master.info.port and hbase.regionsever.info.port"); } /** @@ -48,6 +49,8 @@ public void testInfoServersAreUp() throws Exception { // give the cluster time to start up new HTable(conf, ".META."); + LOG.info("HTable set up"); + int port = cluster.getMaster().getInfoServer().getPort(); assertHasExpectedContent(new URL("http://localhost:" + port + "/index.html"), "master"); @@ -55,6 +58,7 @@ getInfoServer().getPort(); assertHasExpectedContent(new URL("http://localhost:" + port + "/index.html"), "regionserver"); + LOG.info("Test Info Servers are Up !"); } private void assertHasExpectedContent(final URL u, final String expected) Index: src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java =================================================================== --- src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java (revision 896740) +++ src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java (working copy) @@ -120,10 +120,11 @@ protected void setUp() throws Exception { try { if (this.startDfs) { + LOG.info("DFS Cluster setup to be done " + this.conf); // This spews a bunch of warnings about missing scheme. TODO: fix. this.dfsCluster = new MiniDFSCluster(0, this.conf, 2, true, true, true, null, null, null, null); - + LOG.info("DFS Cluster setup completed: " + this.dfsCluster); // mangle the conf so that the fs parameter points to the minidfs we // just started up FileSystem filesystem = dfsCluster.getFileSystem(); @@ -131,7 +132,9 @@ Path parentdir = filesystem.getHomeDirectory(); conf.set(HConstants.HBASE_DIR, parentdir.toString()); filesystem.mkdirs(parentdir); + LOG.info("FS mkdirs " + parentdir); FSUtils.setVersion(filesystem, parentdir); + LOG.info("FS setversion " + parentdir); } // do the super setup now. if we had done it first, then we would have Index: src/contrib/transactional/ivy.xml =================================================================== --- src/contrib/transactional/ivy.xml (revision 0) +++ src/contrib/transactional/ivy.xml (revision 0) @@ -0,0 +1,101 @@ + + + + + + + + Hadoop Core + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/contrib/transactional/build.xml =================================================================== --- src/contrib/transactional/build.xml (revision 896740) +++ src/contrib/transactional/build.xml (working copy) @@ -21,8 +21,23 @@ Before you can run these subtargets directly, you need to call at top-level: ant deploy-contrib compile-core-test --> - + + + + + + + + + + + + + + + + @@ -33,8 +48,8 @@ - - + + Index: src/contrib/stargate/ivy.xml =================================================================== --- src/contrib/stargate/ivy.xml (revision 0) +++ src/contrib/stargate/ivy.xml (revision 0) @@ -0,0 +1,115 @@ + + + + + + + + Hadoop Core + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/contrib/stargate/build.xml =================================================================== --- src/contrib/stargate/build.xml (revision 896740) +++ src/contrib/stargate/build.xml (working copy) @@ -1,7 +1,7 @@ + + - - @@ -14,6 +14,14 @@ + + + + + + + + @@ -25,7 +33,7 @@ - + @@ -42,7 +50,7 @@ - + Index: src/contrib/build-contrib.xml =================================================================== --- src/contrib/build-contrib.xml (revision 896740) +++ src/contrib/build-contrib.xml (working copy) @@ -23,19 +23,17 @@ - - + - + + + + - - - - @@ -43,18 +41,19 @@ + - + + value="http://java.sun.com/j2se/1.6/docs/api/"/> @@ -71,26 +70,30 @@ + + - - - + + - - - + + + + + - - + + + + + - - @@ -117,7 +120,7 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ivy/libraries.properties =================================================================== --- ivy/libraries.properties (revision 0) +++ ivy/libraries.properties (revision 0) @@ -0,0 +1,49 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#This properties file lists the versions of the various artifacts used by hadoop and components. +#It drives ivy and the generation of a maven POM + +#These are the versions of our dependencies (in alphabetical order) +apacheant.version=1.7.1 +ant-task.version=2.0.10 + +ivy.version=2.1.0 + +hadoop-core.version=0.21.0-SNAPSHOT +hadoop-hdfs.version=0.21.0-SNAPSHOT +hadoop-mapred.version=0.21.0-SNAPSHOT + +zookeeper.version=3.2.2 +thrift.version=r771587 + +lucene.version=2.2.0 + +jsr311.version=1.1.1 + +commons-cli.version=1.2 + +commons-math.version=2.0 +log4j.version=1.2.15 + + +jersey.version=1.1.4.1 + +protobuf.version=2.1.0 + +jruby.version=1.3.1 + + + + + + Index: ivy-targets.xml =================================================================== --- ivy-targets.xml (revision 0) +++ ivy-targets.xml (revision 0) @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + You need Apache Ivy 2.0 or later from http://ant.apache.org/ + It could not be loaded from ${ivy_repo_url} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: ivy-targets.xml ___________________________________________________________________ Added: svn:executable + * Index: build.xml =================================================================== --- build.xml (revision 896740) +++ build.xml (working copy) @@ -88,6 +88,14 @@ + + + + + + + + - - - + + + + + + @@ -147,7 +158,7 @@ - + - + - + @@ -187,9 +198,9 @@ - + - + @@ -201,7 +212,7 @@ - + @@ -290,7 +301,7 @@ - + @@ -413,11 +424,11 @@ doctitle="${Name} ${version} API" bottom="Copyright © ${year} The Apache Software Foundation" > - + - + @@ -426,10 +437,10 @@ - - + + - + @@ -439,18 +450,28 @@ ${src.test} *must* come before rest of class path. Otherwise the test hbase-site.xml will not be found. ============ * * * * * N O T E * * * * * ============ --> - + + + + + + + + - - + + + + + - + + description="Build test jar and run tests"> + includes="**/TestInfoServers*.java" excludes="**/${test.exclude}.java" /> @@ -522,7 +543,7 @@ - +