cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [1/2] cxf git commit: Update transports and uncategorized systests to use the logging feature instead of the deprecated interceptors
Date Fri, 03 Feb 2017 19:50:40 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 8be745da6 -> bcacbef8c


Update transports and uncategorized systests to use the logging feature instead of the deprecated
interceptors


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bcacbef8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bcacbef8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bcacbef8

Branch: refs/heads/master
Commit: bcacbef8c3aa0e40e2cf560c6d0922edb4b641fb
Parents: 5602eff
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Feb 3 14:47:59 2017 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Feb 3 14:48:36 2017 -0500

----------------------------------------------------------------------
 systests/transports/pom.xml                     |  5 ++
 .../http_jetty/JettyBasicAuthServer.java        |  4 +-
 .../systest/http_jetty/JettyBasicAuthTest.java  |  4 +-
 .../systest/http_jetty/JettyDigestAuthTest.java |  4 +-
 .../cxf/systest/soap_udp/SoapUDPTest.java       |  2 +-
 systests/uncategorized/pom.xml                  |  5 ++
 .../java/org/apache/cxf/cxf2006/Server.java     |  4 +-
 .../factory_pattern/NumberFactoryImpl.java      |  4 +-
 .../systest/fault/IntFaultClientServerTest.java |  4 +-
 .../interceptor/InterceptorFaultTest.java       |  7 +-
 .../cxf/systest/mtom/ClientMtomXopTest.java     |  4 +-
 .../mtom_bindingtype/MTOMBindingTypeTest.java   |  4 +-
 .../MtomFeatureClientServerTest.java            |  5 +-
 .../ValidationClientServerTest.java             |  2 +-
 .../StaxTransformFeatureTest.java               | 71 +++++++-------------
 .../systest/stringarray/StringArrayTest.java    | 19 +++---
 .../apache/cxf/systest/versioning/Server.java   |  2 +-
 17 files changed, 72 insertions(+), 78 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/transports/pom.xml
----------------------------------------------------------------------
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index 9bccf56..199427c 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -168,6 +168,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-features-logging</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
index ae26721..007f38e 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
@@ -26,8 +26,8 @@ import javax.xml.ws.Endpoint;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
index 3072280..980e87c 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
@@ -28,9 +28,9 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.CXFBusFactory;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
+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.endpoint.dynamic.JaxWsDynamicClientFactory;
 import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
 import org.apache.cxf.transport.http.HTTPConduit;

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
index fe6e106..130f38c 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
@@ -32,11 +32,11 @@ import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.CXFBusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java
index f1e1f19..0bb1b8f 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java
@@ -23,7 +23,7 @@ import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 
 import org.apache.cxf.BusFactory;
-import org.apache.cxf.feature.LoggingFeature;
+import org.apache.cxf.ext.logging.LoggingFeature;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.hello_world_soap_http.Greeter;
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/pom.xml
----------------------------------------------------------------------
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index 650d6ca..e7ee27c 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -151,6 +151,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-features-logging</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java
index 90580a9..62d69a5 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java
@@ -23,8 +23,8 @@ import java.net.URL;
 
 import javax.xml.ws.Endpoint;
 
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.hello_world_soap_http.RPCLitGreeterImpl;

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
index 876cdf1..443fd2a7 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
@@ -28,9 +28,9 @@ import javax.xml.transform.Source;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
 import org.apache.cxf.factory_pattern.NumberFactory;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java
index 87368f8..bbe3d89 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java
@@ -28,10 +28,10 @@ import javax.xml.ws.BindingProvider;
 import org.w3c.dom.Node;
 
 import org.apache.cxf.binding.soap.SoapHeader;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.headers.Header;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.intfault.BadRecordLitFault;
 import org.apache.intfault.Greeter;

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
index ec7ae3d..8c0070e 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java
@@ -38,6 +38,8 @@ import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.event.PrintWriterEventSender;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.greeter_control.Control;
 import org.apache.cxf.greeter_control.ControlImpl;
