Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D03B7DE3A for ; Wed, 4 Jul 2012 07:44:00 +0000 (UTC) Received: (qmail 28201 invoked by uid 500); 4 Jul 2012 07:44:00 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 28065 invoked by uid 500); 4 Jul 2012 07:43:59 -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 28031 invoked by uid 99); 4 Jul 2012 07:43:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2012 07:43:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 04 Jul 2012 07:43:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0003023889D5; Wed, 4 Jul 2012 07:43:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1357130 - in /cxf/branches/2.5.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/ rt/core/src/main/java/org/apache/cxf/endpoint/ rt/core/src/main/java/org/apache/cxf/workqueue/ rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/ Date: Wed, 04 Jul 2012 07:43:33 -0000 To: commits@cxf.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120704074334.0003023889D5@eris.apache.org> Author: ningjiang Date: Wed Jul 4 07:43:31 2012 New Revision: 1357130 URL: http://svn.apache.org/viewvc?rev=1357130&view=rev Log: Merged revisions 1357095 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ................ r1357095 | ningjiang | 2012-07-04 14:17:24 +0800 (Wed, 04 Jul 2012) | 9 lines Merged revisions 1357094 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1357094 | ningjiang | 2012-07-04 14:08:34 +0800 (Wed, 04 Jul 2012) | 1 line CXF-4399 clean up the code ........ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/ManagedBus.java cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1357094 Merged /cxf/branches/2.6.x-fixes:r1357095 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/ManagedBus.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/ManagedBus.java?rev=1357130&r1=1357129&r2=1357130&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/ManagedBus.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/ManagedBus.java Wed Jul 4 07:43:31 2012 @@ -46,11 +46,11 @@ public class ManagedBus implements Manag public ObjectName getObjectName() throws JMException { String busId = bus.getId(); - StringBuilder buffer = new StringBuilder(ManagementConstants.DEFAULT_DOMAIN_NAME + ":"); - buffer.append(ManagementConstants.BUS_ID_PROP + "=" + busId + ","); - buffer.append(ManagementConstants.TYPE_PROP + "=" + TYPE_VALUE + ","); + StringBuilder buffer = new StringBuilder(ManagementConstants.DEFAULT_DOMAIN_NAME).append(':'); + buffer.append(ManagementConstants.BUS_ID_PROP).append('=').append(busId).append(','); + buffer.append(ManagementConstants.TYPE_PROP).append('=').append(TYPE_VALUE).append(','); // Added the instance id to make the ObjectName unique - buffer.append(ManagementConstants.INSTANCE_ID_PROP + "=" + bus.hashCode()); + buffer.append(ManagementConstants.INSTANCE_ID_PROP).append('=').append(bus.hashCode()); return new ObjectName(buffer.toString()); Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java?rev=1357130&r1=1357129&r2=1357130&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java Wed Jul 4 07:43:31 2012 @@ -89,9 +89,9 @@ public class ManagedEndpoint implements public ObjectName getObjectName() throws JMException { String busId = bus.getId(); StringBuilder buffer = new StringBuilder(); - buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":"); - buffer.append(ManagementConstants.BUS_ID_PROP + "=" + busId + ","); - buffer.append(ManagementConstants.TYPE_PROP + "=" + "Bus.Service.Endpoint,"); + buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME).append(':'); + buffer.append(ManagementConstants.BUS_ID_PROP).append('=').append(busId).append(','); + buffer.append(ManagementConstants.TYPE_PROP).append('=').append("Bus.Service.Endpoint,"); String serviceName = (String)endpoint.get(SERVICE_NAME); @@ -99,7 +99,7 @@ public class ManagedEndpoint implements serviceName = endpoint.getService().getName().toString(); } serviceName = ObjectName.quote(serviceName); - buffer.append(ManagementConstants.SERVICE_NAME_PROP + "=" + serviceName + ","); + buffer.append(ManagementConstants.SERVICE_NAME_PROP).append('=').append(serviceName).append(','); String endpointName = (String)endpoint.get(ENDPOINT_NAME); @@ -107,9 +107,9 @@ public class ManagedEndpoint implements endpointName = endpoint.getEndpointInfo().getName().getLocalPart(); } endpointName = ObjectName.quote(endpointName); - buffer.append(ManagementConstants.PORT_NAME_PROP + "=" + endpointName + ","); + buffer.append(ManagementConstants.PORT_NAME_PROP).append('=').append(endpointName).append(','); // Added the instance id to make the ObjectName unique - buffer.append(ManagementConstants.INSTANCE_ID_PROP + "=" + endpoint.hashCode()); + buffer.append(ManagementConstants.INSTANCE_ID_PROP).append('=').append(endpoint.hashCode()); //Use default domain name of server return new ObjectName(buffer.toString()); Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java?rev=1357130&r1=1357129&r2=1357130&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueImplMBeanWrapper.java Wed Jul 4 07:43:31 2012 @@ -119,7 +119,7 @@ public class WorkQueueImplMBeanWrapper i buffer.append(ManagementConstants.TYPE_PROP).append('=').append(TYPE_VALUE).append(','); buffer.append(ManagementConstants.NAME_PROP).append('=').append(aWorkQueue.getName()).append(','); // Added the instance id to make the ObjectName unique - buffer.append(ManagementConstants.INSTANCE_ID_PROP + "=" + aWorkQueue.hashCode()); + buffer.append(ManagementConstants.INSTANCE_ID_PROP).append('=').append(aWorkQueue.hashCode()); //Use default domain name of server return new ObjectName(buffer.toString()); } Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java?rev=1357130&r1=1357129&r2=1357130&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManagerImplMBeanWrapper.java Wed Jul 4 07:43:31 2012 @@ -57,7 +57,7 @@ public class WorkQueueManagerImplMBeanWr buffer.append("WorkQueueManager=").append(NAME_VALUE); buffer.append(',').append(ManagementConstants.TYPE_PROP).append('=').append(TYPE_VALUE).append(','); // Added the instance id to make the ObjectName unique - buffer.append(ManagementConstants.INSTANCE_ID_PROP + "=" + wqManager.hashCode()); + buffer.append(ManagementConstants.INSTANCE_ID_PROP).append('=').append(wqManager.hashCode()); //Use default domain name of server return new ObjectName(buffer.toString()); } Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java?rev=1357130&r1=1357129&r2=1357130&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java Wed Jul 4 07:43:31 2012 @@ -152,7 +152,7 @@ public final class RMUtils { StringBuilder buffer = new StringBuilder(); writeTypeProperty(buffer, manager.getBus(), "WSRM.Manager"); // Added the instance id to make the ObjectName unique - buffer.append("," + ManagementConstants.INSTANCE_ID_PROP + "=" + manager.hashCode()); + buffer.append(',').append(ManagementConstants.INSTANCE_ID_PROP).append('=').append(manager.hashCode()); return new ObjectName(buffer.toString()); } @@ -173,18 +173,18 @@ public final class RMUtils { private static void writeTypeProperty(StringBuilder buffer, Bus bus, String type) { String busId = bus.getId(); - buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":"); - buffer.append(ManagementConstants.BUS_ID_PROP + "=" + busId + ","); - buffer.append(ManagementConstants.TYPE_PROP + "=" + type); + buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME).append(':'); + buffer.append(ManagementConstants.BUS_ID_PROP).append('=').append(busId).append(','); + buffer.append(ManagementConstants.TYPE_PROP).append('=').append(type); } private static void writeEndpointProperty(StringBuilder buffer, Endpoint ep) { String serviceName = ObjectName.quote(ep.getService().getName().toString()); buffer.append(","); - buffer.append(ManagementConstants.SERVICE_NAME_PROP + "=" + serviceName + ","); + buffer.append(ManagementConstants.SERVICE_NAME_PROP).append('=').append(serviceName).append(','); String endpointName = ObjectName.quote(ep.getEndpointInfo().getName().toString()); - buffer.append(ManagementConstants.PORT_NAME_PROP + "=" + endpointName + ","); + buffer.append(ManagementConstants.PORT_NAME_PROP).append('=').append(endpointName).append(','); // Added the instance id to make the ObjectName unique - buffer.append(ManagementConstants.INSTANCE_ID_PROP + "=" + ep.hashCode()); + buffer.append(ManagementConstants.INSTANCE_ID_PROP).append('=').append(ep.hashCode()); } }