Author: stack
Date: Tue Mar 15 23:15:38 2011
New Revision: 1081994
URL: http://svn.apache.org/viewvc?rev=1081994&view=rev
Log:
HBASE-3600 Update our jruby to 1.6.0
Added:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/pom.xml
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1081994&r1=1081993&r2=1081994&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Mar 15 23:15:38 2011
@@ -112,6 +112,7 @@ Release 0.91.0 - Unreleased
HBASE-3610 Improve RegionSplitter performance
HBASE-2495 Allow record filtering with selected row key values in HBase
Export (Subbu M Iyer via Stack)
+ HBASE-3600 Update our jruby to 1.6.0
TASK
HBASE-3559 Move report of split to master OFF the heartbeat channel
Modified: hbase/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1081994&r1=1081993&r2=1081994&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Tue Mar 15 23:15:38 2011
@@ -528,8 +528,7 @@
<jetty.version>6.1.26</jetty.version>
<jetty.jspapi.version>6.1.14</jetty.jspapi.version>
<jersey.version>1.4</jersey.version>
- <!--JRuby > 1.0.x has *GPL jars in it so we can't upgrade. See
HBASE-3374-->
- <jruby.version>1.0.3</jruby.version>
+ <jruby.version>1.6.0</jruby.version>
<jsr311.version>1.1.1</jsr311.version>
<junit.version>4.8.1</junit.version>
<log4j.version>1.2.16</log4j.version>
Added: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestShell.java?rev=1081994&view=auto
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
(added)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestShell.java Tue
Mar 15 23:15:38 2011
@@ -0,0 +1,72 @@
+/**
+ * Copyright 2009 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.hadoop.hbase.client;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import org.jruby.embed.ScriptingContainer;
+import org.jruby.embed.PathType;
+
+/**
+ *
+ * @author scoundrel
+ */
+public class TestShell {
+ final Log LOG = LogFactory.getLog(getClass());
+ private final static HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
+ private final static ScriptingContainer jruby = new ScriptingContainer();
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ // Start mini cluster
+ TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100);
+ TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250);
+ TEST_UTIL.getConfiguration().setInt("hbase.client.retries.number", 6);
+ TEST_UTIL.startMiniCluster();
+
+ // Configure jruby runtime
+ List<String> loadPaths = new ArrayList();
+ loadPaths.add("src/main/ruby");
+ loadPaths.add("src/test/ruby");
+ jruby.getProvider().setLoadPaths(loadPaths);
+ jruby.put("$TEST_CLUSTER", TEST_UTIL);
+ }
+
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ TEST_UTIL.shutdownMiniCluster();
+ }
+
+ @Test
+ public void testRunShellTests() throws IOException {
+ // Start all ruby tests
+ jruby.runScriptlet(PathType.ABSOLUTE, "src/test/ruby/tests_runner.rb");
+ }
+}
