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()); } }
