Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #1838

This commit is contained in:
Jan Bartel 2017-09-26 16:07:18 +10:00
parent 562ab9eb80
commit e3bec841da
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebDescriptor.java
View File

@ -93,7 +93,8 @@ public class WebDescriptor extends Descriptor
URL javaee5=Loader.getResource("javax/servlet/resources/javaee_5.xsd");
URL javaee6=Loader.getResource("javax/servlet/resources/javaee_6.xsd");
URL javaee7=Loader.getResource("javax/servlet/resources/javaee_7.xsd");
URL javaee8=Loader.getResource("javax/servlet/resources/javaee_8.xsd");
URL webapp24xsd=Loader.getResource("javax/servlet/resources/web-app_2_4.xsd");
URL webapp25xsd=Loader.getResource("javax/servlet/resources/web-app_2_5.xsd");
URL webapp30xsd=Loader.getResource("javax/servlet/resources/web-app_3_0.xsd");
@ -163,6 +164,7 @@ public class WebDescriptor extends Descriptor
redirectEntity( "http://java.sun.com/xml/ns/javaee/javaee_5.xsd",javaee5);
redirectEntity( "http://java.sun.com/xml/ns/javaee/javaee_6.xsd",javaee6);
redirectEntity( "http://xmlns.jcp.org/xml/ns/javaee/javaee_7.xsd",javaee7);
redirectEntity( "http://xmlns.jcp.org/xml/ns/javaee/javaee_8.xsd",javaee8);
redirectEntity("web-common_3_0.xsd",webcommon30xsd);
redirectEntity("http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd",webcommon30xsd);

3
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
View File

@ -109,7 +109,8 @@ public class XmlConfiguration
parser.redirectEntity("http://jetty.mortbay.org/configure.dtd",config93);
parser.redirectEntity("http://jetty.eclipse.org/configure.dtd",config93);
parser.redirectEntity("http://www.eclipse.org/jetty/configure.dtd",config93);
parser.redirectEntity("http://www.eclipse.org/jetty/configure_9_3.dtd",config93);
parser.redirectEntity("-//Mort Bay Consulting//DTD Configure//EN",config93);
parser.redirectEntity("-//Jetty//Configure//EN",config93);

4
pom.xml
View File

@ -21,8 +21,8 @@
<jetty-test-policy-version>1.2</jetty-test-policy-version>
<alpn.api.version>1.1.3.v20160715</alpn.api.version>
<jsp.version>8.5.20</jsp.version>
<servlet.api.version>4.0.0-b07</servlet.api.version>
<servlet.schema.version>4.0.0-b07</servlet.schema.version>
<servlet.api.version>4.0.0</servlet.api.version>
<servlet.schema.version>4.0.0</servlet.schema.version>
<!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
<alpn.version>undefined</alpn.version>
</properties>