Skip to content

Commit 7ec0363

Browse files
adamretteradamretter
committed
fixup! [feature] Update from Jetty 11 to Jetty 12
1 parent 4d89d5c commit 7ec0363

17 files changed

+142
-153
lines changed

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-annotations.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- =========================================================== -->
66
<!-- Add annotation Configuring classes to all webapps for this Server -->
77
<!-- =========================================================== -->
8-
<Call class="org.eclipse.jetty.webapp.Configurations" name="setServerDefault">
8+
<Call class="org.eclipse.jetty.ee10.webapp.Configurationsx" name="setServerDefault">
99
<Arg><Ref refid="Server" /></Arg>
1010
<!-- Call name="addBefore">
1111
<Arg name="beforeClass">org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Arg>

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-bytebufferpool.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
<Configure>
33
<New id="byteBufferPool" class="org.eclipse.jetty.io.ArrayByteBufferPool">
44
<Arg type="int"><Property name="jetty.byteBufferPool.minCapacity" default="0"/></Arg>
5-
<Arg type="int"><Property name="jetty.byteBufferPool.factor" default="1024"/></Arg>
5+
<Arg type="int"><Property name="jetty.byteBufferPool.factor" default="4096"/></Arg>
66
<Arg type="int"><Property name="jetty.byteBufferPool.maxCapacity" default="65536"/></Arg>
7-
<Arg type="int"><Property name="jetty.byteBufferPool.maxQueueLength" default="-1"/></Arg>
8-
<Arg type="long"><Property name="jetty.byteBufferPool.maxHeapMemory" default="-1"/></Arg>
9-
<Arg type="long"><Property name="jetty.byteBufferPool.maxDirectMemory" default="-1"/></Arg>
7+
<Arg type="int"><Property name="jetty.byteBufferPool.maxBucketSize" default="-1"/></Arg>
8+
<Arg type="long"><Property name="jetty.byteBufferPool.maxHeapMemory" default="0"/></Arg>
9+
<Arg type="long"><Property name="jetty.byteBufferPool.maxDirectMemory" default="0"/></Arg>
10+
<Set name="statisticsEnabled" property="jetty.byteBufferPool.statisticsEnabled" />
1011
</New>
1112
</Configure>

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-deploy.xml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,12 @@
99
<!-- AppProvider interface. -->
1010
<!-- =============================================================== -->
1111
<Configure id="Server" class="org.eclipse.jetty.server.Server">
12-
1312
<Call name="addBean">
1413
<Arg>
1514
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
1615
<Set name="contexts">
1716
<Ref refid="Contexts" />
1817
</Set>
19-
<Call name="setContextAttribute">
20-
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
21-
<Arg>.*/[^/]*servlet-api-[^/]*\.jar$|.*/jakarta.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$</Arg>
22-
</Call>
2318

