You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/03/02 15:34:03 UTC
[cxf] branch 3.3.x-fixes updated (3a3ea18 -> 9da77d3)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 3a3ea18 CXF-8215: SSE breaks Pipeline Processing. Adding proper headers propagation.
new f85a097 Update to tomcat 8.5.51
new 80bd4ec Updating Jetty
new 0fb33d8 [CXF-8225] Structure send method of Slf4jEventSender (#644)
new 64966e6 Recording .gitmergeinfo Changes
new 9da77d3 Updating Spring + Spring Boot
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 5 +++
parent/pom.xml | 8 ++--
.../cxf/ext/logging/slf4j/Slf4jEventSender.java | 44 +++++++++++++---------
systests/cdi/cdi-weld/cdi-producers-weld/pom.xml | 6 +++
systests/cdi/cdi-weld/pom.xml | 6 +++
5 files changed, 47 insertions(+), 22 deletions(-)
[cxf] 03/05: [CXF-8225] Structure send method of Slf4jEventSender
(#644)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0fb33d83198ee83bb731635d6d614ce560d2c635
Author: bmaehr <gi...@bmaehr.com>
AuthorDate: Mon Mar 2 15:16:03 2020 +0100
[CXF-8225] Structure send method of Slf4jEventSender (#644)
By extracting code into subroutines it is easier to override parts e.g. to make used Logger dependent of called method
(cherry picked from commit ce329cb7213b71f82dd2eeb635c1d753387c99c9)
---
.../cxf/ext/logging/slf4j/Slf4jEventSender.java | 44 +++++++++++++---------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java
index 40c2031..665e374 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java
@@ -38,26 +38,10 @@ public class Slf4jEventSender implements LogEventSender {
@Override
public void send(LogEvent event) {
- String cat = "org.apache.cxf.services." + event.getPortTypeName().getLocalPart() + "." + event.getType();
- Logger log = LoggerFactory.getLogger(cat);
+ Logger log = getLogger(event);
Set<String> keys = new HashSet<>();
try {
- put(keys, "Type", event.getType().toString());
- put(keys, "Address", event.getAddress());
- put(keys, "HttpMethod", event.getHttpMethod());
- put(keys, "Content-Type", event.getContentType());
- put(keys, "ResponseCode", event.getResponseCode());
- put(keys, "ExchangeId", event.getExchangeId());
- put(keys, "MessageId", event.getMessageId());
- if (event.getServiceName() != null) {
- put(keys, "ServiceName", localPart(event.getServiceName()));
- put(keys, "PortName", localPart(event.getPortName()));
- put(keys, "PortTypeName", localPart(event.getPortTypeName()));
- }
- if (event.getFullContentFile() != null) {
- put(keys, "FullContentFile", event.getFullContentFile().getAbsolutePath());
- }
- put(keys, "Headers", event.getHeaders().toString());
+ fillMDC(event, keys);
performLogging(log, MarkerFactory.getMarker(event.getServiceName() != null ? "SOAP" : "REST"),
getLogMessage(event));
} finally {
@@ -68,6 +52,30 @@ public class Slf4jEventSender implements LogEventSender {
}
+ protected Logger getLogger(final LogEvent event) {
+ final String cat = "org.apache.cxf.services." + event.getPortTypeName().getLocalPart() + "." + event.getType();
+ return LoggerFactory.getLogger(cat);
+ }
+
+ protected void fillMDC(final LogEvent event, final Set<String> keys) {
+ put(keys, "Type", event.getType().toString());
+ put(keys, "Address", event.getAddress());
+ put(keys, "HttpMethod", event.getHttpMethod());
+ put(keys, "Content-Type", event.getContentType());
+ put(keys, "ResponseCode", event.getResponseCode());
+ put(keys, "ExchangeId", event.getExchangeId());
+ put(keys, "MessageId", event.getMessageId());
+ if (event.getServiceName() != null) {
+ put(keys, "ServiceName", localPart(event.getServiceName()));
+ put(keys, "PortName", localPart(event.getPortName()));
+ put(keys, "PortTypeName", localPart(event.getPortTypeName()));
+ }
+ if (event.getFullContentFile() != null) {
+ put(keys, "FullContentFile", event.getFullContentFile().getAbsolutePath());
+ }
+ put(keys, "Headers", event.getHeaders().toString());
+ }
+
/**
* Override this to easily change the logging level etc.
*/
[cxf] 02/05: Updating Jetty
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 80bd4ec81e98b843cc98ad91a2bdc8e8e39a140c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Mar 2 08:28:53 2020 +0000
Updating Jetty
(cherry picked from commit a7169e542bb351563cc2296853681f06f35b4bfd)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 3b49f72..92240c8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -148,7 +148,7 @@
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jexl.version>2.1.1</cxf.jexl.version>
- <cxf.jetty9.version>9.4.26.v20200117</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.27.v20200227</cxf.jetty9.version>
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.johnzon.version>1.1.13</cxf.johnzon.version>
<cxf.json.api.version>1.1.4</cxf.json.api.version>
[cxf] 05/05: Updating Spring + Spring Boot
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9da77d32db828768aea0a593b1a4852f8506095c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Mar 2 15:30:47 2020 +0000
Updating Spring + Spring Boot
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 92240c8..19d88af 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -190,12 +190,12 @@
<cxf.slf4j.version>1.7.29</cxf.slf4j.version>
<cxf.snakeyaml.version>1.25</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
- <cxf.spring.boot.version>2.1.12.RELEASE</cxf.spring.boot.version>
+ <cxf.spring.boot.version>2.1.13.RELEASE</cxf.spring.boot.version>
<cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.security.version>5.1.8.RELEASE</cxf.spring.security.version>
- <cxf.spring.version>5.1.13.RELEASE</cxf.spring.version>
+ <cxf.spring.version>5.1.14.RELEASE</cxf.spring.version>
<cxf.stax-ex.version>1.7.6</cxf.stax-ex.version>
<cxf.swagger.ui.version>3.24.3</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.0.10</cxf.swagger.v3.version>
[cxf] 01/05: Update to tomcat 8.5.51
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f85a097e78b2aa15568c9ee2bbe7d5200c5e572d
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Fri Feb 28 23:08:07 2020 +0300
Update to tomcat 8.5.51
(cherry picked from commit 972a2755ca85ba86f473b0ce46f23bf6193ced62)
---
parent/pom.xml | 2 +-
systests/cdi/cdi-weld/cdi-producers-weld/pom.xml | 6 ++++++
systests/cdi/cdi-weld/pom.xml | 6 ++++++
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 701b085..3b49f72 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -202,7 +202,7 @@
<cxf.swagger2.version>1.5.24</cxf.swagger2.version>
<cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
<cxf.tika.version>1.23</cxf.tika.version>
- <cxf.tomcat.version>8.5.50</cxf.tomcat.version>
+ <cxf.tomcat.version>8.5.51</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.3</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
<cxf.undertow.version>2.0.28.Final</cxf.undertow.version>
diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml b/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml
index 584aa1c..6bd5bd2 100644
--- a/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml
+++ b/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml
@@ -54,6 +54,12 @@
<artifactId>weld-se-core</artifactId>
<version>${cxf.jboss.weld.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_3.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/systests/cdi/cdi-weld/pom.xml b/systests/cdi/cdi-weld/pom.xml
index 2fe7c9e..9bd2bef 100644
--- a/systests/cdi/cdi-weld/pom.xml
+++ b/systests/cdi/cdi-weld/pom.xml
@@ -50,6 +50,12 @@
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet</artifactId>
<version>${cxf.jboss.weld.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_3.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
[cxf] 04/05: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 64966e66dce6ecbe9c90288a68331e16af09d38f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Mar 2 14:18:20 2020 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 951cf69..9a02a51 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -62,6 +62,7 @@ B 64584f32c8a4632344a1e062e0fc969dfd88e41e
B 64915c3d36d6ef2bef8168e912a9b8977b5b2330
B 65869badeefe7eedd60fbc8b7d7c614a3c6d59a8
B 67715076cb7d245aaf2d3a2442a40349d354e323
+B 68d21206e618130aa5c0b05053a1a64e38feb2d7
B 6d59a806aca3cd81e7e86df401afd771274c3141
B 6dd6377021ac0b9b586a0c579c3adfd6950936c8
B 6fbaddee67676f9840405bd49cb7d6e08a81bd23
@@ -121,12 +122,14 @@ B eff15d982722111d5da87591bd115cefefe944df
B f0a556673f0a999dcdf5d9882a86a48120240594
B f0ad8c3079c37c7f1b9eaf0be0ee42ff5ddf5325
B f1f26101d421e30560b6da5f125852708774718b
+B f2da164e0733a14f967f3726166855d3a91eece8
B f54062eb331fcf35d9f3a840f532417fccbb2673
B f965e4917e440327abeb067c6d24ce9292f77f23
B f9c95c5d87a7b948896d8288d2009e03c6313eb7
B f9f5d45bbe302697224128d78e8b698928a7514d
B fa49de63402275f87d22bd0251c46f4a299d0b4f
B fab7fc9e2dfbe32cc9988b16f2aa03e4bfff28e3
+B fca1472e021feed0b470127dc5d71f646e1406f3
B fcd22cd026bc94a95fa19210df193df753afe4d1
M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
M 160f50ed9bd9391b61417716b3a67653c9e81a98
@@ -156,9 +159,11 @@ M 7b50181ebc445bb84d3463b284643432399bc0f8
M 7ef814556d727c147d6f625cbb1170edfd24a752
M 92a00fc05e2437d2d0cf98099060ba4e1f6dac99
M 95c3c37092751b1d00b6f2c26642f18ebcbba878
+M 972a2755ca85ba86f473b0ce46f23bf6193ced62
M 9c462e9bd614d529f0a2fd86490243ea1c858651
M a4fc3a0462f09dd6c6c920385b67e621d7e36399
M a61ca44ab50c1a3fc20fbaafe89b372809e0f49b
+M a7169e542bb351563cc2296853681f06f35b4bfd
M a9eb350f7cc28347ffeb7a8af44ba661531429f1
M aabf37788e571426e70250e7a62c7f4502e4d6e9
M aefdc0759e30cb44d1729f08d1f31ff516a14e03