You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/02/09 20:25:00 UTC
[1/2] cxf git commit: Fix unit test
Repository: cxf
Updated Branches:
refs/heads/master 702389744 -> c903d27ec
Fix unit test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/71f35e5c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/71f35e5c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/71f35e5c
Branch: refs/heads/master
Commit: 71f35e5c3f8b6a2df43b4f15844f7b1f972e4340
Parents: 7023897
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Feb 9 14:08:06 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Feb 9 15:24:21 2017 -0500
----------------------------------------------------------------------
.../logging/event/DefaultLogEventMapper.java | 30 +++-----------------
1 file changed, 4 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/71f35e5c/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 8324dae..abf3a06 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
@@ -29,7 +29,6 @@ import java.util.Set;
import java.util.UUID;
import javax.security.auth.Subject;
-import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.binding.Binding;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
@@ -42,7 +41,6 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.service.model.ServiceModelUtil;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.ContextUtils;
@@ -156,7 +154,7 @@ public class DefaultLogEventMapper implements LogEventMapper {
}
uri = address + uri;
}
- } else {
+ } else if (address != null) {
uri = address;
}
}
@@ -207,19 +205,6 @@ public class DefaultLogEventMapper implements LogEventMapper {
BindingOperationInfo boi = null;
boi = message.getExchange().getBindingOperationInfo();
- if (null == boi) {
- boi = getOperationFromContent(message);
- }
-
- if (null == boi) {
- Message inMsg = message.getExchange().getInMessage();
- if (null != inMsg) {
- Message reqMsg = inMsg.getExchange().getInMessage();
- if (null != reqMsg) {
- boi = getOperationFromContent(reqMsg);
- }
- }
- }
if (null != boi) {
operationName = boi.getName().toString();
@@ -228,15 +213,6 @@ public class DefaultLogEventMapper implements LogEventMapper {
return operationName;
}
- private BindingOperationInfo getOperationFromContent(Message message) {
- XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class);
- if (xmlReader != null) {
- return ServiceModelUtil.getOperation(message.getExchange(), xmlReader.getName());
- } else {
- return null;
- }
- }
-
private Message getEffectiveMessage(Message message) {
boolean isRequestor = MessageUtils.isRequestor(message);
boolean isOutbound = MessageUtils.isOutbound(message);
@@ -258,7 +234,9 @@ public class DefaultLogEventMapper implements LogEventMapper {
String requestUri = safeGet(message, Message.REQUEST_URI);
if (requestUri != null) {
String basePath = safeGet(message, Message.BASE_PATH);
- if (basePath != null && requestUri.startsWith(basePath)) {
+ if (basePath == null) {
+ path = requestUri;
+ } else if (requestUri.startsWith(basePath)) {
path = requestUri.substring(basePath.length());
}
if (path.isEmpty()) {
[2/2] cxf git commit: Update ws/* to use new logging
Posted by dk...@apache.org.
Update ws/* to use new logging
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c903d27e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c903d27e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c903d27e
Branch: refs/heads/master
Commit: c903d27ec726f059a2b5e9ee1485202d2aa4d76c
Parents: 71f35e5
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Feb 9 15:24:34 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Feb 9 15:24:34 2017 -0500
----------------------------------------------------------------------
rt/ws/eventing/pom.xml | 5 +++++
.../notification/EventSinkInterfaceNotificationTask.java | 2 +-
.../backend/notification/SubscriptionEndNotificationTask.java | 2 +-
.../cxf/ws/eventing/base/SimpleEventingIntegrationTest.java | 6 +++---
rt/ws/mex/pom.xml | 7 +++++++
rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java | 2 +-
rt/ws/rm/pom.xml | 7 +++++++
.../java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java | 4 ++--
rt/ws/security/pom.xml | 6 ++++++
.../cxf/ws/security/wss4j/DefaultCryptoCoverageChecker.java | 2 +-
.../cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java | 2 +-
.../apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java | 7 ++++---
.../ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java | 4 ++--
.../apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java | 4 ++--
.../ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java | 4 ++--
.../java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java | 4 ++--
.../cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java | 4 ++--
.../apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java | 4 ++--
.../org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java | 4 ++--
.../ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java | 4 ++--
.../apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java | 4 ++--
.../ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java | 4 ++--
.../cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java | 4 ++--
.../apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java | 4 ++--
.../apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java | 4 ++--
.../cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java | 4 ----
26 files changed, 65 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/eventing/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml
index b8ac5fe..1e22144 100644
--- a/rt/ws/eventing/pom.xml
+++ b/rt/ws/eventing/pom.xml
@@ -67,6 +67,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/EventSinkInterfaceNotificationTask.java
----------------------------------------------------------------------
diff --git a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/EventSinkInterfaceNotificationTask.java b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/EventSinkInterfaceNotificationTask.java
index 13edfd9..6682d6f 100644
--- a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/EventSinkInterfaceNotificationTask.java
+++ b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/EventSinkInterfaceNotificationTask.java
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.namespace.QName;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.ws.eventing.EventType;
import org.apache.cxf.ws.eventing.backend.database.SubscriptionTicket;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/SubscriptionEndNotificationTask.java
----------------------------------------------------------------------
diff --git a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/SubscriptionEndNotificationTask.java b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/SubscriptionEndNotificationTask.java
index 2fad2e5..cbc9a17 100644
--- a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/SubscriptionEndNotificationTask.java
+++ b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/SubscriptionEndNotificationTask.java
@@ -20,7 +20,7 @@
package org.apache.cxf.ws.eventing.backend.notification;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.ws.eventing.LanguageSpecificStringType;
import org.apache.cxf.ws.eventing.SubscriptionEnd;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
index d027ec2..9e61641 100644
--- a/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
+++ b/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
@@ -24,9 +24,9 @@ import javax.xml.bind.JAXBElement;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.feature.LoggingFeature;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.LoggingFeature;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.transport.local.LocalTransportFactory;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/mex/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/mex/pom.xml b/rt/ws/mex/pom.xml
index 8f46641..c707f74 100644
--- a/rt/ws/mex/pom.xml
+++ b/rt/ws/mex/pom.xml
@@ -63,6 +63,13 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-logging</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java b/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
index 7323b8e..451603e 100644
--- a/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
+++ b/rt/ws/mex/src/test/java/org/apache/cxf/ws/mex/MEXTest.java
@@ -23,7 +23,7 @@ import javax.jws.WebMethod;
import javax.jws.WebService;
import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.feature.LoggingFeature;
+import org.apache.cxf.ext.logging.LoggingFeature;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.transport.local.LocalTransportFactory;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/rm/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index c9fbffd..d6cbd7e 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -115,6 +115,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-logging</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${cxf.derby.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index 8813beb..c223e40 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -40,7 +40,6 @@ import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
import org.apache.cxf.interceptor.AttachmentOutInterceptor;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.io.WriteOnCloseOutputStream;
import org.apache.cxf.message.Exchange;
@@ -76,7 +75,8 @@ public class RMCaptureOutInterceptor extends AbstractRMInterceptor<Message> {
public RMCaptureOutInterceptor() {
super(Phase.PRE_STREAM);
addBefore(AttachmentOutInterceptor.class.getName());
- addBefore(LoggingOutInterceptor.class.getName());
+ addBefore("org.apache.cxf.interceptor.LoggingOutInterceptor");
+ addBefore("org.apache.cxf.ext.logging.LoggingOutInterceptor");
}
protected void handle(Message msg) throws SequenceFault, RMException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index 75b9e2e..f6385b3 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -139,6 +139,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-logging</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageChecker.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageChecker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageChecker.java
index c5e2972..4e84cb4 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageChecker.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultCryptoCoverageChecker.java
@@ -231,7 +231,7 @@ public class DefaultCryptoCoverageChecker extends CryptoCoverageChecker {
return encryptUsernameToken;
}
- public void setEncryptUsernameToken(boolean encryptUsernameToken) {
+ public final void setEncryptUsernameToken(boolean encryptUsernameToken) {
this.encryptUsernameToken = encryptUsernameToken;
XPathExpression soap11Expression =
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
index 0450f6d..7c10efe 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
@@ -447,7 +447,7 @@ public class StaxCryptoCoverageChecker extends AbstractPhaseInterceptor<SoapMess
return encryptUsernameToken;
}
- public void setEncryptUsernameToken(boolean encryptUsernameToken) {
+ public final void setEncryptUsernameToken(boolean encryptUsernameToken) {
this.encryptUsernameToken = encryptUsernameToken;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
index 2295008..89a66cc 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
@@ -34,7 +34,6 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
import org.apache.cxf.interceptor.AttachmentOutInterceptor;
import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.interceptor.StaxOutInterceptor;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
@@ -80,7 +79,8 @@ public class WSS4JStaxOutInterceptor extends AbstractWSS4JStaxInterceptor {
super(props);
setPhase(Phase.PRE_STREAM);
getBefore().add(StaxOutInterceptor.class.getName());
- getAfter().add(LoggingOutInterceptor.class.getName());
+ getAfter().add("org.apache.cxf.interceptor.LoggingOutInterceptor");
+ getAfter().add("org.apache.cxf.ext.logging.LoggingOutInterceptor");
ending = createEndingInterceptor();
}
@@ -88,7 +88,8 @@ public class WSS4JStaxOutInterceptor extends AbstractWSS4JStaxInterceptor {
super();
setPhase(Phase.PRE_STREAM);
getBefore().add(StaxOutInterceptor.class.getName());
- getAfter().add(LoggingOutInterceptor.class.getName());
+ getAfter().add("org.apache.cxf.interceptor.LoggingOutInterceptor");
+ getAfter().add("org.apache.cxf.ext.logging.LoggingOutInterceptor");
ending = createEndingInterceptor();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
index 0cc38d4..ab4ea40 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxEncryptionIdentifierTest.java
@@ -24,9 +24,9 @@ import java.util.Properties;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
index fb98907..d0c9a54 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
@@ -26,9 +26,9 @@ import java.util.Properties;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
index ff15e06..8b0be8c 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxSignatureIdentifierTest.java
@@ -24,9 +24,9 @@ import java.util.Properties;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
index 35eff06..f57cb86 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
@@ -22,9 +22,9 @@ import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor;
import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java
index 77908ae..124f841 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java
@@ -26,9 +26,9 @@ import javax.xml.namespace.QName;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java
index 3f63541..b78e4bb 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java
@@ -28,9 +28,9 @@ import javax.xml.namespace.QName;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
index 729ee1f..76cc196 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
@@ -32,9 +32,9 @@ import javax.xml.namespace.QName;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
index 71205f7..c0e9f83 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
@@ -26,9 +26,9 @@ import java.util.Properties;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
index 926718a..8d5cc67 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
@@ -28,9 +28,9 @@ import javax.xml.namespace.QName;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
index a81eab0..f475e94 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
@@ -26,9 +26,9 @@ import java.util.Properties;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
index 24d88b0..fe499ff 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java
@@ -26,9 +26,9 @@ import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor;
import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
index 50b85dc..0bc12f2 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
@@ -24,9 +24,9 @@ import java.util.Properties;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
index 07d4f4f..37f689a 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
@@ -28,9 +28,9 @@ import javax.xml.namespace.QName;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.Service;
http://git-wip-us.apache.org/repos/asf/cxf/blob/c903d27e/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
index 32ca4f6..a850442 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
@@ -23,8 +23,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -138,8 +136,6 @@ public class ResourceFactoryImpl implements ResourceFactory {
private CreateResponse createRemotely(Create body, ResourceReference ref) {
JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
- factory.getInInterceptors().add(new LoggingInInterceptor());
- factory.getOutInterceptors().add(new LoggingOutInterceptor());
factory.setServiceClass(ResourceFactory.class);
factory.setAddress(ref.getResourceURL()
+ TransferConstants.RESOURCE_REMOTE_SUFFIX);