From e8f6384b10e325ffb8252a407de171315044bf64 Mon Sep 17 00:00:00 2001
From: Adrian Hamm <from-github-existdb@agh2342.de>
Date: Wed, 22 Dec 2021 23:05:29 +0100
Subject: [PATCH 1/2] [feature] Import jetty Properties from SystemProperties

---
 .../src/main/resources/org/exist/jetty/etc/jetty-http.xml     | 4 ++--
 .../src/main/resources/org/exist/jetty/etc/jetty-ssl.xml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-http.xml b/exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-http.xml
index 940b2fe8b61..ca679402031 100644
--- a/exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-http.xml
+++ b/exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-http.xml
@@ -34,8 +34,8 @@
             </Item>
           </Array>
         </Arg>
-        <Set name="host"><Property name="jetty.http.host" deprecated="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.http.port" deprecated="jetty.port"><Default><SystemProperty name="jetty.port" default="8080"/></Default></Property></Set>
+        <Set name="host"><Property name="jetty.http.host" deprecated="jetty.host"><Default><SystemProperty name="jetty.http.host" deprecated="jetty.host"/></Default></Property></Set>
+        <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>
         <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" deprecated="http.timeout" default="30000"/></Set>
         <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" deprecated="http.acceptorPriorityDelta" default="0"/></Set>
         <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" deprecated="http.acceptQueueSize" default="0"/></Set>
diff --git a/exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-ssl.xml b/exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-ssl.xml
index b69cefc02ac..b117e54e53c 100644
--- a/exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-ssl.xml
+++ b/exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-ssl.xml
@@ -26,7 +26,7 @@
           </Array>
         </Arg>
 
-        <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set>
+        <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host"><Default><SystemProperty name="jetty.ssl.host" deprecated="jetty.host"/></Default></Property></Set>
         <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>
         <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set>
         <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>

From 5e8cf383d42cc444bbf47627dab01ab4a0448bed Mon Sep 17 00:00:00 2001
From: Adrian Hamm <from-github-existdb@agh2342.de>
Date: Tue, 18 Jan 2022 15:22:06 +0100
Subject: [PATCH 2/2] [feature] Import standalone-jetty Properties from
 SystemProperties

---
 .../resources/org/exist/jetty/etc/standalone-jetty-http.xml   | 4 ++--
 .../resources/org/exist/jetty/etc/standalone-jetty-ssl.xml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-jetty-http.xml b/exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-jetty-http.xml
index 69d4edd98f6..70f2b7f7536 100644
--- a/exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-jetty-http.xml
+++ b/exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-jetty-http.xml
@@ -34,8 +34,8 @@
             </Item>
           </Array>
         </Arg>
-        <Set name="host"><Property name="jetty.http.host" deprecated="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.http.port" deprecated="jetty.port"><Default><SystemProperty name="jetty.port" default="8088"/></Default></Property></Set>
+        <Set name="host"><Property name="jetty.http.host" deprecated="jetty.host"><Default><SystemProperty name="jetty.http.host" deprecated="jetty.host"/></Default></Property></Set>
+        <Set name="port"><Property name="jetty.http.port" deprecated="jetty.port"><Default><SystemProperty name="jetty.http.port" deprecated="jetty.port" default="8088"/></Default></Property></Set>
         <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" deprecated="http.timeout" default="30000"/></Set>
         <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" deprecated="http.acceptorPriorityDelta" default="0"/></Set>
         <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" deprecated="http.acceptQueueSize" default="0"/></Set>
diff --git a/exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-jetty-ssl.xml b/exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-jetty-ssl.xml
index 5691006f223..5d0296b9583 100644
--- a/exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-jetty-ssl.xml
+++ b/exist-jetty-config/src/main/resources/org/exist/jetty/etc/standalone-jetty-ssl.xml
@@ -26,7 +26,7 @@
           </Array>
         </Arg>
 
-        <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set>
+        <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host"><Default><SystemProperty name="jetty.ssl.host" deprecated="jetty.host"/></Default></Property></Set>
         <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port"><Default><SystemProperty name="jetty.ssl.port" deprecated="ssl.port" default="8451"/></Default></Property></Set>
         <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set>
         <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>