From ec252cadc189d59d3ef23f9c128d3061952207e8 Mon Sep 17 00:00:00 2001
From: Hari Shreedharan <hshreedharan@apache.org>
Date: Thu, 24 Oct 2013 17:19:11 -0700
Subject: [PATCH] SQOOP-1220. Sqoop2: Improve default catalina.properties file
 to work out of the box on both Hadoop 1 and 2

(Jarek Jarcec Cecho via Hari Shreedharan)
---
 dist/src/main/server/conf/catalina.properties | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/dist/src/main/server/conf/catalina.properties b/dist/src/main/server/conf/catalina.properties
index 5a47295d..45fcb5e9 100644
--- a/dist/src/main/server/conf/catalina.properties
+++ b/dist/src/main/server/conf/catalina.properties
@@ -44,7 +44,18 @@ 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,${catalina.home}/../lib/*.jar,/usr/lib/hadoop/*.jar
+#
+# Sqoop Comment:
+# You need set all Hadoop 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):
+#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
 
 #
 # List of comma-separated paths defining the contents of the "server"