aboutsummaryrefslogtreecommitdiff
path: root/bigtop-packages
diff options
context:
space:
mode:
authorSean Mackrory <mackrorysd@gmail.com>2013-03-26 14:12:16 -0700
committerRoman Shaposhnik <rvs@cloudera.com>2013-03-28 10:35:18 -0700
commitb56b59be65dcf6dcc186b2c9936591618531b3b5 (patch)
tree2d9313fe60f1863912b5ff3f017a65f5f3b98d68 /bigtop-packages
parent6a130ef6e43947c725f80bae3ff3d16f64cbc49e (diff)
BIGTOP-887. Sqoop 2 should be consistent with Oozie / Bigtop for server plugins directory
Diffstat (limited to 'bigtop-packages')
-rw-r--r--bigtop-packages/src/common/sqoop/catalina.properties2
-rwxr-xr-xbigtop-packages/src/common/sqoop/install_sqoop.sh3
-rw-r--r--bigtop-packages/src/deb/sqoop/sqoop.install2
-rw-r--r--bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec2
4 files changed, 4 insertions, 5 deletions
diff --git a/bigtop-packages/src/common/sqoop/catalina.properties b/bigtop-packages/src/common/sqoop/catalina.properties
index b5490604..9db1e56c 100644
--- a/bigtop-packages/src/common/sqoop/catalina.properties
+++ b/bigtop-packages/src/common/sqoop/catalina.properties
@@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/lib/sqoop/server-lib/*.jar,/usr/lib/hadoop/client/*.jar
+common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/var/lib/sqoop/*.jar,/usr/lib/hadoop/client/*.jar
#
# List of comma-separated paths defining the contents of the "server"
# classloader. Prefixes should be used to define what is the repository type.
diff --git a/bigtop-packages/src/common/sqoop/install_sqoop.sh b/bigtop-packages/src/common/sqoop/install_sqoop.sh
index 15f07b21..1edbc74e 100755
--- a/bigtop-packages/src/common/sqoop/install_sqoop.sh
+++ b/bigtop-packages/src/common/sqoop/install_sqoop.sh
@@ -124,11 +124,10 @@ DIST_DIR=${DIST_DIR:-dist/target/sqoop-*}
install -d -m 0755 ${PREFIX}/${LIB_DIR}
install -d -m 0755 ${PREFIX}/${LIB_DIR}/client-lib
-install -d -m 0755 ${PREFIX}/${LIB_DIR}/server-lib
-install -d -m 0755 ${PREFIX}/${LIB_DIR}/lib
install -d -m 0755 ${PREFIX}/${BIN_DIR}
install -d -m 0755 ${PREFIX}/${CONF_DIR}
install -d -m 0755 ${PREFIX}/etc/default
+install -d -m 0755 ${PREFIX}/var/lib/sqoop
install -m 0644 ${DIST_DIR}/client/lib/*.jar ${PREFIX}/${LIB_DIR}/client-lib/
install -m 0755 ${DIST_DIR}/bin/sqoop.sh ${PREFIX}/${BIN_DIR}/
diff --git a/bigtop-packages/src/deb/sqoop/sqoop.install b/bigtop-packages/src/deb/sqoop/sqoop.install
index aac3cc4a..0386c7a5 100644
--- a/bigtop-packages/src/deb/sqoop/sqoop.install
+++ b/bigtop-packages/src/deb/sqoop/sqoop.install
@@ -4,4 +4,4 @@
/usr/lib/sqoop/bin/setenv.sh
/usr/lib/sqoop/sqoop-server
/usr/lib/sqoop/webapps
-/usr/lib/sqoop/server-lib
+/var/lib/sqoop
diff --git a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
index 55e80f24..230f57ea 100644
--- a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
+++ b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
@@ -173,7 +173,7 @@ fi
%{lib_sqoop}/sqoop-server
%{lib_sqoop}/webapps
%{lib_sqoop}/bin/setenv.sh
-%{lib_sqoop}/server-lib
+/var/lib/sqoop
%files client
%attr(0755,root,root)