[167723] Add jst.web 2.5 to the list of supported facets. Also some minor code cleanup.
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
index a6b00fb..54a8df7 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
@@ -87,7 +87,7 @@
class="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntime">
<moduleType
types="jst.web"
- versions="2.2, 2.3, 2.4"/>
+ versions="2.2, 2.3, 2.4, 2.5"/>
<moduleType
types="jst.utility"
versions="1.0"/>
@@ -345,7 +345,7 @@
version="6.0"/>
<facet
id="jst.web"
- version="2.2,2.3,2.4"/>
+ version="2.2,2.3,2.4,2.5"/>
<facet
id="jst.utility"
version="1.0"/>
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 3700556..bb9893b 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
@@ -131,8 +131,7 @@
* @see ITomcatVersionHandler#prepareRuntimeDirectory(IPath)
*/
public IStatus prepareRuntimeDirectory(IPath baseDir) {
- return TomcatVersionHelper.createCatalinaInstanceDirectory(baseDir,
- TomcatVersionHelper.DEFAULT_WEBXML_SERVLET23);
+ return TomcatVersionHelper.createCatalinaInstanceDirectory(baseDir);
}
/**
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Handler.java
index de10133..7b4a9d7 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Handler.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Handler.java
@@ -129,8 +129,7 @@
* @see ITomcatVersionHandler#prepareRuntimeDirectory(IPath)
*/
public IStatus prepareRuntimeDirectory(IPath baseDir) {
- return TomcatVersionHelper.createCatalinaInstanceDirectory(baseDir,
- TomcatVersionHelper.DEFAULT_WEBXML_SERVLET23);
+ return TomcatVersionHelper.createCatalinaInstanceDirectory(baseDir);
}
/**
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Handler.java
index 1309ee4..e75de3b 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Handler.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Handler.java
@@ -129,8 +129,7 @@
* @see ITomcatVersionHandler#prepareRuntimeDirectory(IPath)
*/
public IStatus prepareRuntimeDirectory(IPath baseDir) {
- return TomcatVersionHelper.createCatalinaInstanceDirectory(baseDir,
- TomcatVersionHelper.DEFAULT_WEBXML_SERVLET24);
+ return TomcatVersionHelper.createCatalinaInstanceDirectory(baseDir);
}
/**
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat60Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat60Handler.java
index d94b335..359aa22 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat60Handler.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat60Handler.java
@@ -124,16 +124,14 @@
*/
public IStatus prepareRuntimeDirectory(IPath baseDir) {
// TODO Update to Servlet 2.5 when supported
- return TomcatVersionHelper.createCatalinaInstanceDirectory(baseDir,
- TomcatVersionHelper.DEFAULT_WEBXML_SERVLET24);
+ return TomcatVersionHelper.createCatalinaInstanceDirectory(baseDir);
}
/**
* @see ITomcatVersionHandler#prepareDeployDirectory(IPath)
*/
public IStatus prepareDeployDirectory(IPath deployPath) {
- // TODO Update to Servlet 2.5 when available
return TomcatVersionHelper.createDeploymentDirectory(deployPath,
- TomcatVersionHelper.DEFAULT_WEBXML_SERVLET24);
+ TomcatVersionHelper.DEFAULT_WEBXML_SERVLET25);
}
}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatVersionHelper.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatVersionHelper.java
index 864728e..c92ae90 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatVersionHelper.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatVersionHelper.java
@@ -58,7 +58,7 @@
* Default web.xml contents for a Servlet 2.3 web application.
*/
public static final String DEFAULT_WEBXML_SERVLET23 =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" +
"<!DOCTYPE web-app PUBLIC \"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN\" \"http://java.sun.com/dtd/web-app_2_3.dtd\">\n" +
"<web-app>\n</web-app>";
@@ -66,9 +66,17 @@
* Default web.xml contents for a Servlet 2.4 web application.
*/
public static final String DEFAULT_WEBXML_SERVLET24 =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<web-app id=\"WebApp_ID\" version=\"2.4\" xmlns=\"http://java.sun.com/xml/ns/j2ee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd\">\n" +
- "</web-app>";
+ "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" +
+ "<web-app xmlns=\"http://java.sun.com/xml/ns/j2ee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd\" version=\"2.4\">\n" +
+ "</web-app>";
+
+ /**
+ * Default web.xml contents for a Servlet 2.5 web application.
+ */
+ public static final String DEFAULT_WEBXML_SERVLET25 =
+ "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" +
+ "<web-app xmlns=\"http://java.sun.com/xml/ns/j2ee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd\" version=\"2.5\">\n" +
+ "</web-app>";
/**
* Reads the from the specified InputStream and returns
@@ -246,10 +254,9 @@
*
* @param baseDir directory at which to create Catalina instance
* directories.
- * @param webxml web.xml content for ROOT web application
* @return result status of the operation
*/
- public static IStatus createCatalinaInstanceDirectory(IPath baseDir, String webxml) {
+ public static IStatus createCatalinaInstanceDirectory(IPath baseDir) {
if (Trace.isTraceEnabled())
Trace.trace(Trace.FINER, "Creating runtime directory at " + baseDir.toOSString());
// TODO Add more error handling.
