Author: ffang Date: Wed Nov 7 06:31:13 2012 New Revision: 1406475 URL: http://svn.apache.org/viewvc?rev=1406475&view=rev Log: Merged revisions 1406471 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1406471 | ffang | 2012-11-07 14:09:20 +0800 (三, 07 11 2012) | 9 lines Merged revisions 1406468 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1406468 | ffang | 2012-11-07 13:50:47 +0800 (三, 07 11 2012) | 1 line [CXF-4619]cxf:list-endpoints - Duplicate headers if multiple endpoints installed ........ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1406468 Merged /cxf/branches/2.6.x-fixes:r1406471 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java?rev=1406475&r1=1406474&r2=1406475&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java (original) +++ cxf/branches/2.5.x-fixes/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java Wed Nov 7 06:31:13 2012 @@ -61,11 +61,12 @@ public class ListEndpointsCommand extend busses = Collections.emptyList(); } } + System.out.println(String.format(HEADER_FORMAT, + "Name", "State", "Address", "BusID")); for (Bus b : busses) { ServerRegistry reg = b.getExtension(ServerRegistry.class); List<Server> servers = reg.getServers(); - System.out.println(String.format(HEADER_FORMAT, - "Name", "State", "Address", "BusID")); + for (Server serv : servers) { String qname = serv.getEndpoint().getEndpointInfo().getName().getLocalPart(); String started = serv.isStarted() ? "Started" : "Stopped";
