Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 43541 invoked from network); 11 Dec 2009 12:41:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Dec 2009 12:41:09 -0000 Received: (qmail 95149 invoked by uid 500); 11 Dec 2009 12:41:08 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 95054 invoked by uid 500); 11 Dec 2009 12:41:08 -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 95045 invoked by uid 99); 11 Dec 2009 12:41:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2009 12:41:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2009 12:40:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AA629238899B; Fri, 11 Dec 2009 12:40:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r889595 - in /cxf/trunk/rt: frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/ frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ management/src/main/java/org/apache/cxf/management/interceptor/ management/src/test/java/... Date: Fri, 11 Dec 2009 12:40:37 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091211124037.AA629238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Dec 11 12:40:36 2009 New Revision: 889595 URL: http://svn.apache.org/viewvc?rev=889595&view=rev Log: CXF-2541: minor update to the management interceptor for JAXRS operations be monitored too Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java?rev=889595&r1=889594&r2=889595&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java Fri Dec 11 12:40:36 2009 @@ -209,5 +209,7 @@ MultivaluedMap values) { message.getExchange().put(OperationResourceInfo.class, ori); message.put(URITemplate.TEMPLATE_PARAMETERS, values); + message.getExchange().put("org.apache.cxf.management.operation.name", + ori.getMethodToInvoke().getName()); } } Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java?rev=889595&r1=889594&r2=889595&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java Fri Dec 11 12:40:36 2009 @@ -119,6 +119,8 @@ private Map cProperties; private Map uProperties; + private boolean skipJaxbChecks; + public void setContextProperties(Map contextProperties) { cProperties = contextProperties; } @@ -390,7 +392,8 @@ } protected boolean isSupported(Class type, Type genericType, Annotation[] anns) { - if (jaxbElementClassMap != null && jaxbElementClassMap.containsKey(type.getName())) { + if (jaxbElementClassMap != null && jaxbElementClassMap.containsKey(type.getName()) + || isSkipJaxbChecks()) { return true; } return type.getAnnotation(XmlRootElement.class) != null @@ -646,6 +649,14 @@ this.attributesToElements = value; } + public void setSkipJaxbChecks(boolean skipJaxbChecks) { + this.skipJaxbChecks = skipJaxbChecks; + } + + public boolean isSkipJaxbChecks() { + return skipJaxbChecks; + } + @XmlRootElement protected static class CollectionWrapper { Modified: cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java?rev=889595&r1=889594&r2=889595&view=diff ============================================================================== --- cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java (original) +++ cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Fri Dec 11 12:40:36 2009 @@ -101,15 +101,23 @@ if (null == cr) { LOG.log(Level.WARNING, "NO_COUNTER_REPOSITORY"); return; - } else { + } else { Service service = ex.get(Service.class); - OperationInfo opInfo = ex.get(OperationInfo.class); Endpoint endpoint = ex.get(Endpoint.class); String serviceName = "\"" + service.getName() + "\""; String portName = "\"" + endpoint.getEndpointInfo().getName().getLocalPart() + "\""; + + OperationInfo opInfo = ex.get(OperationInfo.class); String operationName = opInfo == null ? null : "\"" + opInfo.getName().getLocalPart() + "\""; + if (operationName == null) { + Object nameProperty = ex.get("org.apache.cxf.management.operation.name"); + if (nameProperty != null) { + operationName = "\"" + nameProperty.toString() + "\""; + } + } + StringBuilder buffer = new StringBuilder(); buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":"); buffer.append(ManagementConstants.BUS_ID_PROP + "=" + bus.getId() + ","); Modified: cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java?rev=889595&r1=889594&r2=889595&view=diff ============================================================================== --- cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java (original) +++ cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java Fri Dec 11 12:40:36 2009 @@ -33,6 +33,7 @@ import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.service.model.OperationInfo; import org.easymock.classextension.EasyMock; + import org.junit.Assert; import org.junit.Before; @@ -118,15 +119,14 @@ EasyMock.expect(exchange.get(Endpoint.class)).andReturn(endpoint); EasyMock.replay(endpointInfo); EasyMock.replay(endpoint); - + setupOperationForMessage(); + } + + protected void setupOperationForMessage() { OperationInfo op = EasyMock.createMock(OperationInfo.class); EasyMock.expect(op.getName()).andReturn(OPERATION_NAME); EasyMock.expect(exchange.get(OperationInfo.class)).andReturn(op); EasyMock.replay(op); - - } - - }