[124914] Include runtime jars needed by this feature and fix one missed system property name change
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/build.properties b/plugins/org.eclipse.jst.server.tomcat.core/build.properties
index fe0a577..ab8aee7 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/build.properties
+++ b/plugins/org.eclipse.jst.server.tomcat.core/build.properties
@@ -14,7 +14,10 @@
.options,\
.,\
META-INF/,\
- about.html
+ about.html,\
+ org.eclipse.jst.server.tomcat.runtime.50.loader.jar,\
+ org.eclipse.jst.server.tomcat.runtime.55.loader.jar,\
+ org.eclipse.jst.server.tomcat.runtime.60.loader.jar
bin.excludes = bin/**,\
@dot/**,\
temp.folder/**
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Handler.java
index dfb24c7..a1bf6a2 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Handler.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Handler.java
@@ -92,7 +92,7 @@
list.add("-Dcatalina.base=\"" + installPath.toOSString() + "\"");
list.add("-Dcatalina.home=\"" + installPath.toOSString() + "\"");
// Include a system property for the configurable deploy location
- list.add("-Dcatalina.deploy=\"" + deployPath.toOSString() + "\"");
+ list.add("-Dwtp.deploy=\"" + deployPath.toOSString() + "\"");
String endorsed = installPath.append("bin").toOSString() +
installPath.append("common").append("lib").toOSString();
list.add("-Djava.endorsed.dirs=\"" + endorsed + "\"");
