Updated Branches: refs/heads/sqoop2 528d1ee9d -> 39e26f260
SQOOP-1263: Using CATALINA_HOME as CATALINA_BASE (Sean Mackrory via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/39e26f26 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/39e26f26 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/39e26f26 Branch: refs/heads/sqoop2 Commit: 39e26f26055267eb42d50e94de604666d100f186 Parents: 528d1ee Author: Jarek Jarcec Cecho <[email protected]> Authored: Sat Dec 21 00:36:24 2013 -0800 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Sat Dec 21 00:36:24 2013 -0800 ---------------------------------------------------------------------- tomcat/src/main/java/org/apache/sqoop/tomcat/TomcatToolRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/39e26f26/tomcat/src/main/java/org/apache/sqoop/tomcat/TomcatToolRunner.java ---------------------------------------------------------------------- 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 2d81792..75d4d10 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 class TomcatToolRunner { // 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";
