[262355] [misc] JSP File templates cause problems with quirks mode
diff --git a/bundles/org.eclipse.jst.jsp.ui/templates/jspdefault-templates.properties b/bundles/org.eclipse.jst.jsp.ui/templates/jspdefault-templates.properties
index c629a8b..58d9de8 100644
--- a/bundles/org.eclipse.jst.jsp.ui/templates/jspdefault-templates.properties
+++ b/bundles/org.eclipse.jst.jsp.ui/templates/jspdefault-templates.properties
@@ -39,6 +39,10 @@
 Templates.jspxhtmlxml.desc=JSP with xhtml markup and xml style syntax
 Templates.jspxhtmlxml.content=<?xml version="1.0" encoding="${encoding}" ?>\n<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">\n    <jsp:directive.page language="java"\n        contentType="text/html; charset=${encoding}" pageEncoding="${encoding}" />\n    <jsp:text>\n        <![CDATA[ <?xml version="1.0" encoding="${encoding}" ?> ]]>\n    </jsp:text>\n    <jsp:text>\n        <![CDATA[ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>\n    </jsp:text>\n<html xmlns="http://www.w3.org/1999/xhtml">\n<head>\n<meta http-equiv="Content-Type" content="text/html; charset=${encoding}" />\n<title>Insert title here</title>\n</head>\n<body>\n${cursor}\n</body>\n</html>\n</jsp:root>
 
+Templates.jsp20xhtmlxml.name=New JSP File (xhtml, xml syntax, JSP 2.0)
+Templates.jsp20xhtmlxml.desc=JSP with JSP 2.0 specific tags, xhtml markup and xml style syntax
+Templates.jsp20xhtmlxml.content=<?xml version="1.0" encoding="${encoding}" ?>\n<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">\n\t<jsp:directive.page contentType="text/html; charset=${encoding}" \n\t\tpageEncoding="${encoding}" session="false"/>\n\t<jsp:output doctype-root-element="html"\n\t\tdoctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"\n\t\tdoctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"\n\t\tomit-xml-declaration="true" />\n<html xmlns="http://www.w3.org/1999/xhtml">\n<head>\n<title>Insert title here</title>\n</head>\n<body>\n${cursor}\n</body>\n</html>\n</jsp:root>
+
 Templates.jsptagdirective.name=Tag file tag directive
 Templates.jsptagdirective.desc=Tag file tag directive
 Templates.jsptagdirective.content=<%@ tag display-name="${cursor}" description="" small-icon="" %>
diff --git a/bundles/org.eclipse.jst.jsp.ui/templates/jspdefault-templates.xml b/bundles/org.eclipse.jst.jsp.ui/templates/jspdefault-templates.xml
index d318d24..c95a802 100644
--- a/bundles/org.eclipse.jst.jsp.ui/templates/jspdefault-templates.xml
+++ b/bundles/org.eclipse.jst.jsp.ui/templates/jspdefault-templates.xml
@@ -33,6 +33,8 @@
 
 <template name="%Templates.jspxhtmlxml.name" description="%Templates.jspxhtmlxml.desc" id="org.eclipse.jst.jsp.ui.templates.jspxhtmlxml" context="jsp_new" enabled="true">%Templates.jspxhtmlxml.content</template>
 
+<template name="%Templates.jsp20xhtmlxml.name" description="%Templates.jsp20xhtmlxml.desc" id="org.eclipse.jst.jsp.ui.templates.jsp20xhtmlxml" context="jsp_new" enabled="true">%Templates.jsp20xhtmlxml.content</template>
+
 <template name="%Templates.jsptagdirective.name" description="%Templates.jsptagdirective.desc" id="org.eclipse.jst.jsp.ui.templates.jsptagdirective" context="jsp_tag" enabled="true">%Templates.jsptagdirective.content</template>
 
 <template name="%Templates.jspvariabledirective.name" description="%Templates.jspvariabledirective.desc" id="org.eclipse.jst.jsp.ui.templates.jspvariabledirective" context="jsp_tag" enabled="true">%Templates.jspvariabledirective.content</template>