couchbase_password_issue

.gitignore

@@ -1,8 +1,11 @@
 *~
 .classpath
 .DS_Store
+.idea/tasks.xml
+.idea/workspace.xml
 .project
 build/
+couchbase-hadoop-plugin-*.zip
 DUMP*
 EXPORT_TABLE*
-lib/ivy*
+lib/ivy*

build.xml

@@ -1,5 +1,5 @@
 <!--
-  Copyright 2011-2012 Couchbase, Inc.
+  Copyright 2011-2014 Couchbase, Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
   <!-- Directory variables -->
   <property name="name" value="couchbase-hadoop-plugin"/>
-  <property name="version" value="1.1-dp2"/>
+  <property name="version" value="1.2.0"/>
   <property name="lib.dir" value="${basedir}/lib" />
   <property name="ivy.dir" location="${basedir}/ivy" />
   <property name="build.dir" value="${basedir}/build" />
@@ -189,7 +189,9 @@
         includes="**/*.java"
         destdir="${build.classes}"
         debug="${javac.debug}"
-        deprecation="${javac.deprecation}">
+        deprecation="${javac.deprecation}"
+        target="1.6"
+        source="1.6">
       <classpath refid="${name}.common.classpath" />
     </javac>
   </target>
@@ -203,7 +205,9 @@
         srcdir="${test.dir}"
         includes="**/*.java"
         destdir="${build.test.classes}"
-        debug="${javac.debug}">
+        debug="${javac.debug}"
+        target="1.6"
+        source="1.6">
       <classpath>
         <path refid="test.classpath"/>
       </classpath>
@@ -290,6 +294,7 @@
         <exclude name="lib/ant-eclipse-1.0-jvm1.2.jar" />
         <exclude name="build.xml" />
         <exclude name="ivy.xml" />
+        <exclude name=".idea/**" />
       </fileset>
     </delete>
   </target>

etc/couchbase-manager.xml

@@ -1,15 +1 @@
-# Copyright 2011-2012 Couchbase, Inc.
-#
-# 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.
-
-com.couchbase.sqoop.manager.CouchbaseFactory=lib/couchbase-hadoop-plugin-1.1-dp2.jar
+com.couchbase.sqoop.manager.CouchbaseFactory=lib/couchbase-hadoop-plugin-1.2.0.jar

etc/install.sh

@@ -1,6 +1,6 @@
-#bin/bash
+#!/bin/bash
 
-# Copyright 2011-2012 Couchbase, Inc.
+# Copyright 2011-2014 Couchbase, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ function check_file_exists {
 
 f_config=$PWD/couchbase-config.xml
 f_manager=$PWD/couchbase-manager.xml
-f_plugin=$PWD/couchbase-hadoop-plugin-1.1-dp2.jar
+f_plugin=$PWD/couchbase-hadoop-plugin-1.2.0.jar
 
 if [ $# -ne 1 ]; then
   echo "usage: ./install.sh path_to_sqoop_home"

ivy.xml

@@ -31,7 +31,7 @@
   </configurations>
 
   <dependencies>
-    <dependency org="com.cloudera.sqoop" name="sqoop" rev="${sqoop.version}"
+    <dependency org="org.apache.sqoop" name="sqoop" rev="${sqoop.version}"
         conf="common->master">
       <artifact name="sqoop" type="jar"/>
       <artifact name="sqoop" type="test-jar" ext="jar" m:classifier="tests"/>
@@ -41,11 +41,27 @@
         rev="${hadoop-core.cloudera.version}" conf="common->master"/>
     <dependency org="org.apache.hadoop" name="hadoop-test"
         rev="${hadoop-core.cloudera.version}" conf="common->master"/>
+    <dependency org="org.apache.hadoop" name="hadoop-hdfs"
+        rev="${hadoop.version}" conf="common->master"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common"
+        rev="${hadoop.version}" conf="common->master"/>
+    <dependency org="org.apache.hadoop" name="hadoop-auth"
+        rev="${hadoop-auth.cloudera.version}" conf="common->master"/>
 
-    <dependency org="org.jboss.netty" name="netty"
+    <dependency org="io.netty" name="netty"
         rev="${netty.version}" conf="common->master"/>
+      <dependency org="com.google.guava" name="guava-bootstrap"
+                  rev="${guava-bootstrap.version}" conf="common->master"/>
+    <dependency org="com.google.guava" name="guava"
+        rev="${guava.version}" conf="common->master"/>
+    <dependency org="commons-collections" name="commons-collections"
+        rev="${commons-collections.version}" conf="common->master"/>
     <dependency org="commons-cli" name="commons-cli"
         rev="${commons-cli.version}" conf="common->master"/>
+    <dependency org="commons-configuration" name="commons-configuration"
+        rev="${commons-configuration.version}" conf="common->master"/>
+    <dependency org="commons-lang" name="commons-lang"
+        rev="${commons-lang.version}" conf="common->master"/>
     <dependency org="commons-io" name="commons-io"
         rev="${commons-io.version}" conf="common->master"/>
     <dependency org="org.codehaus.jettison" name="jettison"
@@ -54,6 +70,10 @@
         rev="${jackson.version}" conf="common->master"/>
     <dependency org="org.codehaus.jackson" name="jackson-core-asl"
         rev="${jackson.version}" conf="common->master"/>
+    <dependency org="org.slf4j" name="slf4j-api"
+        rev="${slf4j-api.version}" conf="common->master"/>
+    <dependency org="org.apache.avro" name="avro"
+        rev="${avro.version}" conf="common->master"/>
 
     <dependency org="commons-codec" name="commons-codec"
         rev="${commons-codec.version}" conf="common->master"/>
@@ -65,24 +85,13 @@
         conf="common->master"/>
     <dependency org="hsqldb" name="hsqldb" rev="${hsqldb.version}"
         conf="common->master"/>
-    <dependency org="couchbase" name="couchbase-client" rev="${couchbase-client.version}"
+    <dependency org="com.couchbase.client" name="couchbase-client" rev="${couchbase-client.version}"
         conf="common->default"/>
-    <dependency org="spy" name="spymemcached" rev="${spymemcached.version}"
+    <dependency org="net.spy" name="spymemcached" rev="${spymemcached.version}"
         conf="common->default"/>
     <dependency org="commons-httpclient" name="commons-httpclient"
         rev="${commons-httpclient.version}" conf="common->master"/>
 
-    <dependency org="org.apache.hbase" name="hbase" rev="${hbase.version}"
-        conf="common->master">
-      <artifact name="hbase" type="jar"/>
-      <artifact name="hbase" type="test-jar" ext="jar"/>
-      <exclude org="com.sun.jersey" module="jersey-core"/>
-      <exclude org="com.sun.jersey" module="jersey-json"/>
-      <exclude org="com.sun.jersey" module="jersey-server"/>
-      <exclude org="org.apache.thrift" module="thrift"/>
-      <exclude org="log4j" module="log4j"/>
-    </dependency>
-
     <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
         conf="checkstyle->default" />
   </dependencies>