From 865fdd1089ca1e61b5e3595613d3534fc8d548e5 Mon Sep 17 00:00:00 2001 From: Abraham Elmahrek Date: Thu, 19 Mar 2015 16:27:59 -0700 Subject: [PATCH] SQOOP-2240: Sqoop2: Remove Hadoop 1.x example from catalina.properties (Jarek Jarcec Cecho via Abraham Elmahrek) --- dist/src/main/server/conf/catalina.properties | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dist/src/main/server/conf/catalina.properties b/dist/src/main/server/conf/catalina.properties index 45fcb5e9..260bfd65 100644 --- a/dist/src/main/server/conf/catalina.properties +++ b/dist/src/main/server/conf/catalina.properties @@ -46,13 +46,10 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache # "foo/bar.jar": Add bar.jar as a class repository # # Sqoop Comment: -# You need set all Hadoop dependencies in this property. Please check out +# You need set Hadoop and Hive dependencies in this property. Please check out # Sqoop installation guide for more details. # -# Hadoop 1 example (based on default BigTop locations): -#common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.home}/../lib/*.jar,/usr/lib/hadoop/*.jar -# -# Hadoop 2 example (based on default BigTop locations): +# Example (based on default BigTop locations): #common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.home}/../lib/*.jar,/usr/lib/hadoop/*.jar,/usr/lib/hadoop/lib/*.jar,/usr/lib/hadoop-hdfs/*.jar,/usr/lib/hadoop-hdfs/lib/*.jar,/usr/lib/hadoop-mapreduce/*.jar,/usr/lib/hadoop-mapreduce/lib/*.jar,/usr/lib/hadoop-yarn/*.jar,/usr/lib/hadoop-yarn/lib/*.jar # common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.home}/../lib/*.jar,/usr/lib/hadoop/*.jar,/usr/lib/hadoop/lib/*.jar,/usr/lib/hadoop-hdfs/*.jar,/usr/lib/hadoop-hdfs/lib/*.jar,/usr/lib/hadoop-mapreduce/*.jar,/usr/lib/hadoop-mapreduce/lib/*.jar,/usr/lib/hadoop-yarn/*.jar,/usr/lib/hadoop-yarn/lib/*.jar