Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A71B0200B6B for ; Thu, 25 Aug 2016 20:04:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A5985160AA4; Thu, 25 Aug 2016 18:04:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C309B160AA5 for ; Thu, 25 Aug 2016 20:04:10 +0200 (CEST) Received: (qmail 42113 invoked by uid 500); 25 Aug 2016 18:04:10 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 42104 invoked by uid 99); 25 Aug 2016 18:04:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Aug 2016 18:04:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AE006E0BDB; Thu, 25 Aug 2016 18:04:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Thu, 25 Aug 2016 18:04:10 -0000 Message-Id: In-Reply-To: <74192b8a55904dcab7a6918770f4093b@git.apache.org> References: <74192b8a55904dcab7a6918770f4093b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf git commit: Check other locations for the FaultMode archived-at: Thu, 25 Aug 2016 18:04:11 -0000 Check other locations for the FaultMode Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/18073208 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/18073208 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/18073208 Branch: refs/heads/3.1.x-fixes Commit: 18073208929af01d4b5045b0cf9f65b2d253cf08 Parents: b25154e Author: Daniel Kulp Authored: Thu Aug 25 13:55:09 2016 -0400 Committer: Daniel Kulp Committed: Thu Aug 25 14:04:03 2016 -0400 ---------------------------------------------------------------------- .../codahale/CodahaleMetricsContext.java | 6 ++++++ systests/jaxws/pom.xml | 9 +++++++++ .../cxf/systest/jaxws/ClientServerMiscTest.java | 7 +++++++ .../DocLitWrappedCodeFirstServiceImpl.java | 3 +++ .../apache/cxf/systest/jaxws/ServerMisc.java | 21 ++++++++++++++++++++ 5 files changed, 46 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/18073208/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsContext.java ---------------------------------------------------------------------- diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsContext.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsContext.java index 9670b55..27dbc80 100644 --- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsContext.java +++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsContext.java @@ -89,6 +89,12 @@ public class CodahaleMetricsContext implements MetricsContext, Closeable { outgoingData.mark(outSize); } FaultMode fm = ex.get(FaultMode.class); + if (fm == null && ex.getOutFaultMessage() != null) { + fm = ex.getOutFaultMessage().get(FaultMode.class); + } + if (fm == null && ex.getInMessage() != null) { + fm = ex.getInMessage().get(FaultMode.class); + } if (fm != null) { switch (fm) { case CHECKED_APPLICATION_FAULT: http://git-wip-us.apache.org/repos/asf/cxf/blob/18073208/systests/jaxws/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jaxws/pom.xml b/systests/jaxws/pom.xml index 48bbfaf..326c529 100644 --- a/systests/jaxws/pom.xml +++ b/systests/jaxws/pom.xml @@ -139,6 +139,15 @@ ${project.version} + org.apache.cxf + cxf-rt-features-metrics + ${project.version} + + + io.dropwizard.metrics + metrics-core + + org.eclipse.jetty.websocket websocket-server ${cxf.jetty9.version} http://git-wip-us.apache.org/repos/asf/cxf/blob/18073208/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java index 0ae5a02..0635b73 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java @@ -39,6 +39,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; import javax.xml.ws.Holder; import javax.xml.ws.Service; +import javax.xml.ws.WebServiceException; import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.soap.SOAPFaultException; import javax.xml.xpath.XPathConstants; @@ -622,6 +623,12 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase { } try { + port.throwException(-4); + fail("Expected exception not found"); + } catch (WebServiceException ex) { + assertEquals("RuntimeException!!", ex.getMessage()); + } + try { Foo foo = new Foo(); foo.setNameIgnore("DoNoName"); port.modifyFoo(foo); http://git-wip-us.apache.org/repos/asf/cxf/blob/18073208/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java index 7d195e2..344e679 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java @@ -190,6 +190,9 @@ public class DocLitWrappedCodeFirstServiceImpl implements DocLitWrappedCodeFirst ex.setInts(new int[] {1, 2, 3}); throw ex; } + case -4: { + throw new RuntimeException("RuntimeException!!"); + } default: throw new ServiceTestFault(new ServiceTestFault.ServiceTestDetails(i)); } http://git-wip-us.apache.org/repos/asf/cxf/blob/18073208/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java index d3b62ed..597abfe 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java @@ -19,17 +19,26 @@ package org.apache.cxf.systest.jaxws; +import java.util.Arrays; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import javax.xml.ws.Endpoint; +import com.codahale.metrics.MetricRegistry; + +import org.apache.cxf.Bus; import org.apache.cxf.anonymous_complex_type.AnonymousComplexTypeImpl; import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor; +import org.apache.cxf.bus.CXFBusFactory; import org.apache.cxf.jaxb_element_test.JaxbElementTestImpl; import org.apache.cxf.jaxws.EndpointImpl; import org.apache.cxf.jaxws.JAXWSMethodInvoker; import org.apache.cxf.jaxws.JaxWsServerFactoryBean; +import org.apache.cxf.metrics.MetricsFeature; +import org.apache.cxf.metrics.codahale.CodahaleMetricsProvider; import org.apache.cxf.ordered_param_holder.OrderedParamHolderImpl; import org.apache.cxf.service.invoker.Factory; import org.apache.cxf.service.invoker.PerRequestFactory; @@ -80,9 +89,21 @@ public class ServerMisc extends AbstractBusTestServerBase { JAXWSMethodInvoker invoker = new JAXWSMethodInvoker(factory); JaxWsServerFactoryBean factoryBean; + Map properties = new HashMap<>(); + properties.put("bus.jmx.usePlatformMBeanServer", Boolean.TRUE); + properties.put("bus.jmx.enabled", Boolean.TRUE); + Bus b = new CXFBusFactory().createBus(null, properties); + setBus(b); + MetricRegistry registry = new MetricRegistry(); + CodahaleMetricsProvider.setupJMXReporter(b, registry); + b.setExtension(registry, MetricRegistry.class); + + factoryBean = new JaxWsServerFactoryBean(); + factoryBean.setBus(b); factoryBean.setAddress(DOCLIT_CODEFIRST_URL); factoryBean.setServiceClass(DocLitWrappedCodeFirstServiceImpl.class); + factoryBean.setFeatures(Arrays.asList(new MetricsFeature())); factoryBean.setInvoker(invoker); servers.add(factoryBean.create());