svn commit: r1227111 - /openejb/trunk/openejb/osgi/openejb-karaf-commands/src/main/java/org/apache/openejb/karaf/command/ListEJBs.java

[rm...@apache.org]

Author: rmannibucau
Date: Wed Jan  4 10:47:12 2012
New Revision: 1227111

URL: http://svn.apache.org/viewvc?rev=1227111&view=rev
Log:
adding bean type in openejb list command

Modified:
    openejb/trunk/openejb/osgi/openejb-karaf-commands/src/main/java/org/apache/openejb/karaf/command/ListEJBs.java

Modified: openejb/trunk/openejb/osgi/openejb-karaf-commands/src/main/java/org/apache/openejb/karaf/command/ListEJBs.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-karaf-commands/src/main/java/org/apache/openejb/karaf/command/ListEJBs.java?rev=1227111&r1=1227110&r2=1227111&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-karaf-commands/src/main/java/org/apache/openejb/karaf/command/ListEJBs.java (original)
+++ openejb/trunk/openejb/osgi/openejb-karaf-commands/src/main/java/org/apache/openejb/karaf/command/ListEJBs.java Wed Jan  4 10:47:12 2012
@@ -3,6 +3,7 @@ package org.apache.openejb.karaf.command
 import org.apache.felix.gogo.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.openejb.BeanContext;
+import org.apache.openejb.BeanType;
 import org.apache.openejb.karaf.console.table.Line;
 import org.apache.openejb.karaf.console.table.Lines;
 import org.apache.openejb.loader.SystemInstance;
@@ -16,13 +17,13 @@ public class ListEJBs extends OsgiComman
     protected Object doExecute() throws Exception {
         final ContainerSystem cs = SystemInstance.get().getComponent(ContainerSystem.class);
         Lines lines = new Lines();
-        lines.add(new Line("Name", "Class", "Type"));
+        lines.add(new Line("Name", "Class", "Interface Type", "Bean Type"));
         for (BeanContext bc : cs.deployments()) {
             if (BeanContext.Comp.class.equals(bc.getBeanClass())) {
                 continue;
             }
 
-            lines.add(new Line(bc.getEjbName(), bc.getBeanClass().getName(), getType(bc)));
+            lines.add(new Line(bc.getEjbName(), bc.getBeanClass().getName(), getType(bc), componentType(bc.getComponentType())));
         }
 
         lines.print(System.out);
@@ -30,6 +31,13 @@ public class ListEJBs extends OsgiComman
         return null;
     }
 
+    private static String componentType(final BeanType componentType) {
+        if (componentType == null) {
+            return "unknown";
+        }
+        return componentType.name();
+    }
+
     private static String getType(final BeanContext bc) {
         boolean empty = true;
         final StringBuilder sb = new StringBuilder();