This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 78c1aa0bf Replace deprecated org.eclipse.jetty.server.NCSARequestLog
with org.eclipse.jetty.server.CustomRequestLog
new bc657247f Merge pull request #65 from
garydgregory/r9_jetty_deprecated_NCSARequestLog
78c1aa0bf is described below
commit 78c1aa0bfed7d5556ce1f6fa5902146b954cfd9e
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Oct 9 09:33:58 2022 -0400
Replace deprecated org.eclipse.jetty.server.NCSARequestLog with
org.eclipse.jetty.server.CustomRequestLog
NCSARequestLog is deprecated in Jetty 9 has removed in Jetty 10
---
.../src/main/resources/jetty.xml | 22 +++++++++++++++-------
.../juneau-microservice-ftest/files/jetty.xml | 22 +++++++++++++++-------
.../src/main/resources/jetty.xml | 22 +++++++++++++++-------
.../juneau-sc-server/src/main/resources/jetty.xml | 22 +++++++++++++++-------
4 files changed, 60 insertions(+), 28 deletions(-)
diff --git
a/juneau-examples/juneau-examples-rest-jetty/src/main/resources/jetty.xml
b/juneau-examples/juneau-examples-rest-jetty/src/main/resources/jetty.xml
index 9ded93194..7eb8bbc9a 100644
--- a/juneau-examples/juneau-examples-rest-jetty/src/main/resources/jetty.xml
+++ b/juneau-examples/juneau-examples-rest-jetty/src/main/resources/jetty.xml
@@ -53,13 +53,21 @@
</Set>
<Set name="requestLog">
- <New id="RequestLogImpl"
class="org.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename"><Property name="jetty.logs"
default="$S{juneau.logDir,logs}"/>/jetty-requests.log</Set>
- <Set name="filenameDateFormat">yyyy_MM_dd</Set>
- <Set name="LogTimeZone">GMT</Set>
- <Set name="retainDays">90</Set>
- <Set name="append">false</Set>
- <Set name="LogLatency">true</Set>
+ <New id="RequestLogImpl"
class="org.eclipse.jetty.server.CustomRequestLog">
+ <!-- Param 0: org.eclipse.jetty.server.RequestLogWriter
-->
+ <Arg>
+ <New
class="org.eclipse.jetty.server.RequestLogWriter">
+ <Set name="append">false</Set>
+ <Set name="filename"><Property
name="jetty.logs" default="$S{Logging/logDir,logs}"/>/jetty-requests.log</Set>
+ <Set
name="filenameDateFormat">yyyy_MM_dd</Set>
+ <Set name="retainDays">90</Set>
+ <Set name="timeZone">GMT</Set>
+ </New>
+ </Arg>
+ <!-- Param 1: String -->
+ <Arg>
+ <Get
class="org.eclipse.jetty.server.CustomRequestLog" name="EXTENDED_NCSA_FORMAT" />
+ </Arg>
</New>
</Set>
diff --git a/juneau-microservice/juneau-microservice-ftest/files/jetty.xml
b/juneau-microservice/juneau-microservice-ftest/files/jetty.xml
index 9ef28ea3e..30a1fd8e7 100644
--- a/juneau-microservice/juneau-microservice-ftest/files/jetty.xml
+++ b/juneau-microservice/juneau-microservice-ftest/files/jetty.xml
@@ -53,13 +53,21 @@
</Set>
<Set name="requestLog">
- <New id="RequestLogImpl"
class="org.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename"><Property name="jetty.logs"
default="$C{Logging/logDir,logs}"/>/jetty-requests.log</Set>
- <Set name="filenameDateFormat">yyyy_MM_dd</Set>
- <Set name="LogTimeZone">GMT</Set>
- <Set name="retainDays">90</Set>
- <Set name="append">false</Set>
- <Set name="LogLatency">true</Set>
+ <New id="RequestLogImpl"
class="org.eclipse.jetty.server.CustomRequestLog">
+ <!-- Param 0: org.eclipse.jetty.server.RequestLogWriter
-->
+ <Arg>
+ <New
class="org.eclipse.jetty.server.RequestLogWriter">
+ <Set name="append">false</Set>
+ <Set name="filename"><Property
name="jetty.logs" default="$C{Logging/logDir,logs}" />/jetty-requests.log</Set>
+ <Set
name="filenameDateFormat">yyyy_MM_dd</Set>
+ <Set name="retainDays">90</Set>
+ <Set name="timeZone">GMT</Set>
+ </New>
+ </Arg>
+ <!-- Param 1: String -->
+ <Arg>
+ <Get
class="org.eclipse.jetty.server.CustomRequestLog" name="EXTENDED_NCSA_FORMAT" />
+ </Arg>
</New>
</Set>
diff --git
a/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/jetty.xml
b/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/jetty.xml
index aed75996a..2c1e04a76 100644
---
a/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/jetty.xml
+++
b/juneau-microservice/juneau-my-jetty-microservice/src/main/resources/jetty.xml
@@ -58,13 +58,21 @@
</Set>
<Set name="requestLog">
- <New id="RequestLogImpl"
class="org.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename"><Property name="jetty.logs"
default="$C{Logging/logDir,logs}"/>/jetty-requests.log</Set>
- <Set name="filenameDateFormat">yyyy_MM_dd</Set>
- <Set name="LogTimeZone">GMT</Set>
- <Set name="retainDays">90</Set>
- <Set name="append">false</Set>
- <Set name="LogLatency">true</Set>
+ <New id="RequestLogImpl"
class="org.eclipse.jetty.server.CustomRequestLog">
+ <!-- Param 0: org.eclipse.jetty.server.RequestLogWriter
-->
+ <Arg>
+ <New
class="org.eclipse.jetty.server.RequestLogWriter">
+ <Set name="append">false</Set>
+ <Set name="filename"><Property
name="jetty.logs" default="$C{Logging/logDir,logs}" />/jetty-requests.log</Set>
+ <Set
name="filenameDateFormat">yyyy_MM_dd</Set>
+ <Set name="retainDays">90</Set>
+ <Set name="timeZone">GMT</Set>
+ </New>
+ </Arg>
+ <!-- Param 1: String -->
+ <Arg>
+ <Get
class="org.eclipse.jetty.server.CustomRequestLog" name="EXTENDED_NCSA_FORMAT" />
+ </Arg>
</New>
</Set>
diff --git a/juneau-sc/juneau-sc-server/src/main/resources/jetty.xml
b/juneau-sc/juneau-sc-server/src/main/resources/jetty.xml
index 9ef28ea3e..30a1fd8e7 100644
--- a/juneau-sc/juneau-sc-server/src/main/resources/jetty.xml
+++ b/juneau-sc/juneau-sc-server/src/main/resources/jetty.xml
@@ -53,13 +53,21 @@
</Set>
<Set name="requestLog">
- <New id="RequestLogImpl"
class="org.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename"><Property name="jetty.logs"
default="$C{Logging/logDir,logs}"/>/jetty-requests.log</Set>
- <Set name="filenameDateFormat">yyyy_MM_dd</Set>
- <Set name="LogTimeZone">GMT</Set>
- <Set name="retainDays">90</Set>
- <Set name="append">false</Set>
- <Set name="LogLatency">true</Set>
+ <New id="RequestLogImpl"
class="org.eclipse.jetty.server.CustomRequestLog">
+ <!-- Param 0: org.eclipse.jetty.server.RequestLogWriter
-->
+ <Arg>
+ <New
class="org.eclipse.jetty.server.RequestLogWriter">
+ <Set name="append">false</Set>
+ <Set name="filename"><Property
name="jetty.logs" default="$C{Logging/logDir,logs}" />/jetty-requests.log</Set>
+ <Set
name="filenameDateFormat">yyyy_MM_dd</Set>
+ <Set name="retainDays">90</Set>
+ <Set name="timeZone">GMT</Set>
+ </New>
+ </Arg>
+ <!-- Param 1: String -->
+ <Arg>
+ <Get
class="org.eclipse.jetty.server.CustomRequestLog" name="EXTENDED_NCSA_FORMAT" />
+ </Arg>
</New>
</Set>