@@ -47,7 +49,6 @@ import org.apache.cxf.greeter_control.Greeter;
 import org.apache.cxf.greeter_control.GreeterService;
 import org.apache.cxf.greeter_control.PingMeFault;
 import org.apache.cxf.greeter_control.types.FaultLocation;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseComparator;
@@ -199,8 +200,8 @@ public class InterceptorFaultTest extends AbstractBusClientServerTestBase
{
             // writer to grab the content of soap fault.
             // robust is not yet used at client's side, but I think it should
             StringWriter writer = new StringWriter();
-            ((Client)greeter).getInInterceptors().add(new LoggingInInterceptor());
-            ((LoggingInInterceptor)greeterBus.getInInterceptors().get(0)).setPrintWriter(new
PrintWriter(writer));
+            ((Client)greeter).getInInterceptors()
+                .add(new LoggingInInterceptor(new PrintWriterEventSender(new PrintWriter(writer))));
             // it should tell CXF to convert one-way robust out faults into real SoapFaultException
             ((Client)greeter).getEndpoint().put(Message.ROBUST_ONEWAY, true);
             greeter.greetMeOneWay("oneway");

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
index d88d117..e604a7a 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
@@ -38,10 +38,10 @@ import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ClientImpl;
 import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.jaxws.JaxWsClientProxy;
 import org.apache.cxf.jaxws.binding.soap.SOAPBindingImpl;

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
index f50919e..02d4df8 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
@@ -29,8 +29,8 @@ import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Holder;
 import javax.xml.ws.soap.SOAPBinding;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
 import org.apache.cxf.systest.mtom_feature.Hello;
 import org.apache.cxf.systest.mtom_feature.HelloService;
 import org.apache.cxf.systest.mtom_feature.ImageHelper;

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java
index f5581a5..c87967c 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java
@@ -31,7 +31,8 @@ import javax.xml.ws.Holder;
 import javax.xml.ws.Service;
 import javax.xml.ws.soap.MTOMFeature;
 
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.event.PrintWriterEventSender;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.transport.local.LocalConduit;
 
@@ -135,7 +136,7 @@ public class MtomFeatureClientServerTest extends AbstractBusClientServerTestBase
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         PrintWriter writer = new PrintWriter(bos, true);
 
-        LoggingOutInterceptor out = new LoggingOutInterceptor(writer);
+        LoggingOutInterceptor out = new LoggingOutInterceptor(new PrintWriterEventSender(writer));
         this.bus.getOutInterceptors().add(out);
 
         return bos;

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/ValidationClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/ValidationClientServerTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/ValidationClientServerTest.java
index 8fe92bb..6f89ea0 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/ValidationClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schema_validation/ValidationClientServerTest.java
@@ -34,7 +34,7 @@ import javax.xml.ws.WebServiceException;
 
 import org.apache.cxf.annotations.SchemaValidation.SchemaValidationType;
 import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.feature.LoggingFeature;
+import org.apache.cxf.ext.logging.LoggingFeature;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.schema_validation.DoSomethingFault;

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java
index f0dec31..344a080 100755
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java
@@ -30,14 +30,14 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.event.LogEvent;
+import org.apache.cxf.ext.logging.event.LogEventSender;
 import org.apache.cxf.greeter_control.Greeter;
 import org.apache.cxf.greeter_control.GreeterService;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.interceptor.transform.TransformInInterceptor;
 import org.apache.cxf.interceptor.transform.TransformOutInterceptor;
-import org.apache.cxf.message.Message;
 import org.apache.cxf.systest.interceptor.GreeterImpl;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -57,8 +57,8 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase
{
     private static final Logger LOG = LogUtils.getLogger(StaxTransformFeatureTest.class);
     private static final String GREETER_PORT_ADDRESS = "http://localhost:" + PORT + "/SoapContext/GreeterPort";
     
-    private static TestLoggingInInterceptor serverlogIn = new TestLoggingInInterceptor();
-    private static TestLoggingOutInterceptor serverlogOut = new TestLoggingOutInterceptor();
+    private static TestLoggingEventSender serverlogIn = new TestLoggingEventSender();
+    private static TestLoggingEventSender serverlogOut = new TestLoggingEventSender();
     private static TransformInInterceptor servertransIn = new TransformInInterceptor();
     private static TransformOutInterceptor servertransOut = new TransformOutInterceptor();
     
@@ -74,9 +74,9 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase
{
             BusFactory.setDefaultBus(bus);
             setBus(bus);
 
-            bus.getInInterceptors().add(serverlogIn);
-            bus.getOutInterceptors().add(serverlogOut);
-            bus.getOutFaultInterceptors().add(serverlogOut);
+            bus.getInInterceptors().add(new LoggingInInterceptor(serverlogIn));
+            bus.getOutInterceptors().add(new LoggingOutInterceptor(serverlogOut));
+            bus.getOutFaultInterceptors().add(new LoggingOutInterceptor(serverlogOut));
 
 
             Map<String, String> inElements = new HashMap<String, String>();
@@ -149,11 +149,12 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase
{
         Bus bus = bf.createBus();
         BusFactory.setDefaultBus(bus);
 
-        TestLoggingInInterceptor logIn = new TestLoggingInInterceptor();
-        bus.getInInterceptors().add(logIn);
-        TestLoggingOutInterceptor logOut = new TestLoggingOutInterceptor();
-        bus.getOutInterceptors().add(logOut);
-        bus.getOutFaultInterceptors().add(logOut);
+        TestLoggingEventSender logIn = new TestLoggingEventSender();
+        bus.getInInterceptors().add(new LoggingInInterceptor(logIn));
+        bus.getInFaultInterceptors().add(new LoggingInInterceptor(logIn));
+        TestLoggingEventSender logOut = new TestLoggingEventSender();
+        bus.getOutInterceptors().add(new LoggingOutInterceptor(logOut));
+        bus.getOutFaultInterceptors().add(new LoggingOutInterceptor(logOut));
 
         TransformInInterceptor transIn = new TransformInInterceptor();
         Map<String, String> inElements = new HashMap<String, String>();
@@ -175,7 +176,7 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase
{
         
         updateAddressPort(greeter, PORT);
         LOG.fine("Created greeter client.");
-        
+
         // ping 1: request-response transformation
         greeter.pingMe();
         verifyPayload(logOut.getMessage(), "dontPingMe");
@@ -187,10 +188,11 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase
{
         serverlogIn.cleaerMessage();
         logOut.cleaerMessage();
         logIn.cleaerMessage();
-        
+
         // ping 2: request-fault transformation
         try {
             greeter.pingMe();
+            fail("Ping should have failed");
         } catch (Exception e) {
             assertEquals("Pings succeed only every other time.", e.getMessage());
         }
@@ -212,6 +214,7 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase
{
         servertransOut.setSkipOnFault(true);
         try {
             greeter.pingMe();
+            fail("Ping should have failed");
         } catch (Exception e) {
             assertEquals("Pings succeed only every other time.", e.getMessage());
         }
@@ -226,49 +229,25 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase
{
     private void verifyPayload(String m, String value) {
         assertNotNull("message not logged", m);
         // the entire soap envelope is logged
-        assertTrue(m.indexOf("Payload: <soap:Envelope") > 0 && m.indexOf("</soap:Envelope>")
> 0);
+        assertTrue(m, m.indexOf("<soap:Envelope") >= 0 && m.indexOf("</soap:Envelope>")
> 0);
         // the transformed body is logged
-        assertTrue(value + " must be found in payload", m.indexOf(value) > 0);
+        assertTrue(value + " must be found in payload: " + m, m.indexOf(value) > 0);
     }
 
-    static class TestLoggingInInterceptor extends LoggingInInterceptor {
+    static class TestLoggingEventSender implements LogEventSender {
         private String logMessage;
         
-        @Override
-        public void handleMessage(Message msg) throws Fault {
-            msg.getExchange().getEndpoint().getEndpointInfo().setProperty("MessageLogger",
LOG);            
-            super.handleMessage(msg);
-        }
-        @Override
-        protected void log(Logger logger, String msg) {
-            logMessage = msg;
-        }
         public String getMessage() {
             return logMessage;
         }
         public void cleaerMessage() {
             logMessage = null;
         }
-    }
-    
-    static class TestLoggingOutInterceptor extends LoggingOutInterceptor {
-        private String message;
-        
-        @Override
-        public void handleMessage(Message msg) throws Fault {
-            msg.getExchange().getEndpoint().getEndpointInfo().setProperty("MessageLogger",
LOG);            
-            super.handleMessage(msg);
-        }
         @Override
-        protected void log(Logger logger, String msg) {
-            message = msg;
-        }
-        public String getMessage() {
-            return message;
-        }
-        public void cleaerMessage() {
-            message = null;
+        public void send(LogEvent event) {
+            logMessage = event.getPayload();
         }
     }
 
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java
index 900f3a1..af209a9 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java
@@ -23,8 +23,9 @@ import java.io.StringWriter;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
+import org.apache.cxf.ext.logging.event.PrintWriterEventSender;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.stringarray.SOAPServiceRPCLit;
 import org.apache.stringarray.StringListTest;
@@ -53,11 +54,11 @@ public class StringArrayTest extends AbstractBusClientServerTestBase {
         setBus(bus);
         StringWriter swin = new java.io.StringWriter();
         java.io.PrintWriter pwin = new java.io.PrintWriter(swin);
-        LoggingInInterceptor logIn = new LoggingInInterceptor(pwin);
+        LoggingInInterceptor logIn = new LoggingInInterceptor(new PrintWriterEventSender(pwin));
         
         StringWriter swout = new java.io.StringWriter();
         java.io.PrintWriter pwout = new java.io.PrintWriter(swout);
-        LoggingOutInterceptor logOut = new LoggingOutInterceptor(pwout);
+        LoggingOutInterceptor logOut = new LoggingOutInterceptor(new PrintWriterEventSender(pwout));
         
         
         getBus().getInInterceptors().add(logIn);
@@ -69,10 +70,12 @@ public class StringArrayTest extends AbstractBusClientServerTestBase {
         String[] res =  port.stringListTest(strs);
         assertArrayEquals(strs, res);      
 
-        assertTrue("Request message is not marshalled correctly and @XmlList does not take
effect",
-                     swout.toString().indexOf("<in>org apache cxf</in>") >
-1);
-        assertTrue("Response message is not marshalled correctly and @XmlList does not take
effect",
-                     swin.toString().indexOf("<out>org apache cxf</out>") >
-1);
+        assertTrue("Request message is not marshalled correctly and @XmlList does not take
effect:\n" 
+                   + swout.toString(),
+                   swout.toString().indexOf("<in>org apache cxf</in>") > -1);
+        assertTrue("Response message is not marshalled correctly and @XmlList does not take
effect\n" 
+                   + swin.toString(),
+                   swin.toString().indexOf("<out>org apache cxf</out>") >
-1);
     }
     
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/bcacbef8/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/Server.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/Server.java
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/Server.java
index acd7d73..4f8cf8c 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/Server.java
@@ -22,7 +22,7 @@ package org.apache.cxf.systest.versioning;
 import javax.xml.ws.Endpoint;
 
 import org.apache.cxf.BusFactory;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.ext.logging.LoggingInInterceptor;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.transport.MultipleEndpointObserver;


Mime
View raw message