BIGTOP-805. add Sqoop 2 to Bigtop

12 files changed, 53 insertions, 85 deletions

diff --git a/bigtop-packages/src/deb/sqoop/changelog b/bigtop-packages/src/deb/sqoop/changelog
index 547ed021..d4858cd4 100644
--- a/bigtop-packages/src/deb/sqoop/changelog
+++ b/bigtop-packages/src/deb/sqoop/changelog
@@ -1 +1 @@
---- This is auto-generated 
+--- This is auto-generated
diff --git a/bigtop-packages/src/deb/sqoop/compat b/bigtop-packages/src/deb/sqoop/compat
index 7f8f011e..4d446d8d 100644
--- a/bigtop-packages/src/deb/sqoop/compat
+++ b/bigtop-packages/src/deb/sqoop/compat
@@ -1 +1,2 @@
 7
+
diff --git a/bigtop-packages/src/deb/sqoop/control b/bigtop-packages/src/deb/sqoop/control
index dcc61069..39d911b8 100644
--- a/bigtop-packages/src/deb/sqoop/control
+++ b/bigtop-packages/src/deb/sqoop/control
@@ -16,20 +16,21 @@ Source: sqoop
 Section: misc
 Priority: extra
 Maintainer: Bigtop <dev@bigtop.apache.org>
-Build-Depends: debhelper (>= 7.0.50~), asciidoc, xmlto
 Standards-Version: 3.8.0
-Homepage: http://incubator.apache.org/sqoop/
+Homepage: http://sqoop.apache.org/
 
 Package:  sqoop
 Architecture: all
-Depends: hadoop-client, bigtop-utils
-Description: Sqoop allows easy imports and exports of data sets between databases and the Hadoop Distributed File System (HDFS).
- Sqoop allows easy imports and exports of data sets between databases and the Hadoop Distributed File System (HDFS).
+Depends: bigtop-utils, hadoop-client, bigtop-tomcat, sqoop-client (= ${source:Version})
+Description: Tool for easy imports and exports of data sets between databases and the Hadoop ecosystem
+ Sqoop is a tool that provides the ability to import and export data sets between
+ the Hadoop Distributed File System (HDFS) and relational databases.
 
-Package: sqoop-metastore
+Package: sqoop-client
 Architecture: all
-Depends: sqoop (= ${source:Version}), adduser
-Description: Shared metadata repository for Sqoop. 
- Shared metadata repository for Sqoop. This optional package hosts a metadata
- server for Sqoop clients across a network to use.
+Description: Lightweight client for Sqoop.
 
+Package: sqoop-server
+Architecture: all
+Depends: sqoop (= ${source:Version})
+Description: Server for Sqoop.
diff --git a/bigtop-packages/src/deb/sqoop/copyright b/bigtop-packages/src/deb/sqoop/copyright
index ec176a91..fa3369a4 100644
--- a/bigtop-packages/src/deb/sqoop/copyright
+++ b/bigtop-packages/src/deb/sqoop/copyright
@@ -1,9 +1,9 @@
 Format: http://dep.debian.net/deps/dep5
-Source: http://incubator.apache.org/projects/sqoop.html
+Source: http://sqoop.apache.org
 Upstream-Name: Sqoop
 
