Author: dkulp Date: Tue Sep 16 09:00:52 2008 New Revision: 695950 URL: http://svn.apache.org/viewvc?rev=695950&view=rev Log: Merged revisions 695509 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r695509 | dkulp | 2008-09-15 11:31:53 -0400 (Mon, 15 Sep 2008) | 9 lines Merged revisions 695484 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r695484 | dkulp | 2008-09-15 10:44:33 -0400 (Mon, 15 Sep 2008) | 2 lines [CXF-1792] Make the information in the mgmt console a bit easier to read. (Patch from Hadrian Zbarcea applied) ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 16 09:00:52 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java?rev=695950&r1=695949&r2=695950&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java Tue Sep 16 09:00:52 2008 @@ -88,7 +88,7 @@ String serviceName = ObjectName.quote(endpoint.getEndpointInfo().getService().getName().toString()); buffer.append(ManagementConstants.SERVICE_NAME_PROP + "=" + serviceName + ","); - String endpointName = ObjectName.quote(endpoint.getEndpointInfo().getName().toString()); + String endpointName = ObjectName.quote(endpoint.getEndpointInfo().getName().getLocalPart()); buffer.append(ManagementConstants.PORT_NAME_PROP + "=" + endpointName); //Use default domain name of server @@ -110,8 +110,5 @@ mgr.unRegisterListener(this); } } - } - - - + } } Modified: cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java?rev=695950&r1=695949&r2=695950&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java (original) +++ cxf/branches/2.0.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Tue Sep 16 09:00:52 2008 @@ -104,9 +104,9 @@ OperationInfo opInfo = ex.get(OperationInfo.class); Endpoint endpoint = ex.get(Endpoint.class); - String portName = "\"" + endpoint.getEndpointInfo().getName() + "\""; String serviceName = "\"" + service.getName() + "\""; - String operationName = "\"" + opInfo.getName().toString() + "\""; + String portName = "\"" + endpoint.getEndpointInfo().getName().getLocalPart() + "\""; + String operationName = "\"" + opInfo.getName().getLocalPart() + "\""; StringBuffer buffer = new StringBuffer(); buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":"); Modified: cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java?rev=695950&r1=695949&r2=695950&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java (original) +++ cxf/branches/2.0.x-fixes/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java Tue Sep 16 09:00:52 2008 @@ -46,11 +46,11 @@ protected static final String CLIENT_SERVICE_ONAME = "org.apache.cxf:type=Performance.Counter.Client,bus.id=cxf,service=\"" + SERVICE_NAME.toString() + "\",port=\"" - + PORT_NAME + "\""; + + PORT_NAME.getLocalPart() + "\""; protected static final String SERVER_SERVICE_ONAME = "org.apache.cxf:type=Performance.Counter.Server,bus.id=cxf,service=\"" + SERVICE_NAME.toString() + "\",port=\"" - + PORT_NAME + "\""; + + PORT_NAME.getLocalPart() + "\""; protected ObjectName clientServiceCounterOName; protected ObjectName serverServiceCounterOName; protected ObjectName clientOperationCounterOName; @@ -70,13 +70,9 @@ clientServiceCounterOName = new ObjectName(CLIENT_SERVICE_ONAME); serverServiceCounterOName = new ObjectName(SERVER_SERVICE_ONAME); clientOperationCounterOName = new ObjectName(CLIENT_SERVICE_ONAME - + ",operation=\"" - + OPERATION_NAME.toString() + "\""); + + ",operation=\"" + OPERATION_NAME.getLocalPart() + "\""); serverOperationCounterOName = new ObjectName(SERVER_SERVICE_ONAME - + ",operation=\"" - + OPERATION_NAME.toString() + "\""); - - + + ",operation=\"" + OPERATION_NAME.getLocalPart() + "\""); } protected void setupCounterRepository(boolean increase, boolean isClient) { @@ -95,7 +91,7 @@ if (increase) { EasyMock.expect(bus.getId()).andReturn(Bus.DEFAULT_BUS_ID); cRepository.increaseCounter(EasyMock.eq(serviceCounterOName), - EasyMock.isA(MessageHandlingTimeRecorder.class)); + EasyMock.isA(MessageHandlingTimeRecorder.class)); EasyMock.expectLastCall(); cRepository.increaseCounter(EasyMock.eq(operationCounterOName), EasyMock.isA(MessageHandlingTimeRecorder.class)); Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java?rev=695950&r1=695949&r2=695950&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java (original) +++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/management/CountersClientServerTest.java Tue Sep 16 09:00:52 2008 @@ -97,8 +97,7 @@ MBeanServer mbs = im.getMBeanServer(); ObjectName name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME - + ":" + ManagementConstants.BUS_ID_PROP - + "=cxf" + bus.hashCode() + ",*"); + + ":" + ManagementConstants.BUS_ID_PROP + "=cxf" + bus.hashCode() + ",*"); SOAPService service = new SOAPService(); assertNotNull(service); @@ -116,8 +115,8 @@ assertEquals("The Counters are not export to JMX: " + counterNames, 4 + 3 , counterNames.size()); - ObjectName sayHiCounter = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME - + ":operation=\"{http://apache.org/hello_world_soap_http}sayHi\",*";); + ObjectName sayHiCounter = new ObjectName( + ManagementConstants.DEFAULT_DOMAIN_NAME + ":operation=\"sayHi\",*"); Set s = mbs.queryNames(sayHiCounter, null); Iterator it = s.iterator(); @@ -146,8 +145,8 @@ counterNames = mbs.queryNames(name, null); assertEquals("The Counters are not export to JMX ", 6 + 3, counterNames.size()); - ObjectName greetMeOneWayCounter = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME - + ":operation=\"{http://apache.org/hello_world_soap_http}greetMeOneWay\",*";); + ObjectName greetMeOneWayCounter = new ObjectName( + ManagementConstants.DEFAULT_DOMAIN_NAME + ":operation=\"greetMeOneWay\",*"); s = mbs.queryNames(greetMeOneWayCounter, null); it = s.iterator(); @@ -157,8 +156,5 @@ Object val = mbs.getAttribute(counterName, "NumInvocations"); assertEquals("Wrong Counters Number of Invocations", val, 1); } - - } - }
