svn commit: r1329054 - in /cxf/branches/2.5.x-fixes: ./ osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java

[ffang]

Author: ffang
Date: Mon Apr 23 04:16:22 2012
New Revision: 1329054

URL: http://svn.apache.org/viewvc?rev=1329054&view=rev
Log:
Merged revisions 1329053 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1329053 | ffang | 2012-04-23 12:11:06 +0800 (一, 23  4 2012) | 1 line
  
  [CXF-4252]cxf:list-endpoints karaf command should also have a busid column
........

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/
------------------------------------------------------------------------------
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=1329054&r1=1329053&r2=1329054&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
 Mon Apr 23 04:16:22 2012
@@ -35,8 +35,8 @@ import org.apache.karaf.shell.console.Os
 @Command(scope = "cxf", name = "list-endpoints", 
     description = "Lists all CXF Endpoints on a Bus.")
 public class ListEndpointsCommand extends OsgiCommandSupport {
-    protected static final String HEADER_FORMAT = "%-25s %-10s %-60s";
-    protected static final String OUTPUT_FORMAT = "[%-23s] [%-8s] [%-58s]";
+    protected static final String HEADER_FORMAT = "%-25s %-10s %-60s %-40s";
+    protected static final String OUTPUT_FORMAT = "[%-23s] [%-8s] [%-58s] 
[%-38s]";
     
     @Argument(index = 0, name = "bus", 
         description = "The CXF bus name where to look for the Endpoints", 
@@ -65,12 +65,13 @@ public class ListEndpointsCommand extend
             ServerRegistry reg = b.getExtension(ServerRegistry.class);
             List<Server> servers = reg.getServers();
             System.out.println(String.format(HEADER_FORMAT, 
-                                             "Name", "State", "Address"));
+                                             "Name", "State", "Address", 
"BusID"));
             for (Server serv : servers) {
                 String qname = 
serv.getEndpoint().getEndpointInfo().getName().getLocalPart();
                 String started = serv.isStarted() ? "Started" : "Stopped";
                 String address = 
serv.getEndpoint().getEndpointInfo().getAddress();
-                System.out.println(String.format(OUTPUT_FORMAT, qname, 
started, address));
+                String busId = b.getId();
+                System.out.println(String.format(OUTPUT_FORMAT, qname, 
started, address, busId));
             }
         }
         return null;