Repository: bigtop
Updated Branches:
  refs/heads/master defa03814 -> a241ffb3e


http://git-wip-us.apache.org/repos/asf/bigtop/blob/a241ffb3/bigtop-packages/src/deb/sqoop2/sqoop2.preinst
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/sqoop2/sqoop2.preinst 
b/bigtop-packages/src/deb/sqoop2/sqoop2.preinst
new file mode 100644
index 0000000..67632d8
--- /dev/null
+++ b/bigtop-packages/src/deb/sqoop2/sqoop2.preinst
@@ -0,0 +1,65 @@
+#!/bin/bash
+# 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.
+#
+# preinst script for sqoop2-server
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+        getent group sqoop >/dev/null || groupadd -r sqoop
+        if ! getent passwd sqoop2 >/dev/null; then
+                # Adding system user: sqoop2 .
+                adduser \
+                  --system \
+                  --ingroup sqoop \
+                  --home /var/lib/sqoop2 \
+                  --gecos "Sqoop 2 User" \
+                  --shell /bin/false \
+                  sqoop2 >/dev/null
+        fi
+        install -d -m 0755 -o sqoop2 -g sqoop /var/log/sqoop2
+        install -d -m 0755 -o sqoop2 -g sqoop /var/lib/sqoop2
+        install -d -m 0755 -o sqoop2 -g sqoop /var/tmp/sqoop2
+        install -d -m 0755 -o sqoop2 -g sqoop /var/run/sqoop2
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

http://git-wip-us.apache.org/repos/asf/bigtop/blob/a241ffb3/bigtop-packages/src/deb/sqoop2/sqoop2.prerm
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/sqoop2/sqoop2.prerm 
b/bigtop-packages/src/deb/sqoop2/sqoop2.prerm
new file mode 100644
index 0000000..6a820ad
--- /dev/null
+++ b/bigtop-packages/src/deb/sqoop2/sqoop2.prerm
@@ -0,0 +1,46 @@
+#!/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
+#
+# 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.
+
+# prerm script for sqoop
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+    remove|upgrade|deconfigure)
+      update-alternatives --remove sqoop2-conf /etc/sqoop2/conf.dist || :
+      update-alternatives --remove-all sqoop2-tomcat-conf || :
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

http://git-wip-us.apache.org/repos/asf/bigtop/blob/a241ffb3/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec 
b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
index 944bc8d..37ca5af 100644
--- a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
+++ b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
@@ -12,17 +12,14 @@
 # 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.
-
 %define lib_sqoop /usr/lib/sqoop
-%define conf_sqoop %{_sysconfdir}/sqoop/conf
+%define conf_sqoop %{_sysconfdir}/%{name}/conf
 %define conf_sqoop_dist %{conf_sqoop}.dist
-%define tomcat_deployment_sqoop %{_sysconfdir}/sqoop/tomcat-conf
-%define tomcat_deployment_sqoop_dist %{tomcat_deployment_sqoop}.dist
-%define run_sqoop /var/run/sqoop
+
 
 %if  %{?suse_version:1}0
 
-# Only tested on openSUSE 11.4. let's update it for previous release when 
confirmed
+# Only tested on openSUSE 11.4. le'ts update it for previous release when 
confirmed
 %if 0%{suse_version} > 1130
 %define suse_check \# Define an empty suse_check for compatibility with older 
sles
 %endif
@@ -38,53 +35,44 @@
     %{nil}
 
 %define doc_sqoop %{_docdir}/sqoop
-%define initd_dir %{_sysconfdir}/rc.d
+%global initd_dir %{_sysconfdir}/rc.d
 %define alternatives_cmd update-alternatives
 
 %else
 
 %define doc_sqoop %{_docdir}/sqoop-%{sqoop_version}
-%define initd_dir %{_sysconfdir}/rc.d/init.d
+%global initd_dir %{_sysconfdir}/rc.d/init.d
 %define alternatives_cmd alternatives
 
 %endif
 
+
 Name: sqoop
 Version: %{sqoop_version}
 Release: %{sqoop_release}
-Summary:  Tool for easy imports and exports of data sets between databases and 
the Hadoop ecosystem
-URL: http://sqoop.apache.org
+Summary:   Sqoop allows easy imports and exports of data sets between 
databases and the Hadoop Distributed File System (HDFS).
+URL: http://sqoop.apache.org/
 Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 License: ASL 2.0
 Source0: %{name}-%{sqoop_base_version}.tar.gz
 Source1: do-component-build
 Source2: install_%{name}.sh