-Files *
-Copyright: 2011, The Apache Software Foundation
+Files debian/*
+Copyright: 2013, The Apache Software Foundation
 License: Apache-2.0
 
 License: Apache-2.0
diff --git a/bigtop-packages/src/deb/sqoop/rules b/bigtop-packages/src/deb/sqoop/rules
index 7992dcde..3ee27f98 100755
--- a/bigtop-packages/src/deb/sqoop/rules
+++ b/bigtop-packages/src/deb/sqoop/rules
@@ -14,7 +14,7 @@
 # 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.
-
+#
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
@@ -27,11 +27,18 @@ export DH_OPTIONS
 	dh $@
 
 override_dh_auto_build:
-	bash debian/do-component-build -Divy.home=${HOME}/.ivy2
+	# There's no good way to get the RAT plugin to ignore the debian/ directory, so bigtop-empty is used as a decoy
+	rm -rf bigtop-empty
+	mkdir -p bigtop-empty
+	env FULL_VERSION=${SQOOP_VERSION} bash debian/do-component-build \
+	  -Drat.basedir=$${PWD}/bigtop-empty -Dmaven.repo.local=${HOME}/.m2/repository
 
 override_dh_auto_install:
 	sh -x debian/install_sqoop.sh \
-          --build-dir=build/sqoop-${SQOOP_BASE_VERSION}.bin__hadoop-* \
-	  --conf-dir=/etc/sqoop/conf.dist \
-	  --prefix=debian/sqoop 
-	cp debian/sqoop-metastore.sh debian/sqoop-metastore.init 
+	  --build-dir=build/sqoop-${SQOOP_VERSION} \
+	  --doc-dir=/usr/share/doc/sqoop \
+	  --prefix=debian/tmp \
+	  --extra-dir=debian
+	bash debian/init.d.tmpl debian/sqoop-server.svc deb debian/tmp/etc/init.d/sqoop-server
+	dh_install --sourcedir=debian/tmp
+
diff --git a/bigtop-packages/src/deb/sqoop/sqoop-client.install b/bigtop-packages/src/deb/sqoop/sqoop-client.install
new file mode 100644
index 00000000..669a2069
--- /dev/null
+++ b/bigtop-packages/src/deb/sqoop/sqoop-client.install
@@ -0,0 +1,3 @@
+/usr/bin/sqoop
+/usr/lib/sqoop/bin/sqoop.sh
+/usr/lib/sqoop/client-lib
diff --git a/bigtop-packages/src/deb/sqoop/sqoop-server.install b/bigtop-packages/src/deb/sqoop/sqoop-server.install
new file mode 100644
index 00000000..49505ce4
--- /dev/null
+++ b/bigtop-packages/src/deb/sqoop/sqoop-server.install
@@ -0,0 +1 @@
+/etc/init.d/sqoop-server
diff --git a/bigtop-packages/src/deb/sqoop/sqoop-metastore.postinst b/bigtop-packages/src/deb/sqoop/sqoop-server.postinst
index b8b6635c..02613830 100644
--- a/bigtop-packages/src/deb/sqoop/sqoop-metastore.postinst
+++ b/bigtop-packages/src/deb/sqoop/sqoop-server.postinst
@@ -1,5 +1,4 @@
 #!/bin/sh
-#
 # 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.
@@ -15,21 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# postinst script for sqoop
-
 set -e
-
-case "$1" in
-    configure)
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
+if [ -x "/etc/init.d/sqoop-server" ]; then
+    update-rc.d sqoop-server defaults > /dev/null || exit 1
+    invoke-rc.d sqoop-server start || :
+fi
diff --git a/bigtop-packages/src/deb/sqoop/sqoop.install b/bigtop-packages/src/deb/sqoop/sqoop.install
new file mode 100644
index 00000000..aac3cc4a
--- /dev/null
+++ b/bigtop-packages/src/deb/sqoop/sqoop.install
@@ -0,0 +1,7 @@
+/usr/bin/sqoop-server
+/etc/sqoop/conf.dist
+/etc/default/sqoop-server
+/usr/lib/sqoop/bin/setenv.sh
+/usr/lib/sqoop/sqoop-server
+/usr/lib/sqoop/webapps
+/usr/lib/sqoop/server-lib
diff --git a/bigtop-packages/src/deb/sqoop/sqoop.postinst b/bigtop-packages/src/deb/sqoop/sqoop.postinst
index 37cae7e3..3155330a 100644
--- a/bigtop-packages/src/deb/sqoop/sqoop.postinst
+++ b/bigtop-packages/src/deb/sqoop/sqoop.postinst
@@ -1,5 +1,4 @@
 #!/bin/sh
-#
 # 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.
@@ -15,24 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# postinst script for sqoop 
-
 set -e
 
-case "$1" in
-    configure)
-        # Install config alternatives
-        update-alternatives  --install /etc/sqoop/conf sqoop-conf /etc/sqoop/conf.dist 30
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
+update-alternatives  --install /etc/sqoop/conf sqoop-conf /etc/sqoop/conf.dist 30
 
-#DEBHELPER#
diff --git a/bigtop-packages/src/deb/sqoop/sqoop-metastore.preinst b/bigtop-packages/src/deb/sqoop/sqoop.preinst
index 76cfb265..289519a6 100644
--- a/bigtop-packages/src/deb/sqoop/sqoop-metastore.preinst
+++ b/bigtop-packages/src/deb/sqoop/sqoop.preinst
@@ -1,21 +1,12 @@
-#!/bin/sh
-#
-# 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
+#!/bin/bash
 #
 # 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.
-
-# preinst script for sqoop-metastore
+#
+# preinst script for sqoop-server
 #
 # see: dh_installdeb(1)
 
@@ -37,13 +28,14 @@ case "$1" in
                 adduser \
                   --system \
                   --group \
-                  --home /var/lib/sqoop \
+                  --home /var/run/sqoop \
                   --gecos "Sqoop User" \
                   --shell /bin/false \
                   sqoop >/dev/null
         fi
-	install -d -m 0755 -o sqoop -g sqoop /var/lib/sqoop
-	install -d -m 0755 -o sqoop -g sqoop /var/log/sqoop
+        install -d -m 0755 -o sqoop -g sqoop /var/log/sqoop
+        install -d -m 0755 -o sqoop -g sqoop /var/lib/sqoop
+        install -d -m 0755 -o sqoop -g sqoop /var/tmp/sqoop
     ;;
 
     abort-upgrade)
diff --git a/bigtop-packages/src/deb/sqoop/sqoop.prerm b/bigtop-packages/src/deb/sqoop/sqoop.prerm
index b9a25a53..16cc2965 100644
--- a/bigtop-packages/src/deb/sqoop/sqoop.prerm
+++ b/bigtop-packages/src/deb/sqoop/sqoop.prerm
@@ -15,24 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# prerm script for sqoop 
+# prerm script for sqoop
 #
 # see: dh_installdeb(1)
 
 set -e
 
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
 case "$1" in
     remove|upgrade|deconfigure)
       update-alternatives --remove sqoop-conf /etc/sqoop/conf.dist || :