cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Reverting HBase test changes in 3.0.x
Date Mon, 24 Nov 2014 21:29:59 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 1e4a285f0 -> 5201c006a


Reverting HBase test changes in 3.0.x


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5201c006
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5201c006
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5201c006

Branch: refs/heads/3.0.x-fixes
Commit: 5201c006ac0e86c256af8067751a2c5ef3871bb2
Parents: 1e4a285
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Mon Nov 24 21:29:36 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Mon Nov 24 21:29:36 2014 +0000

----------------------------------------------------------------------
 parent/pom.xml                                        |  2 +-
 .../cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/5201c006/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bfc0929..cbaac72 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -642,7 +642,7 @@
             <dependency>
                 <groupId>org.apache.hbase</groupId>
                 <artifactId>hbase-client</artifactId>
-                <version>0.99.0</version>
+                <version>0.98.3-hadoop2</version>
                 <exclusions>
                     <exclusion>
                         <groupId>io.netty</groupId>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5201c006/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
index c0c07ee..4e89706 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseVisitorTest.java
@@ -23,13 +23,12 @@ import org.apache.cxf.jaxrs.ext.search.SearchCondition;
 import org.apache.cxf.jaxrs.ext.search.fiql.FiqlParser;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.Connection;
-import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.apache.hadoop.hbase.client.HConnection;
+import org.apache.hadoop.hbase.client.HConnectionManager;
+import org.apache.hadoop.hbase.client.HTableInterface;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.filter.Filter;
 
 import org.junit.After;
@@ -42,13 +41,14 @@ public class HBaseVisitorTest extends Assert {
     public static final byte[] BOOK_FAMILY = "book".getBytes();
     public static final byte[] NAME_QUALIFIER = "name".getBytes();
     
-    Table table;
+    HConnection connection;
+    HTableInterface table;
     @Before
     public void setUp() throws Exception {
         try {
             Configuration hBaseConfig =  HBaseConfiguration.create();
-            Connection connection = ConnectionFactory.createConnection(hBaseConfig);
-            table = connection.getTable(TableName.valueOf("books"));
+            connection = HConnectionManager.createConnection(hBaseConfig);
+            table = connection.getTable("books");
         } catch (Throwable t) {
             t.printStackTrace();
         }


Mime
View raw message