-Source3: sqoop.sh
-Source4: catalina.properties
-Source5: sqoop.default
-Source6: init.d.tmpl
-Source7: sqoop-server.svc
-Source8: sqoop-server.sh
-Source9: tomcat-deployment.sh
-Source10: sqoop-tool.sh
+Source3: sqoop-metastore.sh
+Source4: sqoop-metastore.sh.suse
 Buildarch: noarch
-Requires: hadoop-client, bigtop-utils >= 0.7, bigtop-tomcat, %{name}-client = 
%{version}-%{release}
-
-%description
-Sqoop is a tool that provides the ability to import and export data sets 
between the Hadoop Distributed File System (HDFS) and relational databases.
+BuildRequires: asciidoc, xmlto
+Requires: hadoop-client, bigtop-utils >= 0.7
 
-%package client
-Summary: Client for Sqoop.
-URL: http://sqoop.apache.org
-Requires: bigtop-utils >= 0.7
-Group: System/Daemons
+%description 
+Sqoop allows easy imports and exports of data sets between databases and the 
Hadoop Distributed File System (HDFS).
 
-%package server
-Summary: Server for Sqoop.
-URL: http://sqoop.apache.org
+%package metastore
+Summary: Shared metadata repository for Sqoop.
+URL: http://sqoop.apache.org/
 Group: System/Daemons
-Requires: sqoop = %{version}-%{release}
+Provides: sqoop-metastore
+Requires: sqoop = %{version}-%{release} 
 
 %if  %{?suse_version:1}0
 # Required for init scripts
@@ -100,98 +88,99 @@ Requires: initscripts
 # So I will suppose anything that is not Mageia or a SUSE will be a 
RHEL/CentOS/Fedora
 %if %{!?suse_version:1}0 && %{!?mgaversion:1}0
 # Required for init scripts
-Requires: /lib/lsb/init-functions
+Requires: redhat-lsb
 %endif
 
-%description client
-Lightweight client for Sqoop.
 
-%description server
-Centralized server for Sqoop.
+%description metastore
+Shared metadata repository for Sqoop. This optional package hosts a metadata
+server for Sqoop clients across a network to use.
 
 %prep
-%setup -n sqoop-%{sqoop_base_version}
+%setup -n %{name}-%{sqoop_base_version}
 
 %build
-# No easy way to disable the default RAT run which fails the build because of 
some fails in the debian/ directory
-rm -rf bigtop-empty
-mkdir -p bigtop-empty
-# I could not find a way to add debian/ to RAT exclude list through cmd line
-# or to unbind rat:check goal
-# So I am redirecting its attention with a decoy
-env FULL_VERSION=%{sqoop_base_version} bash %{SOURCE1} 
-Drat.basedir=${PWD}/bigtop-empty
+bash %{SOURCE1} -Dversion=%{sqoop_base_version}
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-sh %{SOURCE2} \
-          --build-dir=build/sqoop-%{sqoop_version} \
+bash %{SOURCE2} \
+          --build-dir=build/sqoop-%{sqoop_base_version}.bin__hadoop-* \
           --conf-dir=%{conf_sqoop_dist} \
           --doc-dir=%{doc_sqoop} \
-          --prefix=$RPM_BUILD_ROOT \
-          --extra-dir=$RPM_SOURCE_DIR \
-          --initd-dir=%{initd_dir}
-
-# Install init script
-init_file=$RPM_BUILD_ROOT/%{initd_dir}/sqoop-server
-bash $RPM_SOURCE_DIR/init.d.tmpl $RPM_SOURCE_DIR/sqoop-server.svc rpm 
$init_file
+          --prefix=$RPM_BUILD_ROOT
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
+%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
+
+%__rm -f $RPM_BUILD_ROOT/%{lib_sqoop}/lib/hadoop-mrunit*.jar
+
+%if  %{?suse_version:1}0
+orig_init_file=$RPM_SOURCE_DIR/sqoop-metastore.sh.suse
+%else
+orig_init_file=$RPM_SOURCE_DIR/sqoop-metastore.sh
+%endif
+
+init_file=$RPM_BUILD_ROOT/%{initd_dir}/sqoop-metastore
+%__cp $orig_init_file $init_file
+chmod 0755 $init_file
+
+%__install -d  -m 0755 $RPM_BUILD_ROOT/var/log/sqoop
 
 %pre
 getent group sqoop >/dev/null || groupadd -r sqoop
