Updated Branches: refs/heads/master 6a130ef6e -> 569554fc5
BIGTOP-887. Sqoop 2 should be consistent with Oozie / Bigtop for server plugins directory Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b56b59be Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b56b59be Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b56b59be Branch: refs/heads/master Commit: b56b59be65dcf6dcc186b2c9936591618531b3b5 Parents: 6a130ef Author: Sean Mackrory <[email protected]> Authored: Tue Mar 26 14:12:16 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Thu Mar 28 10:35:18 2013 -0700 ---------------------------------------------------------------------- .../src/common/sqoop/catalina.properties | 2 +- bigtop-packages/src/common/sqoop/install_sqoop.sh | 3 +-- bigtop-packages/src/deb/sqoop/sqoop.install | 2 +- bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/b56b59be/bigtop-packages/src/common/sqoop/catalina.properties ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/sqoop/catalina.properties b/bigtop-packages/src/common/sqoop/catalina.properties index b549060..9db1e56 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. http://git-wip-us.apache.org/repos/asf/bigtop/blob/b56b59be/bigtop-packages/src/common/sqoop/install_sqoop.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/sqoop/install_sqoop.sh b/bigtop-packages/src/common/sqoop/install_sqoop.sh index 15f07b2..1edbc74 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}/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/b56b59be/bigtop-packages/src/deb/sqoop/sqoop.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/sqoop/sqoop.install b/bigtop-packages/src/deb/sqoop/sqoop.install index aac3cc4..0386c7a 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 http://git-wip-us.apache.org/repos/asf/bigtop/blob/b56b59be/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 55e80f2..230f57e 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)
