From 39e26f26055267eb42d50e94de604666d100f186 Mon Sep 17 00:00:00 2001 From: Jarek Jarcec Cecho Date: Sat, 21 Dec 2013 00:36:24 -0800 Subject: [PATCH] SQOOP-1263: Using CATALINA_HOME as CATALINA_BASE (Sean Mackrory via Jarek Jarcec Cecho) --- .../src/main/java/org/apache/sqoop/tomcat/TomcatToolRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomcat/src/main/java/org/apache/sqoop/tomcat/TomcatToolRunner.java b/tomcat/src/main/java/org/apache/sqoop/tomcat/TomcatToolRunner.java index 2d81792e..75d4d103 100644 --- a/tomcat/src/main/java/org/apache/sqoop/tomcat/TomcatToolRunner.java +++ b/tomcat/src/main/java/org/apache/sqoop/tomcat/TomcatToolRunner.java @@ -53,7 +53,7 @@ public static void main(String[] args) throws Exception { // Various paths to war file and locations inside the war file String webappPath = System.getProperty(PROPERTY_APPBASE_PATH, DEFAULT_APPBASE_PATH); - String catalinaBase = Bootstrap.getCatalinaHome(); + String catalinaBase = Bootstrap.getCatalinaBase(); String fullWebappPath = catalinaBase + File.separator + webappPath; String fullSqoopWarPath = fullWebappPath + File.separator + "sqoop.war"; String fullSqoopClassesPath = fullWebappPath + File.separator + "sqoop" + File.separator + "WEB-INF" + File.separator + "classes";