Repository: cxf Updated Branches: refs/heads/master 28e8f04af -> eb4ea1fc0
[CXF-6286] Removed SOAP binding dep, fixed pom Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eb4ea1fc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eb4ea1fc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eb4ea1fc Branch: refs/heads/master Commit: eb4ea1fc03b17b7283b427cd4616507f934ef423 Parents: 28e8f04 Author: Christian Schneider <[email protected]> Authored: Wed Mar 11 17:23:39 2015 +0100 Committer: Christian Schneider <[email protected]> Committed: Wed Mar 11 17:23:39 2015 +0100 ---------------------------------------------------------------------- rt/features/logging/pom.xml | 10 +++------- .../cxf/ext/logging/event/DefaultLogEventMapper.java | 5 +++-- .../apache/cxf/ext/logging/slf4j/Slf4jEventSender.java | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/eb4ea1fc/rt/features/logging/pom.xml ---------------------------------------------------------------------- diff --git a/rt/features/logging/pom.xml b/rt/features/logging/pom.xml index 4a51e1f..d276bfc 100644 --- a/rt/features/logging/pom.xml +++ b/rt/features/logging/pom.xml @@ -9,9 +9,9 @@ <version>3.1.0-SNAPSHOT</version> <relativePath>../../../parent/pom.xml</relativePath> </parent> - <artifactId>logging</artifactId> - <name>logging</name> <groupId>org.apache.cxf.ext</groupId> + <artifactId>cxf-rt-ext-logging</artifactId> + <packaging>bundle</packaging> <dependencies> <dependency> @@ -23,16 +23,12 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-soap</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>1.7.7</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/eb4ea1fc/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java ---------------------------------------------------------------------- diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java index 5a3da5f..58ae85c 100644 --- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java +++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java @@ -32,7 +32,7 @@ import javax.security.auth.Subject; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamReader; -import org.apache.cxf.binding.soap.SoapBinding; +import org.apache.cxf.binding.Binding; import org.apache.cxf.configuration.security.AuthorizationPolicy; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.helpers.CastUtils; @@ -183,7 +183,8 @@ public class DefaultLogEventMapper implements LogEventMapper { * @return */ private boolean isSOAPMessage(Message message) { - return message.getExchange().getBinding() instanceof SoapBinding; + Binding binding = message.getExchange().getBinding(); + return binding != null && binding.getClass().getSimpleName().equals("SoapBinding"); } /** http://git-wip-us.apache.org/repos/asf/cxf/blob/eb4ea1fc/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java ---------------------------------------------------------------------- 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 3a6e751..ed22f28 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 @@ -33,7 +33,7 @@ public class Slf4jEventSender implements LogEventSender { @Override public void send(LogEvent event) { - String cat = "org.apache.cxf.services." + event.getPortTypeName() + "." + event.getType(); + String cat = "org.apache.cxf.services." + event.getPortTypeName().getLocalPart() + "." + event.getType(); Logger log = LoggerFactory.getLogger(cat); Set<String> keys = new HashSet<String>(); try {