-getent passwd sqoop >/dev/null || useradd -c "Sqoop User" -s /sbin/nologin -g 
sqoop -r -d %{run_sqoop} sqoop 2> /dev/null || :
-%__install -d -o sqoop -g sqoop -m 0755 /var/lib/sqoop
-%__install -d -o sqoop -g sqoop -m 0755 /var/log/sqoop
-%__install -d -o sqoop -g sqoop -m 0755 /var/tmp/sqoop
-%__install -d -o sqoop -g sqoop -m 0755 /var/run/sqoop
+getent passwd sqoop > /dev/null || useradd -c "Sqoop" -s /sbin/nologin \
+       -g sqoop -r -d /var/lib/sqoop sqoop 2> /dev/null || :
 
 %post
-%{alternatives_cmd} --install %{conf_sqoop} sqoop-conf %{conf_sqoop_dist} 30
-%{alternatives_cmd} --install %{tomcat_deployment_sqoop} sqoop-tomcat-conf 
%{tomcat_deployment_sqoop_dist} 30
-
-%post server
-chkconfig --add sqoop-server
+%{alternatives_cmd} --install %{conf_sqoop} %{name}-conf %{conf_sqoop_dist} 30
 
 %preun
-if [ "$1" = "0" ] ; then
-  %{alternatives_cmd} --remove sqoop-conf %{conf_sqoop_dist} || :
-  %{alternatives_cmd} --remove sqoop-tomcat-conf 
%{tomcat_deployment_sqoop_dist} || :
+if [ "$1" = 0 ]; then
+  %{alternatives_cmd} --remove %{name}-conf %{conf_sqoop_dist} || :
 fi
 
-%preun server
-if [ "$1" = "0" ] ; then
-  service sqoop-server stop > /dev/null 2>&1
-  chkconfig --del sqoop-server
+%post metastore
+chkconfig --add sqoop-metastore
+
+%preun metastore
+if [ $1 = 0 ] ; then
+  service sqoop-metastore stop > /dev/null 2>&1
+  chkconfig --del sqoop-metastore
 fi
 
-%postun server
+%postun metastore
 if [ $1 -ge 1 ]; then
-  service sqoop-server condrestart > /dev/null 2>&1
+  service sqoop-metastore condrestart > /dev/null 2>&1
 fi
 
-%files
+%files metastore
+%attr(0755,root,root) %{initd_dir}/sqoop-metastore
+%attr(0755,sqoop,sqoop) /var/lib/sqoop
+%attr(0755,sqoop,sqoop) /var/log/sqoop
+
+# Files for main package
+%files 
 %defattr(0755,root,root)