2419
<!-- Add a customize step to the deployment lifecycle -->
2520
<!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class
@@ -44,14 +39,7 @@
4439
<Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="10"/></Set>
4540
<Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set>
4641
<Set name="configurationManager">
47-
<New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager">
48-
<!-- file of context configuration properties
49-
<Set name="file"><SystemProperty name="jetty.base"/>/etc/some.properties</Set>
50-
-->
51-
<!-- set a context configuration property
52-
<Call name="put"><Arg>name</Arg><Arg>value</Arg></Call>
53-
-->
54-
</New>
42+
<New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager"/>
5543
</Set>
5644
</New>
5745
</Arg>

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-gzip.xml‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,28 @@
1212
<Call name="insertHandler">
1313
<Arg>
1414
<New id="GzipHandler" class="org.eclipse.jetty.server.handler.gzip.GzipHandler">
15-
<Set name="minGzipSize"><Property name="jetty.gzip.minGzipSize" deprecated="gzip.minGzipSize" default="2048"/></Set>
15+
<Set name="minGzipSize"><Property name="jetty.gzip.minGzipSize" default="2048"/></Set>
1616
<Set name="inflateBufferSize"><Property name="jetty.gzip.inflateBufferSize" default="0"/></Set>
17-
<Set name="deflaterPoolCapacity"><Property name="jetty.gzip.deflaterPoolCapacity" default="-1"/></Set>
18-
<Set name="syncFlush"><Property name="jetty.gzip.syncFlush" default="false" /></Set>
17+
<Set name="syncFlush"><Property name="jetty.gzip.syncFlush" default="false"/></Set>
18+
<Set name="includedMethodList" property="jetty.gzip.includedMethodList"/>
19+
<Set name="excludedMethodList" property="jetty.gzip.excludedMethodList"/>
20+
<Set name="includedMimeTypesList" property="jetty.gzip.includedMimeTypeList"/>
21+
<Set name="excludedMimeTypesList" property="jetty.gzip.excludedMimeTypeList"/>
22+
<Set name="includedPaths" property="jetty.gzip.includedPathList"/>
23+
<Set name="excludedPaths" property="jetty.gzip.excludedPathList"/>
24+
<Set name="inflaterPool">
25+
<New class="org.eclipse.jetty.util.compression.InflaterPool">
26+
<Arg type="int"><Property name="jetty.gzip.inflaterPool.capacity" deprecated="jetty.gzip.inflaterPoolCapacity" default="1024"/></Arg>
27+
<Arg type="boolean"><Property name="jetty.gzip.inflaterPool.noWrap" default="true"/></Arg>
28+
</New>
29+
</Set>
30+
<Set name="deflaterPool">
31+
<New class="org.eclipse.jetty.util.compression.DeflaterPool">
32+
<Arg type="int"><Property name="jetty.gzip.deflaterPool.capacity" deprecated="jetty.gzip.deflaterPoolCapacity" default="1024"/></Arg>
33+
<Arg type="int"><Property name="jetty.gzip.deflaterPool.compressionLevel" deprecated="jetty.gzip.compressionLevel" default="-1"/></Arg>
34+
<Arg type="boolean"><Property name="jetty.gzip.deflaterPool.noWrap" default="true"/></Arg>
35+
</New>
36+
</Set>
1937
<Set name="includedMethodList"><Property name="jetty.gzip.includedMethodList" default="GET" /></Set>
2038
<Set name="excludedMethodList"><Property name="jetty.gzip.excludedMethodList" default="" /></Set>
2139

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-http.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<Arg>
2323
<New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector">
2424
<Arg name="server"><Ref refid="Server" /></Arg>
25-
<Arg name="acceptors" type="int"><Property name="jetty.http.acceptors" deprecated="http.acceptors" default="-1"/></Arg>
26-
<Arg name="selectors" type="int"><Property name="jetty.http.selectors" deprecated="http.selectors" default="-1"/></Arg>
25+
<Arg name="acceptors" type="int"><Property name="jetty.http.acceptors" default="1"/></Arg>
26+
<Arg name="selectors" type="int"><Property name="jetty.http.selectors" default="-1"/></Arg>
2727
<Arg name="factories">
2828
<Array type="org.eclipse.jetty.server.ConnectionFactory">
2929
<Item>
@@ -35,9 +35,14 @@
3535
</Arg>
3636
<Set name="host"><Property name="jetty.http.host" deprecated="jetty.host"><Default><SystemProperty name="jetty.http.host" deprecated="jetty.host"/></Default></Property></Set>
3737
<Set name="port"><Property name="jetty.http.port" deprecated="jetty.port"><Default><SystemProperty name="jetty.http.port" deprecated="jetty.port" default="8080"/></Default></Property></Set>
38-
<Set name="idleTimeout"><Property name="jetty.http.idleTimeout" deprecated="http.timeout" default="30000"/></Set>
39-
<Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" deprecated="http.acceptorPriorityDelta" default="0"/></Set>
40-
<Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" deprecated="http.acceptQueueSize" default="0"/></Set>
38+
<Set name="idleTimeout"><Property name="jetty.http.idleTimeout" default="30000"/></Set>
39+
<Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" default="0"/></Set>
40+
<Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" default="0"/></Set>
41+
<Set name="reuseAddress"><Property name="jetty.http.reuseAddress" default="true"/></Set>
42+
<Set name="reusePort"><Property name="jetty.http.reusePort" default="false"/></Set>
43+
<Set name="acceptedTcpNoDelay"><Property name="jetty.http.acceptedTcpNoDelay" default="true"/></Set>
44+
<Set name="acceptedReceiveBufferSize" property="jetty.http.acceptedReceiveBufferSize" />
45+
<Set name="acceptedSendBufferSize" property="jetty.http.acceptedSendBufferSize" />
4146
<Get name="SelectorManager">
4247
<Set name="connectTimeout"><Property name="jetty.http.connectTimeout" default="15000"/></Set>
4348
</Get>

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-jmx.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,5 @@
2222
</Arg>
2323
</Call>
2424

