User: starksm 
  Date: 01/05/23 22:05:09

  Modified:    src/main/org/jboss/naming Tag: Branch_2_2 JNDIView.java
  Added:       src/main/org/jboss/naming Tag: Branch_2_2 Util.java
  Log:
  Add LinkRef viewing to JNDIView and bring Util from main
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +27 -9     jboss/src/main/org/jboss/naming/JNDIView.java
  
  Index: JNDIView.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/naming/JNDIView.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- JNDIView.java     2001/03/01 06:39:57     1.2
  +++ JNDIView.java     2001/05/24 05:05:08     1.2.2.1
  @@ -33,7 +33,7 @@
   
   @author [EMAIL PROTECTED]
   @author Vladimir Blagojevic <[EMAIL PROTECTED]>
  -@version $Revision: 1.2 $
  +@version $Revision: 1.2.2.1 $
   */
   public class JNDIView extends ServiceMBeanSupport implements JNDIViewMBean
   {
  @@ -188,26 +188,45 @@
                {
                   NameClassPair pair = (NameClassPair) ne.next();
                   boolean recursive = false;
  +                boolean isLinkRef = false;
                   try
                   {
                       Class c = loader.loadClass(pair.getClassName());
  -                    if (Context.class.isAssignableFrom (c))
  +                    if( Context.class.isAssignableFrom(c) )
                           recursive = true;
  +                    if( LinkRef.class.isAssignableFrom(c) )
  +                        isLinkRef = true;
                   }
                   catch(ClassNotFoundException cnfe)
                   {
                   }
   
  -                buffer.append(indent +  " +- " + pair.getName());
  +                String name = pair.getName();
  +                buffer.append(indent +  " +- " + name);
  +                if( isLinkRef )
  +                {
  +                    // Get the 
  +                    try
  +                    {
  +                        LinkRef link = (LinkRef) ctx.lookupLink(name);
  +                        buffer.append("[link -> ");
  +                        buffer.append(link.getLinkName());
  +                        buffer.append(']');
  +                    }
  +                    catch(Throwable e)
  +                    {
  +                        e.printStackTrace();
  +                        buffer.append("[invalid]");
  +                    }
  +                }
                   if( verbose )
                       buffer.append(" (class: "+pair.getClassName()+")");
                   buffer.append('\n');
                   if( recursive )
                   {
  -                    String ctxName = pair.getName();
  -                    try
  +                   try
                       {
  -                        Object value = ctx.lookup(ctxName);
  +                        Object value = ctx.lookup(name);
                           if( value instanceof Context )
                           {
                               Context subctx = (Context) value;
  @@ -221,12 +240,12 @@
                       }
                       catch(Throwable t)
                       {
  -                        buffer.append("Failed to lookup: "+ctxName+", 
errmsg="+t.getMessage());
  +                        buffer.append("Failed to lookup: "+name+", 
errmsg="+t.getMessage());
                           buffer.append('\n');
                       }
                  }
               }
  -            ne.close ();
  +            ne.close();
           }
           catch(NamingException ne)
           {
  @@ -245,4 +264,3 @@
           buffer.append("</pre>\n");
       }
   }
  -
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +1 -1      jboss/src/main/org/jboss/naming/Util.java
  
  Index: Util.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/naming/Util.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- Util.java 2001/05/10 03:21:30     1.2
  +++ Util.java 2001/05/24 05:05:08     1.2.2.1
  @@ -10,7 +10,7 @@
   /** A static utility class for common JNDI operations.
    *
    * @author [EMAIL PROTECTED]
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.2.2.1 $
    */
   public class Util
   {
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to