-/usr/bin/sqoop-server
-%config(noreplace) /etc/sqoop/conf.dist
-%config(noreplace) /etc/sqoop/tomcat-conf.dist
-%config(noreplace) /etc/default/sqoop-server
-%{lib_sqoop}/webapps
-%{lib_sqoop}/bin/setenv.sh
-%{lib_sqoop}/bin/sqoop-sys.sh
-%{lib_sqoop}/tomcat-deployment.sh
-/usr/lib/bigtop-tomcat/lib/sqoop-tomcat-*.jar
-%defattr(0755,sqoop,sqoop)
-/var/lib/sqoop
-
-%files client
-%attr(0755,root,root)
-/usr/bin/sqoop
-/usr/bin/sqoop-tool
-%{lib_sqoop}/bin/sqoop.sh
-%{lib_sqoop}/client-lib
-%{lib_sqoop}/LICENSE.txt
-%{lib_sqoop}/NOTICE.txt
-
-%files server
-%attr(0755,root,root) %{initd_dir}/sqoop-server
+%{lib_sqoop}
+%attr(0644,root,root) %{lib_sqoop}/*.jar
+%config(noreplace) %{conf_sqoop_dist}
+%{_bindir}/sqoop
+%{_bindir}/sqoop-codegen
+%{_bindir}/sqoop-create-hive-table
+%{_bindir}/sqoop-eval
+%{_bindir}/sqoop-export
+%{_bindir}/sqoop-help
+%{_bindir}/sqoop-import
+%{_bindir}/sqoop-import-all-tables
+%{_bindir}/sqoop-job
+%{_bindir}/sqoop-list-databases
+%{_bindir}/sqoop-list-tables
+%{_bindir}/sqoop-metastore
+%{_bindir}/sqoop-version
+%{_bindir}/sqoop-merge
+
+%defattr(0644,root,root,0755)
+%{_mandir}/man1/*
+%doc %{doc_sqoop}
 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/a241ffb3/bigtop-packages/src/rpm/sqoop2/BUILD/.gitignore
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/sqoop2/BUILD/.gitignore 
b/bigtop-packages/src/rpm/sqoop2/BUILD/.gitignore
new file mode 100644
index 0000000..139597f
--- /dev/null
+++ b/bigtop-packages/src/rpm/sqoop2/BUILD/.gitignore
@@ -0,0 +1,2 @@
+
+

http://git-wip-us.apache.org/repos/asf/bigtop/blob/a241ffb3/bigtop-packages/src/rpm/sqoop2/RPMS/.gitignore
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/sqoop2/RPMS/.gitignore 
b/bigtop-packages/src/rpm/sqoop2/RPMS/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/bigtop/blob/a241ffb3/bigtop-packages/src/rpm/sqoop2/SOURCES/.gitignore
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/sqoop2/SOURCES/.gitignore 
b/bigtop-packages/src/rpm/sqoop2/SOURCES/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/bigtop/blob/a241ffb3/bigtop-packages/src/rpm/sqoop2/SPECS/sqoop2.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/sqoop2/SPECS/sqoop2.spec 
b/bigtop-packages/src/rpm/sqoop2/SPECS/sqoop2.spec
new file mode 100644
index 0000000..75e0dcb
--- /dev/null
+++ b/bigtop-packages/src/rpm/sqoop2/SPECS/sqoop2.spec
@@ -0,0 +1,200 @@
+# 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.
+
+%define lib_sqoop /usr/lib/sqoop2
+%define conf_sqoop %{_sysconfdir}/sqoop2/conf
+%define conf_sqoop_dist %{conf_sqoop}.dist
+%define tomcat_conf_sqoop %{_sysconfdir}/sqoop2/tomcat-conf
+%define tomcat_conf_sqoop_dist %{tomcat_conf_sqoop}.dist
+%define run_sqoop /var/run/sqoop2
+
+%if  %{?suse_version:1}0
+
+# Only tested on openSUSE 11.4. let's update it for previous release when 
confirmed
+%if 0%{suse_version} > 1130
+%define suse_check \# Define an empty suse_check for compatibility with older 
sles
+%endif
+
+# SLES is more strict anc check all symlinks point to valid path
+# But we do point to a conf which is not there at build time
+# (but would be at install time).
+# Since our package build system does not handle dependencies,
+# these symlink checks are deactivated
+%define __os_install_post \
+    %{suse_check} ; \
+    /usr/lib/rpm/brp-compress ; \
+    %{nil}
+
+%define doc_sqoop %{_docdir}/sqoop2
+%define initd_dir %{_sysconfdir}/rc.d
+%define alternatives_cmd update-alternatives
+
+%else
+
+%define doc_sqoop %{_docdir}/sqoop2-%{sqoop2_version}
+%define initd_dir %{_sysconfdir}/rc.d/init.d
+%define alternatives_cmd alternatives
+
+%endif
+
+Name: sqoop2
+Version: %{sqoop2_version}
+Release: %{sqoop2_release}
+Summary:  Tool for easy imports and exports of data sets between databases and 
the Hadoop ecosystem
+URL: http://sqoop.apache.org
+Group: Development/Libraries
+Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
+License: ASL 2.0
+Source0: sqoop-%{sqoop2_base_version}.tar.gz
+Source1: do-component-build
+Source2: install_%{name}.sh
+Source3: sqoop.sh
+Source5: catalina.properties
+Source7: sqoop2.default
+Source8: init.d.tmpl
+Source9: sqoop-server.svc
+Source10: sqoop-server.sh
+Source11: sqoop-tool.sh
+Source12: tomcat-deployment.sh
+Buildarch: noarch
+Requires: hadoop-client, bigtop-utils >= 0.7, bigtop-tomcat >= 0.7, 
%{name}-client = %{version}-%{release}
+
+%description
+Sqoop is a tool that provides the ability to import and export data sets 
between
+the Hadoop Distributed File System (HDFS) and relational databases. In Sqoop 
2, the tool
+consists of a server that is configured to interface with the Hadoop cluster, 
and a
+lightweight client for executing imports and exports on the server.
+
+%package client
+Summary: Client for Sqoop 2.
+URL: http://sqoop.apache.org
+Requires: bigtop-utils >= 0.7
+Group: System/Daemons
+
+%package server
+Summary: Server for Sqoop 2.
+URL: http://sqoop.apache.org
+Group: System/Daemons
+Requires: sqoop2 = %{version}-%{release}
+
+%if  %{?suse_version:1}0
+# Required for init scripts
+Requires: insserv
+%endif
+
+%if  0%{?mgaversion}
+# Required for init scripts
+Requires: initscripts
+%endif
+
+# CentOS 5 does not have any dist macro
+# So I will suppose anything that is not Mageia or a SUSE will be a 
RHEL/CentOS/Fedora
+%if %{!?suse_version:1}0 && %{!?mgaversion:1}0
+# Required for init scripts
+Requires: redhat-lsb
+%endif
+
+%description client
+Lightweight client for Sqoop 2.
+
+%description server
+Centralized server for Sqoop 2.
+
+%prep
+%setup -n sqoop-%{sqoop2_base_version}
+
+%build
+# No easy way to disable the default RAT run which fails the build because of 
some fails in the debian/ directory
+rm -rf bigtop-empty
+mkdir -p bigtop-empty
+env FULL_VERSION=%{sqoop2_base_version} bash %{SOURCE1} 
-Drat.basedir=${PWD}/bigtop-empty
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+bash %{SOURCE2} \
+          --build-dir=build/sqoop2-%{sqoop2_base_version} \
+          --conf-dir=%{conf_sqoop_dist} \
+          --doc-dir=%{doc_sqoop} \
+          --prefix=$RPM_BUILD_ROOT \
+          --extra-dir=$RPM_SOURCE_DIR \
+          --initd-dir=%{initd_dir} \
+          --dist-dir=dist/target/sqoop2-%{sqoop2_base_version}
+
+# Install init script
+init_file=$RPM_BUILD_ROOT/%{initd_dir}/sqoop2-server
+bash $RPM_SOURCE_DIR/init.d.tmpl $RPM_SOURCE_DIR/sqoop-server.svc rpm 
$init_file
+
+%__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
+
+%pre
+getent group sqoop >/dev/null || groupadd -r sqoop
+getent passwd sqoop2 >/dev/null || useradd -c "Sqoop 2 User" -s /sbin/nologin 
-g sqoop -r -d /var/lib/sqoop2 sqoop2 2> /dev/null || :
+%__install -d -o sqoop2 -g sqoop -m 0755 /var/lib/sqoop2
+%__install -d -o sqoop2 -g sqoop -m 0755 /var/log/sqoop2
+%__install -d -o sqoop2 -g sqoop -m 0755 /var/tmp/sqoop2
+%__install -d -o sqoop2 -g sqoop -m 0755 /var/run/sqoop2
+
+%post
+%{alternatives_cmd} --install %{conf_sqoop} sqoop2-conf %{conf_sqoop_dist} 30
+%{alternatives_cmd} --install %{tomcat_conf_sqoop} sqoop2-tomcat-conf 
%{tomcat_conf_sqoop_dist} 30
+
+%post server
+chkconfig --add sqoop2-server
+
+%preun
+if [ "$1" = "0" ] ; then
+  %{alternatives_cmd} --remove sqoop2-conf %{conf_sqoop_dist} || :
+  %{alternatives_cmd} --remove sqoop2-tomcat-conf %{tomcat_conf_sqoop_dist} || 
:
+fi
+
+%preun server
+if [ "$1" = "0" ] ; then
+  service sqoop2-server stop > /dev/null 2>&1
+  chkconfig --del sqoop2-server
+fi
+
+%postun server
+if [ $1 -ge 1 ]; then
+  service sqoop2-server condrestart > /dev/null 2>&1
+fi
+
+%files
+%defattr(0755,root,root)
+/usr/bin/sqoop2-server
+/usr/bin/sqoop2-tool
+%config(noreplace) /etc/sqoop2/conf.dist
+%config(noreplace) /etc/sqoop2/tomcat-conf.dist
+%config(noreplace) /etc/default/sqoop2-server
+%{lib_sqoop}/webapps
+%{lib_sqoop}/bin/setenv.sh
+%{lib_sqoop}/bin/sqoop-sys.sh
+%{lib_sqoop}/tomcat-deployment.sh
+%defattr(0755,sqoop2,sqoop)
+/var/lib/sqoop2
+/usr/lib/bigtop-tomcat/lib/sqoop-tomcat*.jar
+
+%files client
+%defattr(0755,root,root)
+/usr/bin/sqoop2
+%dir %{lib_sqoop}
+%dir %{lib_sqoop}/bin
+%{lib_sqoop}/bin/sqoop.sh
+%{lib_sqoop}/client-lib
+%{lib_sqoop}/LICENSE.txt
+%{lib_sqoop}/NOTICE.txt
+
+%files server
+%attr(0755,root,root) %{initd_dir}/sqoop2-server
+

http://git-wip-us.apache.org/repos/asf/bigtop/blob/a241ffb3/bigtop-packages/src/rpm/sqoop2/SRPMS/.gitignore
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/sqoop2/SRPMS/.gitignore 
b/bigtop-packages/src/rpm/sqoop2/SRPMS/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/bigtop/blob/a241ffb3/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 76a3a83..63f858a 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -125,7 +125,7 @@ $(eval $(call PACKAGE,tez,TEZ))
 SQOOP_NAME=sqoop
 SQOOP_RELNOTES_NAME=Sqoop
 SQOOP_PKG_NAME=sqoop
-SQOOP_BASE_VERSION=1.99.4
+SQOOP_BASE_VERSION=1.4.5
 SQOOP_PKG_VERSION=$(SQOOP_BASE_VERSION)
 SQOOP_RELEASE_VERSION=1
 SQOOP_TARBALL_DST=$(SQOOP_NAME)-$(SQOOP_BASE_VERSION).tar.gz
@@ -135,6 +135,20 @@ SQOOP_SITE=$(APACHE_MIRROR)$(SQOOP_DOWNLOAD_PATH)
 SQOOP_ARCHIVE=$(APACHE_ARCHIVE)$(SQOOP_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,sqoop,SQOOP))
 
+# Sqoop 2
+SQOOP2_NAME=sqoop2
+SQOOP2_RELNOTES_NAME=Sqoop 2
+SQOOP2_PKG_NAME=sqoop2
+SQOOP2_BASE_VERSION=1.99.4
+SQOOP2_PKG_VERSION=$(SQOOP2_BASE_VERSION)
+SQOOP2_RELEASE_VERSION=1
+SQOOP2_TARBALL_DST=$(SQOOP_NAME)-$(SQOOP2_BASE_VERSION).tar.gz
+SQOOP2_TARBALL_SRC=$(SQOOP2_TARBALL_DST)
+SQOOP2_DOWNLOAD_PATH=/sqoop/$(SQOOP2_BASE_VERSION)
+SQOOP2_SITE=$(APACHE_MIRROR)$(SQOOP2_DOWNLOAD_PATH)
+SQOOP2_ARCHIVE=$(APACHE_ARCHIVE)$(SQOOP2_DOWNLOAD_PATH)
+$(eval $(call PACKAGE,sqoop2,SQOOP2))
+
 # Oozie
 OOZIE_NAME=oozie
 OOZIE_RELNOTES_NAME=Apache Oozie

http://git-wip-us.apache.org/repos/asf/bigtop/blob/a241ffb3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 38516cb..063b738 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,8 @@
     <hbase.version>0.98.5-hadoop2</hbase.version>
     <pig.version>0.12.1</pig.version>
     <pig-smoke.version>0.12.1</pig-smoke.version>
-    <sqoop.version>1.99.2</sqoop.version>
+    <sqoop.version>1.4.5</sqoop.version>
+    <sqoop2.version>1.99.4</sqoop2.version>
     <zookeeper.version>3.4.5</zookeeper.version>
     <giraph.version>1.0.0</giraph.version>
     <solr.version>4.6.0</solr.version>

Reply via email to