25-
<!-- Add the static log -->
26-
<Call name="addBean">
27-
<Arg>
28-
<Get class="org.eclipse.jetty.util.log.Log" name="Log" />
29-
</Arg>
30-
</Call>
3125
</Configure>
3226

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-logging.xml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-requestlog.xml‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,38 @@
1111
<!-- (Use RequestLogHandler for a context specific RequestLog -->
1212
<!-- =========================================================== -->
1313
<Set name="RequestLog">
14-
<New id="RequestLog" class="org.eclipse.jetty.server.CustomRequestLog"/>
14+
<New id="RequestLog" class="org.eclipse.jetty.server.CustomRequestLog">
15+
<!-- Writer -->
16+
<Arg>
17+
<New class="org.eclipse.jetty.server.AsyncRequestLogWriter">
18+
<Arg>
19+
<Call name="resolvePath" class="org.eclipse.jetty.xml.XmlConfiguration">
20+
<Arg><Property name="jetty.base"/></Arg>
21+
<Arg>
22+
<Property name="jetty.requestlog.filePath">
23+
<Default>
24+
<Property name="jetty.requestlog.dir" default="logs"/>/jetty.request.yyyy-mm-dd.log
25+
</Default>
26+
</Property>
27+
</Arg>
28+
</Call>
29+
</Arg>
30+
31+
<Set name="filenameDateFormat"><Property name="jetty.requestlog.filenameDateFormat" default="yyyy_MM_dd"/></Set>
32+
<Set name="retainDays"><Property name="jetty.requestlog.retainDays" default="90"/></Set>
33+
<Set name="append"><Property name="jetty.requestlog.append" default="false"/></Set>
34+
<Set name="timeZone"><Property name="jetty.requestlog.timezone" default="UTC"/></Set>
35+
</New>
36+
</Arg>
37+
38+
<!-- Format String -->
39+
<Arg>
40+
<Property name="jetty.requestlog.formatString" deprecated="jetty.customrequestlog.formatString">
41+
<Default>
42+
<Get class="org.eclipse.jetty.server.CustomRequestLog" name="EXTENDED_NCSA_FORMAT"/>
43+
</Default>
44+
</Property>
45+
</Arg>
46+
</New>
1547
</Set>
1648
</Configure>

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-ssl.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<Arg>
1616
<New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
1717
<Arg name="server"><Ref refid="Server" /></Arg>
18-
<Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors" deprecated="ssl.acceptors" default="-1"/></Arg>
19-
<Arg name="selectors" type="int"><Property name="jetty.ssl.selectors" deprecated="ssl.selectors" default="-1"/></Arg>
18+
<Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors" default="1"/></Arg>
19+
<Arg name="selectors" type="int"><Property name="jetty.ssl.selectors" default="-1"/></Arg>
2020
<Arg name="factories">
2121
<Array type="org.eclipse.jetty.server.ConnectionFactory">
2222
<!-- uncomment to support proxy protocol
@@ -28,9 +28,14 @@
2828

2929
<Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host"><Default><SystemProperty name="jetty.ssl.host" deprecated="jetty.host"/></Default></Property></Set>
3030
<Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port"><Default><SystemProperty name="jetty.ssl.port" deprecated="ssl.port" default="8443"/></Default></Property></Set>
31-
<Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set>
32-
<Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>
33-
<Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize" deprecated="ssl.acceptQueueSize" default="0"/></Set>
31+
<Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" default="30000"/></Set>
32+
<Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" default="0"/></Set>
33+
<Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" default="0"/></Set>
34+
<Set name="reuseAddress"><Property name="jetty.ssl.reuseAddress" default="true"/></Set>
35+
<Set name="reusePort"><Property name="jetty.ssl.reusePort" default="false"/></Set>
36+
<Set name="acceptedTcpNoDelay"><Property name="jetty.ssl.acceptedTcpNoDelay" default="true"/></Set>
37+
<Set name="acceptedReceiveBufferSize" property="jetty.ssl.acceptedReceiveBufferSize" />
38+
<Set name="acceptedSendBufferSize" property="jetty.ssl.acceptedSendBufferSize" />
3439
<Get name="SelectorManager">
3540
<Set name="connectTimeout"><Property name="jetty.ssl.connectTimeout" default="15000"/></Set>
3641
</Get>

‎exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-threadpool.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@
1919
<!-- for all configuration that may be set here. -->
2020
<!-- =========================================================== -->
2121
<New id="threadPool" class="org.eclipse.jetty.util.thread.QueuedThreadPool">
22+
<Set name="name" property="jetty.threadPool.namePrefix" />
2223
<Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads" deprecated="threads.min" default="10"/></Set>
2324
<Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads" deprecated="threads.max" default="200"/></Set>
2425
<Set name="reservedThreads" type="int"><Property name="jetty.threadPool.reservedThreads" default="-1"/></Set>
26+
<Set name="useVirtualThreads" property="jetty.threadPool.useVirtualThreads" />
2527
<Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout" deprecated="threads.timeout" default="60000"/></Set>
28+
<Set name="maxEvictCount" type="int"><Property name="jetty.threadPool.maxEvictCount" default="1"/></Set>
2629
<Set name="detailedDump" type="boolean"><Property name="jetty.threadPool.detailedDump" default="false"/></Set>
2730
</New>
2831
</Configure>

0 commit comments

Comments
 (0)