File tree Expand file tree Collapse file tree 14 files changed +562
-43
lines changed
java/org/exist/xquery/functions
resources/standalone-webapp/WEB-INF
exist-distribution/src/main/xslt
exist-jetty-config/src/main/resources
standalone-webapp/WEB-INF
debuggee/src/test/resources/standalone-webapp/WEB-INF
exquery/restxq/src/test/resources/standalone-webapp/WEB-INF
file/src/test/resources/standalone-webapp/WEB-INF
persistentlogin/src/test/resources/standalone-webapp/WEB-INF Expand file tree Collapse file tree 14 files changed +562
-43
lines changed Original file line number Diff line number Diff line change 3636import org .exist .xmldb .EXistResource ;
3737import org .junit .AfterClass ;
3838import org .junit .BeforeClass ;
39+ import org .junit .Ignore ;
3940import org .junit .Test ;
4041
4142import static java .nio .charset .StandardCharsets .UTF_8 ;
@@ -99,6 +100,7 @@ public void retrieveBinaryHttp09() throws IOException {
99100 assertEquals (HttpStatus .SC_HTTP_VERSION_NOT_SUPPORTED , response .getStatusLine ().getStatusCode ());
100101 }
101102
103+ @ Ignore ("Jetty 12 does not support HTTP/1.0 requests" )
102104 @ Test
103105 public void retrieveBinaryHttp10 () throws IOException {
104106 final String testData = "12345" ;
@@ -146,6 +148,7 @@ public void retrieveXmlHttp09() throws IOException {
146148 assertEquals (HttpStatus .SC_HTTP_VERSION_NOT_SUPPORTED , response .getStatusLine ().getStatusCode ());
147149 }
148150
151+ @ Ignore ("Jetty 12 does not support HTTP/1.0 requests" )
149152 @ Test
150153 public void retrieveXmlHttp10 () throws IOException {
151154 final String testData = "<a><b><c>hello</c></b></a>" ;
Original file line number Diff line number Diff line change 2525import org .eclipse .jetty .server .Handler ;
2626import org .eclipse .jetty .server .Server ;
2727import org .eclipse .jetty .server .handler .DefaultHandler ;
28- import org .eclipse .jetty .server .handler .HandlerList ;
2928import org .eclipse .jetty .server .handler .ResourceHandler ;
3029import org .exist .test .ExistXmldbEmbeddedServer ;
3130import org .exist .xmldb .concurrent .DBUtils ;
@@ -93,12 +92,11 @@ public static void beforeClass() throws Exception {
9392
9493 jettyServer = new Server (jettyPort );
9594 final ResourceHandler resource_handler = new ResourceHandler ();
96- resource_handler .setDirectoriesListed (true );
95+ resource_handler .setDirAllowed (true );
9796 final String dir = jettyRootDir .toAbsolutePath ().toFile ().getCanonicalPath ();
98- resource_handler .setResourceBase (dir );
97+ resource_handler .setBaseResourceAsString (dir );
9998
100- final HandlerList handlers = new HandlerList ();
101- handlers .setHandlers (new Handler []{resource_handler , new DefaultHandler ()});
99+ final Handler .Sequence handlers = new Handler .Sequence (resource_handler , new DefaultHandler ());
102100
103101 jettyServer .setHandler (handlers );
104102 jettyServer .start ();
Original file line number Diff line number Diff line change 2525<web-app
2626 xmlns =" https://jakarta.ee/xml/ns/jakartaee"
2727 xmlns : xsi =" http://www.w3.org/2001/XMLSchema-instance"
28- xsi : schemaLocation =" https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0 .xsd"
28+ xsi : schemaLocation =" https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0 .xsd"
2929 metadata-complete =" false"
30- version =" 5 .0" >
30+ version =" 6 .0" >
3131
3232 <description >eXist-db – Open Source Native XML Database</description >
3333 <display-name >eXist-db XML Database</display-name >
Original file line number Diff line number Diff line change 2424<catalog xmlns =" urn:oasis:names:tc:entity:xmlns:xml:catalog" >
2525 <system systemId =" https://www.eclipse.org/jetty/configure_10_0.dtd" uri =" configure_10_0.dtd" />
2626 <public publicId =" -//Jetty//Configure//EN" uri =" configure_10_0.dtd" />
27- <uri name =" https://jakarta.ee/xml/ns/jakartae" uri =" web-app_5_0 .xsd" />
27+ <uri name =" https://jakarta.ee/xml/ns/jakartae" uri =" web-app_6_0 .xsd" />
2828 <uri name =" http://www.w3.org/XML/1998/namespace" uri =" xml.xsd" />
2929</catalog >
You can’t perform that action at this time.
0 commit comments