svn commit: r1542469 - in /karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command: ListBundleServices.java ListBundles.java

[jb...@apache.org]

Author: jbonofre
Date: Sat Nov 16 07:19:16 2013
New Revision: 1542469

URL: http://svn.apache.org/r1542469
Log:
Use the shell table in bundle:list command by default

Modified:
    karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundleServices.java
    karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundles.java

Modified: karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundleServices.java
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundleServices.java?rev=1542469&r1=1542468&r2=1542469&view=diff
==============================================================================
--- karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundleServices.java (original)
+++ karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundleServices.java Sat Nov 16 07:19:16 2013
@@ -28,6 +28,7 @@ import org.osgi.framework.ServiceReferen
 
 @Command(scope = "bundle", name = "services", description = "Lists OSGi services per Bundle")
 public class ListBundleServices extends BundlesCommand {
+
     @Option(name = "-a", aliases = {}, description = "Shows all services. (By default Karaf commands are hidden)", required = false, multiValued = false)
     boolean showAll;
 

Modified: karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundles.java
URL: http://svn.apache.org/viewvc/karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundles.java?rev=1542469&r1=1542468&r2=1542469&view=diff
==============================================================================
--- karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundles.java (original)
+++ karaf/trunk/bundle/command/src/main/java/org/apache/karaf/bundle/command/ListBundles.java Sat Nov 16 07:19:16 2013
@@ -40,9 +40,6 @@ public class ListBundles extends OsgiCom
 
     @Option(name = "-t", valueToShowInHelp = "", description = "Specifies the bundle threshold; bundles with a start-level less than this value will not get printed out.", required = false, multiValued = false)
     int bundleLevelThreshold = -1;
-    
-    @Option(name= "--table", description = "Show bundles using a shell table")
-    boolean newLayout;
 
     private BundleService bundleService;
 
@@ -65,27 +62,6 @@ public class ListBundles extends OsgiCom
             System.out.println("START LEVEL " + fsl.getStartLevel() + " , List Threshold: " + bundleLevelThreshold);
         }
 
-        if (!newLayout) {
-        // Print column headers.
-        System.out.println("   ID   State         Level " + getNameHeader());
-
-        for (int i = 0; i < bundles.length; i++) {
-            Bundle bundle = bundles[i];
-            BundleInfo info = this.bundleService.getInfo(bundle);
-            if (info.getStartLevel() >= bundleLevelThreshold) {
-                String name = getNameToShow(info);
-                // Show bundle version if not showing location.
-                String version = info.getVersion();
-                name = (!showLoc && !showUpdate && (version != null)) ? name + " (" + version + ")" : name;
-                name += printFragments(info) + printHosts(info);
-                String line = String.format("[%4d] [%10s] [%5d] %s", info.getBundleId(),
-                                            getStateString(info.getState()), info.getStartLevel(), name);
-                System.out.println(line);
-            }
-        }
-        
-        } else {
-        
         ShellTable table = new ShellTable();
         table.column("ID").alignRight();
         table.column("State");
@@ -104,7 +80,7 @@ public class ListBundles extends OsgiCom
             }
         }
         table.print(System.out);
-        }
+
         return null;
     }