avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-apps/enterprise/ins/src/java/org/apache/ins NamingContextExImpl.java
Date Tue, 14 May 2002 11:07:44 GMT
mcconnell    02/05/14 04:07:43

  Modified:    enterprise/ins/src/java/org/apache/ins
                        NamingContextExImpl.java
  Log:
  checkstyle compliance (80 warning down to 0)
  :-)
  
  Revision  Changes    Path
  1.3       +275 -325  jakarta-avalon-apps/enterprise/ins/src/java/org/apache/ins/NamingContextExImpl.java
  
  Index: NamingContextExImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/enterprise/ins/src/java/org/apache/ins/NamingContextExImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NamingContextExImpl.java	14 May 2002 09:00:01 -0000	1.2
  +++ NamingContextExImpl.java	14 May 2002 11:07:43 -0000	1.3
  @@ -7,25 +7,45 @@
    *
    * Original contribution Copyright 2000 (C) Intalio Inc. All Rights Reserved.
   *
  -* $Id: NamingContextExImpl.java,v 1.2 2002/05/14 09:00:01 mcconnell Exp $
  +* $Id: NamingContextExImpl.java,v 1.3 2002/05/14 11:07:43 mcconnell Exp $
   *
   * Date         Author  Changes
   */
   
   package org.apache.ins;
   
  -import namingPersistence.*;
  +import namingPersistence.NamingContextRef;
  +import namingPersistence.NamingContextHome;
  +import namingPersistence.NamingObjectHome;
  +import namingPersistence.NamingObjectRef;
  +import namingPersistence.ProxyNamingContextHome;
  +import namingPersistence.ProxyNamingContextRef;
  +
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.logger.Logger;
   
  +import org.omg.CosNaming.NamingContextPackage.AlreadyBound;
  +import org.omg.CosNaming.NamingContextPackage.NotFound;
  +import org.omg.CosNaming.NamingContextPackage.NotFoundReason;
  +import org.omg.CosNaming.NamingContextPackage.CannotProceed;
  +import org.omg.CosNaming.NamingContextPackage.InvalidName;
  +import org.omg.CosNaming.NamingContextPackage.NotEmpty;
  +import org.omg.CosNaming.Binding;
  +import org.omg.CosNaming.BindingListHolder;
  +import org.omg.CosNaming.BindingIteratorHolder;
  +import org.omg.CosNaming.BindingType;
  +import org.omg.CosNaming.NameComponent;
  +import org.omg.CosNaming.NamingContextExtPOA;
  +import org.omg.CosNaming.NamingContextExtPackage.InvalidAddress;
  +
   /**
    * This class is the implementation of the NamingContextExt.
    *
    * @author <a href="mailto:mdaniel@intalio.com">Marina Daniel &lt;mdaniel@intalio.com&gt;</a>
    * @author <a href="mailto:mcconnell@osm.net">Stephen McConnell &lt;mcconnell@osm.net&gt;</a>
  - * @version $Revision: 1.2 $ $Date: 2002/05/14 09:00:01 $ 
  + * @version $Revision: 1.3 $ $Date: 2002/05/14 11:07:43 $ 
    */
  -public class NamingContextExImpl extends org.omg.CosNaming.NamingContextExtPOA
  +public class NamingContextExImpl extends NamingContextExtPOA
       implements LogEnabled
   {
   
  @@ -37,55 +57,72 @@
       /**
        * The reference to the callback manager
        */
  -    private org.apache.ins.CallbackManagerImpl m_callback;
  +    private CallbackManagerImpl m_callback;
   
       /**
  -     * the reference to the NamingContext factory to create and find persistent NamingContext
  +     * the reference to the NamingContext factory to create and find 
  +     * persistent NamingContext
        */
  -    private namingPersistence.NamingContextHome m_ncHome;
  +    private NamingContextHome m_ncHome;
   
       /**
  -     * the reference to the NamingObject factory to create and find persistent NamingObject
  +     * the reference to the NamingObject factory to create and find 
  +     * persistent NamingObject
        */
  -    private namingPersistence.NamingObjectHome m_noHome;
  +    private NamingObjectHome m_noHome;
   
       /**
        * The reference to the ProxyNamingContext factory to create and find 
        * persistent ProxyNamingContext
        */
  -    private namingPersistence.ProxyNamingContextHome m_pncHome;
  +    private ProxyNamingContextHome m_pncHome;
   
  -    private static boolean c_shutdown = false;  // changed from _shutdown to c_shutdown + private
  +    private static boolean c_shutdown = false;  
  +     // changed from _shutdown to c_shutdown + private
   
  -    private namingPersistence.NamingContext m_root; // changed from nc_root to m_root + private
  +    private namingPersistence.NamingContext m_root; 
  +     // changed from nc_root to m_root + private
   
       private Logger m_logger;
   
       /**
        * Constructor
  +     * @param orb the ORB
  +     * @param callback a callback
  +     * @param contextHome the context storage home
  +     * @param objectHome the object storage home
  +     * @param proxyHome the proxy storage home
        */
       protected NamingContextExImpl( org.omg.CORBA.ORB orb,
         org.apache.ins.CallbackManagerImpl callback,
  -      namingPersistence.NamingContextHome nc_home,
  -      namingPersistence.NamingObjectHome no_home,
  -      namingPersistence.ProxyNamingContextHome pnc_home )
  +      namingPersistence.NamingContextHome contextHome,
  +      namingPersistence.NamingObjectHome objectHome,
  +      namingPersistence.ProxyNamingContextHome proxyHome )
       {
           m_orb = orb;
           m_callback = callback;
  -        m_ncHome = nc_home;
  -        m_noHome = no_home;
  -        m_pncHome = pnc_home;
  +        m_ncHome = contextHome;
  +        m_noHome = objectHome;
  +        m_pncHome = proxyHome;
       }
   
       //=============================================================
       // LogEnabled
       //=============================================================
    
  +   /**
  +    * Applies a logging channel.
  +    * @param logger the logging channel
  +    */
       public void enableLogging( Logger logger )
       {
           m_logger = logger;
       }
   
  +   /**
  +    * Returns the logging channel.
  +    * @return Logger the logging channel
  +    */
       protected Logger getLogger() 
       {
           return m_logger;
  @@ -109,7 +146,8 @@
        *        given up for some reason. The client, however, may
        *        be able to continue the operation at the returned
        *        naming context.
  -     * @exception Indicates the name is invalid. (A name of length 0 is
  +     * @exception InvalidName Indicates the name is invalid. 
  +              (A name of length 0 is
        *        invalid; implementations may place other
        *        restrictions on names.)
        * @exception AlreadyBound Indicates an object is already bound to
  @@ -121,22 +159,20 @@
        *        name and rebind the name to the object passed as
        *        an argument.
        */
  -    public void bind( org.omg.CosNaming.NameComponent[] n, org.omg.CORBA.Object obj )
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound,       org.omg.CosNaming.NamingContextPackage.CannotProceed, 
  -      org.omg.CosNaming.NamingContextPackage.InvalidName, 
  -      org.omg.CosNaming.NamingContextPackage.AlreadyBound
  +    public void bind( NameComponent[] n, org.omg.CORBA.Object obj )
  +    throws NotFound, CannotProceed, InvalidName, AlreadyBound
       {
   
           if ( n.length == 0 )
           {
  -            throw new org.omg.CosNaming.NamingContextPackage.InvalidName();
  +            throw new InvalidName();
           }
   
           verbose( "\nBind an object ( " + n[ n.length - 1 ].id + " )" );
   
   
           // get the complete component name of the object
  -        org.omg.CosNaming.NameComponent[] componentName = getNameComponent( n );
  +        NameComponent[] componentName = getNameComponent( n );
   
           String componentName_str = org.openorb.util.NamingUtils.to_string ( 
             componentName );
  @@ -150,12 +186,11 @@
               namingPersistence.NamingObject no = m_noHome.find_by_componentName( 
                 componentName_str );
               verbose( " NamingObject already bound " + componentName_str );
  -            throw new org.omg.CosNaming.NamingContextPackage.AlreadyBound();
  +            throw new AlreadyBound();
   
           }
           catch ( org.omg.CosPersistentState.NotFound ex )
           {
  -
               // create the persistent naming object
               namingPersistence.NamingObject no = 
                 ( ( NamingObjectHome ) m_noHome ).create( componentName_str, obj );
  @@ -164,14 +199,12 @@
               addNamingObject ( componentName );
   
               // Report event...
  -
               m_callback.report_object_event( 
  -               getPath ( componentName ), org.apache.ins.callback.EventType.ADD, obj );
  +               getPath ( componentName ), 
  +                 org.apache.ins.callback.EventType.ADD, obj );
           }
  -
       }
   
  -
       /**
        * Creates a binding of a name and an object in the naming context
        * even if the name is already bound in the context. Naming contexts
  @@ -186,32 +219,21 @@
        *        given up for some reason. The client, however, may
        *        be able to continue the operation at the returned
        *        naming context.
  -     * @exception Indicates the name is invalid. (A name of length 0 is
  +     * @exception InvalidName Indicates the name is invalid. (A name of length 0 is
        *        invalid; implementations may place other
        *        restrictions on names.)
  -     * @exception AlreadyBound Indicates an object is already bound to
  -     *        the specified name. Only one object can be bound
  -     *        to a particular name in a context. The bind and
  -     *        the bind_context operations raise the AlreadyBound
  -     *        exception if the name is bound in the context; the
  -     *        rebind and rebind_context operations unbind the
  -     *        name and rebind the name to the object passed as
  -     *        an argument.
        */
  -    public void rebind( org.omg.CosNaming.NameComponent[] n, org.omg.CORBA.Object obj )
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound, 
  -      org.omg.CosNaming.NamingContextPackage.CannotProceed, 
  -      org.omg.CosNaming.NamingContextPackage.InvalidName
  +    public void rebind( NameComponent[] n, org.omg.CORBA.Object obj )
  +    throws NotFound, CannotProceed, InvalidName
       {
  -
           if ( n.length == 0 )
           {
  -            throw new org.omg.CosNaming.NamingContextPackage.InvalidName();
  +            throw new InvalidName();
           }
           verbose( "\nRebind an object ( " + n[ n.length - 1 ].id + " )" );
   
           // get the complete componentName of the object to bind
  -        org.omg.CosNaming.NameComponent[] componentName = getNameComponent( n );
  +        NameComponent[] componentName = getNameComponent( n );
   
           String componentName_str = org.openorb.util.NamingUtils.to_string ( 
             componentName );
  @@ -220,13 +242,11 @@
   
           try
           {
  -
               // search whether the persistent naming object already exists
               namingPersistence.NamingObject no = m_noHome.find_by_componentName( 
                 componentName_str );
               verbose( " NamingObject already exist " + componentName_str );
               no.namingObj ( obj );
  -
           }
           catch ( org.omg.CosPersistentState.NotFound ex )
           {
  @@ -258,7 +278,7 @@
        *        given up for some reason. The client, however, may
        *        be able to continue the operation at the returned
        *        naming context.
  -     * @exception Indicates the name is invalid. (A name of length 0 is
  +     * @exception InvalidName Indicates the name is invalid. (A name of length 0 is
        *        invalid; implementations may place other
        *        restrictions on names.)
        * @exception AlreadyBound Indicates an object is already bound to
  @@ -270,45 +290,38 @@
        *        name and rebind the name to the object passed as
        *        an argument.
        */
  -    public void bind_context( org.omg.CosNaming.NameComponent[] n, 
  -       org.omg.CosNaming.NamingContext nc )
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound, 
  -       org.omg.CosNaming.NamingContextPackage.CannotProceed, 
  -       org.omg.CosNaming.NamingContextPackage.InvalidName, 
  -       org.omg.CosNaming.NamingContextPackage.AlreadyBound
  +    public void bind_context( NameComponent[] n, org.omg.CosNaming.NamingContext nc )
  +    throws NotFound, CannotProceed, InvalidName, AlreadyBound
       {
   
           if ( n.length == 0 )
  -            throw new org.omg.CosNaming.NamingContextPackage.InvalidName();
  +        {
  +            throw new InvalidName();
  +        }
   
           verbose( "Bind a context ( " + n[ n.length - 1 ].id + " )" );
   
           boolean is_local = ( ( org.omg.CORBA.portable.ObjectImpl ) nc )._is_local();
  -
           verbose( "is local : " + is_local );
   
           // get the complete component name of the Naming context to bind
  -        org.omg.CosNaming.NameComponent[] componentName = getNameComponent( n );
  +        NameComponent[] componentName = getNameComponent( n );
   
           String componentName_str = org.openorb.util.NamingUtils.to_string ( componentName );
  -
           verbose( "componentName : " + componentName_str );
   
           if ( is_local )
           {
  -
               try
               {
                   // search whether the Naming context already exists
                   namingPersistence.NamingContext namingContext = 
                    m_ncHome.find_by_componentName( componentName_str );
                   verbose ( " NamingContext already exist " + componentName_str );
  -                throw new org.omg.CosNaming.NamingContextPackage.AlreadyBound();
  -
  +                throw new AlreadyBound();
               }
               catch ( org.omg.CosPersistentState.NotFound ex )
               {
  -
                   try
                   {
                       // set the nameComponent to the namingContext
  @@ -337,9 +350,10 @@
               {
                   // search whether the ProxyNamingContext already exists
                   namingPersistence.ProxyNamingContext no = 
  -                 m_pncHome.find_by_componentName( componentName_str );
  -                verbose( " ProxyNamingContext already exist : " + componentName_str );
  -                throw new org.omg.CosNaming.NamingContextPackage.AlreadyBound();
  +                  m_pncHome.find_by_componentName( componentName_str );
  +                verbose( " ProxyNamingContext already exist : " 
  +                  + componentName_str );
  +                throw new AlreadyBound();
               }
               catch ( org.omg.CosPersistentState.NotFound ex )
               {
  @@ -374,32 +388,25 @@
        * @exception InvalidName Indicates the name is invalid. (A name of
        *        length 0 is invalid; implementations may place
        *        other restrictions on names.)
  -     * @exception AlreadyBound Indicates an object is already bound to
  -     *        the specified name. Only one object can be bound
  -     *        to a particular name in a context. The bind and
  -     *        the bind_context operations raise the AlreadyBound
  -     *        exception if the name is bound in the context; the
  -     *        rebind and rebind_context operations unbind the
  -     *        name and rebind the name to the object passed as
  -     *        an argument.
        */
  -    public void rebind_context( org.omg.CosNaming.NameComponent[] n, 
  +    public void rebind_context( NameComponent[] n, 
           org.omg.CosNaming.NamingContext nc )
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound, 
  -      org.omg.CosNaming.NamingContextPackage.CannotProceed, 
  -      org.omg.CosNaming.NamingContextPackage.InvalidName
  +    throws NotFound, CannotProceed, InvalidName
       {
           if ( n.length == 0 )
  -            throw new org.omg.CosNaming.NamingContextPackage.InvalidName();
  -
  +        {
  +            throw new InvalidName();
  +        }
           verbose( "Rebind a context ( " + n[ n.length - 1 ].id + " )" );
   
           // get the complete componentName of the NamingContext to rebind
  -        org.omg.CosNaming.NameComponent[] componentName = getNameComponent( n );
  +        NameComponent[] componentName = getNameComponent( n );
   
  -        String componentName_str = org.openorb.util.NamingUtils.to_string ( componentName );
  +        String componentName_str = 
  +          org.openorb.util.NamingUtils.to_string ( componentName );
   
  -        boolean is_local = ( ( org.omg.CORBA.portable.ObjectImpl ) nc )._is_local();
  +        boolean is_local = 
  +          ( ( org.omg.CORBA.portable.ObjectImpl ) nc )._is_local();
   
           if ( is_local )
           {
  @@ -412,7 +419,6 @@
                   verbose ( " NamingContext already exist " + componentName_str );
                   // if a naming context already exist, it must be unbound.
                   unbind( n );
  -
               }
               catch ( org.omg.CosPersistentState.NotFound ex )
               {
  @@ -426,7 +432,7 @@
                   // case of a rebind of a Naming Context that is already bound somewhere else.
                   if ( !namingContext.componentName().equals( "" ) )
                   {
  -                    throw new org.omg.CosNaming.NamingContextPackage.CannotProceed( nc, n );
  +                    throw new CannotProceed( nc, n );
                   }
                   namingContext.componentName ( componentName_str );
                   addNamingContext ( componentName );
  @@ -458,7 +464,7 @@
        * can traverse multiple contexts.
        *
        * @param n The compound name for the object to resolve
  -     *
  +     * @return org.omg.CORBA.Object the object ref
        * @exception NotFound  Indicates the name does not identify a binding.
        * @exception CannotProceed Indicates that the implementation has
        *        given up for some reason. The client, however, may
  @@ -468,24 +474,22 @@
        *        length 0 is invalid; implementations may place
        *        other restrictions on names.)
        */
  -    public org.omg.CORBA.Object resolve( org.omg.CosNaming.NameComponent[] n )
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound, 
  -       org.omg.CosNaming.NamingContextPackage.CannotProceed, 
  -       org.omg.CosNaming.NamingContextPackage.InvalidName
  +    public org.omg.CORBA.Object resolve( NameComponent[] n )
  +    throws NotFound, 
  +       CannotProceed, 
  +       InvalidName
       {
  -
           if ( n.length == 0 )
           {
  -            throw new org.omg.CosNaming.NamingContextPackage.InvalidName();
  +            throw new InvalidName();
           }
           verbose( "Resolve an object ( " + n[ n.length - 1 ].id + " )" );
   
           // get the complete componentName of the persistent naming object to resolve
  -        org.omg.CosNaming.NameComponent[] componentName = getNameComponent( n );
  +        NameComponent[] componentName = getNameComponent( n );
   
           String componentName_str = org.openorb.util.NamingUtils.to_string ( 
             componentName );
  -
           verbose( "componentName : " + componentName_str );
   
           try
  @@ -514,8 +518,8 @@
                   catch ( org.omg.CosPersistentState.NotFound nf )
                   {
                       verbose( " Object not found " + componentName_str );
  -                    throw new org.omg.CosNaming.NamingContextPackage.NotFound( 
  -                      org.omg.CosNaming.NamingContextPackage.NotFoundReason.missing_node, n );
  +                    throw new NotFound( 
  +                      NotFoundReason.missing_node, n );
                   }
               }
           }
  @@ -536,21 +540,20 @@
        *        length 0 is invalid; implementations may place
        *        other restrictions on names.)
        */
  -    public void unbind( org.omg.CosNaming.NameComponent[] n )
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound, 
  -      org.omg.CosNaming.NamingContextPackage.CannotProceed, 
  -      org.omg.CosNaming.NamingContextPackage.InvalidName
  +    public void unbind( NameComponent[] n )
  +    throws NotFound, CannotProceed, InvalidName
       {
           if ( n.length == 0 )
           {
  -            throw new org.omg.CosNaming.NamingContextPackage.InvalidName();
  +            throw new InvalidName();
           }
           verbose( "Unbind ( " + n[ n.length - 1 ].id + " )" );
   
           // get the complete component Name of the naming object to unbind
  -        org.omg.CosNaming.NameComponent[] componentName = getNameComponent( n );
  +        NameComponent[] componentName = getNameComponent( n );
   
  -        String componentName_str = org.openorb.util.NamingUtils.to_string ( componentName );
  +        String componentName_str = 
  +          org.openorb.util.NamingUtils.to_string ( componentName );
   
           verbose( "componentName_str : " + componentName_str );
   
  @@ -568,7 +571,8 @@
   
               //report event
               m_callback.report_naming_context_event( 
  -              getPath ( componentName ) , org.apache.ins.callback.EventType.REMOVE );
  +              getPath ( componentName ) , 
  +              org.apache.ins.callback.EventType.REMOVE );
           }
           catch ( org.omg.CosPersistentState.NotFound ex )
           {
  @@ -591,10 +595,8 @@
               }
               catch ( org.omg.CosPersistentState.NotFound e )
               {
  -
                   try
                   {
  -
                       // find if the node to unbind is a naming object
                       namingPersistence.NamingObject no = 
                         m_noHome.find_by_componentName( componentName_str );
  @@ -606,18 +608,17 @@
   
                       //report event
                       m_callback.report_naming_context_event( 
  -                       getPath ( componentName ), org.apache.ins.callback.EventType.REMOVE );
  +                       getPath ( componentName ), 
  +                       org.apache.ins.callback.EventType.REMOVE );
                   }
                   catch ( org.omg.CosPersistentState.NotFound e2 )
                   {
                       verbose( " node not found : " + componentName_str );
  -                    throw new org.omg.CosNaming.NamingContextPackage.NotFound( 
  -                      org.omg.CosNaming.NamingContextPackage.NotFoundReason.not_context, n );
  +                    throw new NotFound( 
  +                      NotFoundReason.not_context, n );
                   }
               }
  -
           }
  -
       }
   
       /**
  @@ -625,8 +626,8 @@
        * naming server as the context on which the operation was
        * invoked. The new context is not bound to any name.
        *
  -     * @return A new naming context ( this new naming context must be
  -     * binded )
  +     * @return org.omg.CosNaming.NamingContext A new naming context.  
  +     *  Note: this new naming context must be bound. )
        */
       public org.omg.CosNaming.NamingContext new_context()
       {
  @@ -653,7 +654,7 @@
        * by the name argument excluding the last component).
        *
        * @param n The compound name for the naming context to create and to bind.
  -     *
  +     * @return org.omg.CosNaming.NamingContext the nameing context
        * @exception NotFound  Indicates the name does not identify a binding.
        * @exception CannotProceed Indicates that the implementation has
        *        given up for some reason. The client, however, may
  @@ -667,18 +668,15 @@
        *        to a particular name in a context.
        */
       public org.omg.CosNaming.NamingContext bind_new_context( 
  -      org.omg.CosNaming.NameComponent[] n )
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound, 
  -      org.omg.CosNaming.NamingContextPackage.AlreadyBound, 
  -      org.omg.CosNaming.NamingContextPackage.CannotProceed,
  -      org.omg.CosNaming.NamingContextPackage.InvalidName
  +      NameComponent[] n )
  +    throws NotFound, AlreadyBound, CannotProceed, InvalidName
       {
  -
           if ( n.length == 0 )
           {
  -            throw new org.omg.CosNaming.NamingContextPackage.InvalidName();
  +            throw new InvalidName();
           }
  -        verbose( "bind_new_context : " + org.openorb.util.NamingUtils.to_string( n ) );
  +        verbose( "bind_new_context : " 
  +         + org.openorb.util.NamingUtils.to_string( n ) );
   
           org.omg.CosNaming.NamingContext nc = new_context();
   
  @@ -691,21 +689,17 @@
        * The destroy operation deletes a naming context.
        *
        * @exception NotEmpty If the naming context contains bindings, the
  -     * NotEmpty exception is raised.
  +     *   NotEmpty exception is raised.
        */
       public void destroy()
  -    throws org.omg.CosNaming.NamingContextPackage.NotEmpty
  +    throws NotEmpty
       {
           verbose( "Destroy a NamingContext" );
  -
           namingPersistence.NamingContext nc = null;
  -
           try
           {
  -
               // Case of a destroy action on the root naming context
               nc = getNamingContext();
  -
               if ( nc.equals ( m_root ) )
               {
                   if ( c_shutdown )
  @@ -713,53 +707,41 @@
                       _orb().shutdown ( false );
                       return ;
                   }
  -
                   throw new org.omg.CORBA.NO_PERMISSION();
  -
               }
  -
               // if the Naming context is local
               NamingContextRef[] nc_children = nc.nc_children();
  -
               NamingObjectRef[] no_children = nc.no_children();
  -
               ProxyNamingContextRef[] pnc_children = nc.pnc_children();
  -
               if ( ( nc_children.length == 0 ) && ( no_children.length == 0 ) 
                 && ( pnc_children.length == 0 ) )
               {
  -
                   // if the Naming Context is not empty
                   String componentName_str = nc.componentName();
                   verbose( "componentName : " + componentName_str );
  -
  -                org.omg.CosNaming.NameComponent[] componentName = null;
  -
  +                NameComponent[] componentName = null;
                   try
                   {
  -                    componentName = org.openorb.util.NamingUtils.to_name( componentName_str );
  +                    componentName = 
  +                      org.openorb.util.NamingUtils.to_name( componentName_str );
                   }
  -                catch ( org.omg.CosNaming.NamingContextPackage.InvalidName in )
  +                catch ( InvalidName in )
                   {
                       System.out.println( "Invalid Name" );
                       return ;
                   }
  -
  -                // remove the reference of the Naming context from the list of children of the parent
  +                // remove the reference of the Naming context from the 
  +                // list of children of the parent
                   removeNamingContext ( componentName );
  -
                   // destroy the persistent object
                   nc.destroy_object();
  -
                   //Report event ...
  -                org.omg.CosNaming.NameComponent[] path = 
  -                  new org.omg.CosNaming.NameComponent[ componentName.length - 1 ];
  -
  +                NameComponent[] path = 
  +                  new NameComponent[ componentName.length - 1 ];
                   for ( int k = 1; k < componentName.length ; k++ )
                   {
                       path[ k - 1 ] = componentName[ k ];
                   }
  -
                   m_callback.report_naming_context_event( 
                      path, org.apache.ins.callback.EventType.REMOVE );
               }
  @@ -767,41 +749,35 @@
               {
                   throw new org.omg.CosNaming.NamingContextPackage.NotEmpty();
               }
  -
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.NotFound e )
  +        catch ( NotFound e )
           {
  -
               // if the Naming context to destroy is a Proxy Naming Context
               namingPersistence.ProxyNamingContext pnc = null;
  -
               try
               {
                   pnc = getProxyNamingContext();
  -                // A Proxy Naming Context has no child ( It reprensents a distant Naming Context )
  +                // A Proxy Naming Context has no child 
  +                // ( It reprensents a distant Naming Context )
                   pnc.destroy_object();
  -
                   // Report event ...
                   String componentName_str = nc.componentName();
                   verbose( "componentName : " + componentName_str );
  -
  -                org.omg.CosNaming.NameComponent[] componentName = null;
  -
  +                NameComponent[] componentName = null;
                   try
                   {
                       componentName = org.openorb.util.NamingUtils.to_name( 
                         componentName_str );
                   }
  -                catch ( org.omg.CosNaming.NamingContextPackage.InvalidName in )
  +                catch ( InvalidName in )
                   {
                       System.out.println( "Invalid Name" );
                       return ;
                   }
  -
                   m_callback.report_naming_context_event( 
                      getPath ( componentName ) , org.apache.ins.callback.EventType.REMOVE );
               }
  -            catch ( org.omg.CosNaming.NamingContextPackage.NotFound ex )
  +            catch ( NotFound ex )
               {
                   System.out.println( " Binding not found ! " );
                   return ;
  @@ -811,7 +787,13 @@
   
       /**
        * The list operation allows a client to iterate through a set of
  -     * bindings in a naming context.
  +     * bindings in a naming context.    
  +     * The list operation returns at most the requested number
  +     * of bindings in BindingList bl. If the naming context
  +     * contains additional bindings, the list operation returns a
  +     * BindingIterator with the additional bindings. If the
  +     * naming context does not contain additional bindings, the
  +     * binding iterator is a nil object reference.
        *
        * @param count Maximum number of elements into the binding list.
        * @param bl This parameter returns a list that contains all node of
  @@ -819,15 +801,9 @@
        * @param bi This parameter returns a binding iterator to iterate in
        *           the list.
        *
  -     * @return The list operation returns at most the requested number
  -     *    of bindings in BindingList bl. If the naming context
  -     *    contains additional bindings, the list operation returns a
  -     *    BindingIterator with the additional bindings. If the
  -     *    naming context does not contain additional bindings, the
  -     *    binding iterator is a nil object reference.
        */
  -    public void list( int count, org.omg.CosNaming.BindingListHolder bl, 
  -       org.omg.CosNaming.BindingIteratorHolder bi )
  +    public void list( int count, BindingListHolder bl, 
  +       BindingIteratorHolder bi )
       {
   
           verbose( "List all objects" );
  @@ -839,7 +815,7 @@
           {
               nc = getNamingContext();
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.NotFound e )
  +        catch ( NotFound e )
           {
               e.printStackTrace();
               throw new org.omg.CORBA.OBJECT_NOT_EXIST();
  @@ -854,7 +830,7 @@
           int bindings_size = no_children.length + nc_children.length + pnc_children.length;
           verbose( "bindings_size " + bindings_size );
   
  -        org.omg.CosNaming.Binding[] bindings = new org.omg.CosNaming.Binding[ bindings_size ];
  +        Binding[] bindings = new Binding[ bindings_size ];
   
           for ( int i = 0 ; i < no_children.length ; i++ )
           {
  @@ -894,7 +870,7 @@
   
           verbose( "max : " + max );
   
  -        bl.value = new org.omg.CosNaming.Binding[ max ];
  +        bl.value = new Binding[ max ];
   
           for ( int k = 0 ; k < max ; k++ )
           {
  @@ -929,11 +905,12 @@
        * This operation accepts Name and returns a stringified name.
        *
        * @param  n the name to stringified.
  +     * @return String the stringigied name
        * @exception InvalidName This exception is raised if the name is
        * invalid.
        */
  -    public java.lang.String to_string( org.omg.CosNaming.NameComponent[] n )
  -    throws org.omg.CosNaming.NamingContextPackage.InvalidName
  +    public java.lang.String to_string( NameComponent[] n )
  +    throws InvalidName
       {
           return org.openorb.util.NamingUtils.to_string ( n );
       }
  @@ -942,12 +919,13 @@
        * This operation accepts a stringified name and returns a Name.      
        *
        * @param  sn the stringified name to transform to a name.
  -     * @exception InvalideName This exception is raised if the
  +     * @return NameComponent[] the name
  +     * @exception InvalidName This exception is raised if the
        *         stringified name is syntactically malformed or
        *         violates an implementation limit.
        */
  -    public org.omg.CosNaming.NameComponent[] to_name( java.lang.String sn )
  -    throws org.omg.CosNaming.NamingContextPackage.InvalidName
  +    public NameComponent[] to_name( java.lang.String sn )
  +    throws InvalidName
       {
           verbose( "to_name " + sn );
           return org.openorb.util.NamingUtils.to_name( sn );
  @@ -972,8 +950,8 @@
        *         violates an implementation limit.
        */
       public java.lang.String to_url( java.lang.String addr, java.lang.String sn )
  -    throws org.omg.CosNaming.NamingContextExtPackage.InvalidAddress, 
  -      org.omg.CosNaming.NamingContextPackage.InvalidName
  +    throws InvalidAddress, 
  +      InvalidName
       {
           verbose( "Get an URL" );
           return org.openorb.util.NamingUtils.to_url( addr, sn );
  @@ -988,18 +966,18 @@
        * @return org.omg.CORBA.Object the resolved object.
        *
        * @exception  NotFound  Indicates the name does not identify a binding.
  -     * @exception  CannotProceed Indicates that the implementation has given up for some reason. The
  -     *         client, however, may be able to continue the operation at the returned
  -     *         naming context.
  -     * @exception  InvalidName  Indicates the name is invalid. (A name of length 0 is invalid;
  -     *         implementations may place other restrictions on names.)
  +     * @exception  CannotProceed Indicates that the implementation has given 
  +     *   up for some reason. The client, however, may be able to continue the 
  +     *   operation at the returned naming context.
  +     * @exception  InvalidName  Indicates the name is invalid. (A name of 
  +     *   length 0 is invalid; implementations may place other restrictions on 
  +     *   names.)
        */
       public org.omg.CORBA.Object resolve_str( java.lang.String n )
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound, 
  -      org.omg.CosNaming.NamingContextPackage.CannotProceed, 
  -      org.omg.CosNaming.NamingContextPackage.InvalidName
  +    throws NotFound, CannotProceed, 
  +      InvalidName
       {
  -        org.omg.CosNaming.NameComponent [] name = 
  +        NameComponent [] name = 
             org.openorb.util.NamingUtils.to_name( n );
           return resolve( name );
       }
  @@ -1036,11 +1014,12 @@
   
       /**
        * This function removes extra information from string
  +     * @param n the string
  +     * @return String the reduced string
        */
       private String removeExtra( String n )
       {
           String str = "";
  -
           for ( int i = 0; i < n.length(); i++ )
           {
               if ( n.charAt( i ) == '\\' )
  @@ -1052,15 +1031,18 @@
                   str = str + n.charAt( i );
               }
           }
  -
           return str;
       }
   
       /**
        * This function checks a address format.
  +     * @param addr the address
  +     * @return String value
  +     * @exception InvalidAddress if the 
  +     *    address is invalid
        */
       private String checkFormat( String addr )
  -    throws org.omg.CosNaming.NamingContextExtPackage.InvalidAddress
  +    throws InvalidAddress
       {
           String ad;
           int index;
  @@ -1099,14 +1081,14 @@
                       index = ad.substring( 0, index ).indexOf( "." );
                       if ( index == -1 )
                       {
  -                        throw new org.omg.CosNaming.NamingContextExtPackage.InvalidAddress();
  +                        throw new InvalidAddress();
                       }
                   }
               }
           }
           catch ( java.lang.Exception ex )
           {
  -            throw new org.omg.CosNaming.NamingContextExtPackage.InvalidAddress();
  +            throw new InvalidAddress();
           }
   
           return addr;
  @@ -1114,9 +1096,12 @@
   
       /**
        * This function adapts a stringified named to a URL name.
  +     * @param sn value
  +     * @return String value
  +     * @exception InvalidName if the name is invalid
        */
       private String adaptToURL( String sn )
  -    throws org.omg.CosNaming.NamingContextPackage.InvalidName
  +    throws InvalidName
       {
           // To complete in future...
           return sn;
  @@ -1124,20 +1109,23 @@
   
       /**
        * Return the Name of this NamingContext
  +     * @param n name
  +     * @return NameComponent[] the name
  +     * @exception NotFound if not found
        */
  -    private org.omg.CosNaming.NameComponent [] getNameComponent( org.omg.CosNaming.NameComponent[] n )
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound
  +    private NameComponent [] getNameComponent( NameComponent[] n )
  +    throws NotFound
       {
   
           namingPersistence.NamingContext p_namingContext = getNamingContext();
   
           try
           {
  -            org.omg.CosNaming.NameComponent [] currentName = 
  +            NameComponent [] currentName = 
                 org.openorb.util.NamingUtils.to_name( p_namingContext.componentName() );
   
  -            org.omg.CosNaming.NameComponent [] nameComponent = 
  -              new org.omg.CosNaming.NameComponent[ n.length + currentName.length ];
  +            NameComponent [] nameComponent = 
  +              new NameComponent[ n.length + currentName.length ];
   
               for ( int k = 0; k < currentName.length; k++ )
               {
  @@ -1151,7 +1139,7 @@
   
               return nameComponent;
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName e )
  +        catch ( InvalidName e )
           {
               e.printStackTrace();
               return null;
  @@ -1160,10 +1148,13 @@
   
   
       /**
  -     * return the persistent naming context that correspond to this current naming context
  +     * return the persistent naming context that correspond to this current 
  +     * naming context
  +     * @return namingPersistence.NamingContext naming context storage
  +     * @exception NotFound if not found
        */
       private namingPersistence.NamingContext getNamingContext()
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound
  +    throws NotFound
       {
           return getNamingContext ( this._object_id() );
       }
  @@ -1171,9 +1162,11 @@
       /**
        * return the persistent naming context by pid
        * @param pid the pid of the naming context
  +     * @return namingPersistence.NamingContext naming context storage
  +     * @exception NotFound if not found
        */
       private namingPersistence.NamingContext getNamingContext( byte[] pid )
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound
  +    throws NotFound
       {
           verbose( "getNamingContext" );
           try
  @@ -1183,7 +1176,7 @@
           }
           catch ( org.omg.CosPersistentState.NotFound nf )
           {
  -            throw new org.omg.CosNaming.NamingContextPackage.NotFound( );
  +            throw new NotFound( );
           }
       }
   
  @@ -1191,7 +1184,7 @@
        * return the persistent proxy naming context 
        */
       private namingPersistence.ProxyNamingContext getProxyNamingContext()
  -    throws org.omg.CosNaming.NamingContextPackage.NotFound
  +    throws NotFound
       {
   
           byte[] nc_id = this._object_id();
  @@ -1203,16 +1196,16 @@
           }
           catch ( org.omg.CosPersistentState.NotFound nf )
           {
  -            throw new org.omg.CosNaming.NamingContextPackage.NotFound();
  +            throw new NotFound();
           }
   
       }
   
       /**
        * Add a naming context to the list of children that is stored in the parent object
  -     * @param the componentName of the object
  +     * @param componentName the componentName of the object
        */
  -    private void addNamingContext ( org.omg.CosNaming.NameComponent[] componentName )
  +    private void addNamingContext ( NameComponent[] componentName )
       {
   
           namingPersistence.NamingContext parent = null;
  @@ -1222,27 +1215,24 @@
               verbose( "addNamingContext : " 
                 + org.openorb.util.NamingUtils.to_string( componentName ) );
               // get the parent of the NamingContext
  -            org.omg.CosNaming.NameComponent[] parentName = 
  -              new org.omg.CosNaming.NameComponent[ componentName.length - 1 ];
  +            NameComponent[] parentName = 
  +              new NameComponent[ componentName.length - 1 ];
   
               for ( int i = 0; i < parentName.length; i++ )
               {
                   parentName[ i ] = componentName[ i ];
               }
  -
               verbose( "parent nameComponent : " 
                  + org.openorb.util.NamingUtils.to_string( parentName ) );
  -
               parent = m_ncHome.find_by_componentName ( 
                 org.openorb.util.NamingUtils.to_string( parentName ) );
  -
           }
           catch ( org.omg.CosPersistentState.NotFound e )
           {
               e.printStackTrace();
               return ;
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName ex )
  +        catch ( InvalidName ex )
           {
               ex.printStackTrace();
           }
  @@ -1267,52 +1257,45 @@
               {
                   update_children[ k ] = children[ k ];
               }
  -
               update_children[ update_children.length - 1 ] = namingContextRef;
  -
               parent.nc_children( update_children );
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName e )
  +        catch ( InvalidName e )
           {
               e.printStackTrace();
           }
       }
   
  -
       /**
        * Add a naming object to the list of children that is stored in the parent object
  -     * @param the componentName of the object
  +     * @param componentName name of the object
        */
  -    private void addNamingObject ( org.omg.CosNaming.NameComponent[] componentName )
  +    private void addNamingObject ( NameComponent[] componentName )
       {
   
           namingPersistence.NamingContext parent = null;
  -
           try
           {
  -
               verbose( " addNamingObject " 
                 + org.openorb.util.NamingUtils.to_string( componentName ) );
   
               // get the parent of the object
  -            org.omg.CosNaming.NameComponent[] parentName = 
  -              new org.omg.CosNaming.NameComponent[ componentName.length - 1 ];
  -
  +            NameComponent[] parentName = 
  +              new NameComponent[ componentName.length - 1 ];
               for ( int i = 0; i < parentName.length; i++ )
               {
                   parentName[ i ] = componentName[ i ];
               }
  -
  -            String parentName_str = org.openorb.util.NamingUtils.to_string( parentName );
  +            String parentName_str = 
  +              org.openorb.util.NamingUtils.to_string( parentName );
               verbose( "parentName : " + parentName_str );
  -
               parent = m_ncHome.find_by_componentName ( parentName_str );
           }
           catch ( org.omg.CosPersistentState.NotFound e )
           {
               e.printStackTrace();
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName ex )
  +        catch ( InvalidName ex )
           {
               ex.printStackTrace();
           }
  @@ -1320,27 +1303,24 @@
           try
           {
               // get the ref of the object
  -
               namingPersistence.NamingObjectRef objectRef = 
  -              m_noHome.find_ref_by_componentName( org.openorb.util.NamingUtils.to_string( componentName ) );
  +              m_noHome.find_ref_by_componentName( 
  +                org.openorb.util.NamingUtils.to_string( componentName ) );
   
               // store the new children list to the parent
  -
               namingPersistence.NamingObjectRef[] children = parent.no_children();
   
               namingPersistence.NamingObjectRef[] update_children = 
                 new namingPersistence.NamingObjectRef[ children.length + 1 ];
  -
               for ( int k = 0 ; k < update_children.length - 1 ; k ++ )
               {
                   update_children[ k ] = children[ k ];
               }
   
               update_children[ update_children.length - 1 ] = objectRef;
  -
               parent.no_children( update_children );
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName ex )
  +        catch ( InvalidName ex )
           {
               ex.printStackTrace();
           }
  @@ -1350,20 +1330,16 @@
        * Add the proxy naming context to the list of children that is stored in the parent object
        * @param the componentName of the object
        */
  -    private void addProxyNamingContext ( org.omg.CosNaming.NameComponent[] componentName )
  +    private void addProxyNamingContext ( NameComponent[] componentName )
       {
  -
           // get the parent of the NamingContext
  -        org.omg.CosNaming.NameComponent[] parentName = 
  -          new org.omg.CosNaming.NameComponent[ componentName.length - 1 ];
  -
  +        NameComponent[] parentName = 
  +          new NameComponent[ componentName.length - 1 ];
           for ( int i = 0; i < parentName.length; i++ )
           {
               parentName[ i ] = componentName[ i ];
           }
  -
           namingPersistence.NamingContext parent = null;
  -
           try
           {
               parent = m_ncHome.find_by_componentName ( 
  @@ -1373,11 +1349,10 @@
           {
               e.printStackTrace();
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName ex )
  +        catch ( InvalidName ex )
           {
               ex.printStackTrace();
           }
  -
           try
           {
               // get the reference of the proxy naming context to add
  @@ -1396,12 +1371,10 @@
               {
                   update_children[ k ] = children[ k ];
               }
  -
               update_children[ update_children.length - 1 ] = proxyNamingContextRef;
  -
               parent.pnc_children ( update_children );
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName ex )
  +        catch ( InvalidName ex )
           {
               ex.printStackTrace();
           }
  @@ -1411,21 +1384,17 @@
        * Remove the naming object from the list of children that is stored in the parent object
        * @param the componentName of the object
        */
  -    private void removeNamingObject ( org.omg.CosNaming.NameComponent[] componentName )
  +    private void removeNamingObject ( NameComponent[] componentName )
       {
  -
           verbose( "removeNamingObject" );
           // get the parent of the object
  -        org.omg.CosNaming.NameComponent[] parentName = 
  -          new org.omg.CosNaming.NameComponent[ componentName.length - 1 ];
  -
  +        NameComponent[] parentName = 
  +          new NameComponent[ componentName.length - 1 ];
           for ( int i = 0; i < parentName.length; i++ )
           {
               parentName[ i ] = componentName[ i ];
           }
  -
           namingPersistence.NamingContext parent = null;
  -
           try
           {
               parent = m_ncHome.find_by_componentName ( 
  @@ -1435,16 +1404,14 @@
           {
               e.printStackTrace();
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName ex )
  +        catch ( InvalidName ex )
           {
               ex.printStackTrace();
           }
   
           try
           {
  -
               // get the ref of the object
  -
               namingPersistence.NamingObjectRef objectRef = 
                 m_noHome.find_ref_by_componentName( 
                   org.openorb.util.NamingUtils.to_string ( componentName ) );
  @@ -1452,9 +1419,7 @@
                 ( ( namingPersistence.NamingObject ) objectRef.deref() ).componentName();
   
               // remove the objectRef from the list of the children of the naming context
  -
               namingPersistence.NamingObjectRef[] children = parent.no_children();
  -
               namingPersistence.NamingObjectRef[] update_children = 
                 new namingPersistence.NamingObjectRef[ children.length - 1 ];
               int index = children.length - 1;
  @@ -1482,31 +1447,28 @@
   
               parent.no_children ( update_children );
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName ex )
  +        catch ( InvalidName ex )
           {
               ex.printStackTrace();
           }
       }
   
       /**
  -     * Remove the naming context from the list of children that is stored in the parent object
  +     * Remove the naming context from the list of children that is 
  +     * stored in the parent object
        * @param the componentName of the object
        */
  -    private void removeNamingContext ( org.omg.CosNaming.NameComponent[] componentName )
  +    private void removeNamingContext ( NameComponent[] componentName )
       {
  -
           verbose( "removeNamingContext" );
           // get the parent of the object
  -        org.omg.CosNaming.NameComponent[] parentName = 
  -          new org.omg.CosNaming.NameComponent[ componentName.length - 1 ];
  -
  +        NameComponent[] parentName = 
  +          new NameComponent[ componentName.length - 1 ];
           for ( int i = 0; i < parentName.length; i++ )
           {
               parentName[ i ] = componentName[ i ];
           }
  -
           namingPersistence.NamingContext parent = null;
  -
           try
           {
               parent = m_ncHome.find_by_componentName ( 
  @@ -1516,14 +1478,13 @@
           {
               e.printStackTrace();
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName ex )
  +        catch ( InvalidName ex )
           {
               ex.printStackTrace();
           }
   
           try
           {
  -
               // get the ref of the object
   
               namingPersistence.NamingContextRef objectRef = 
  @@ -1564,23 +1525,24 @@
               }
               parent.nc_children ( update_children );
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName ex )
  +        catch ( InvalidName ex )
           {
               ex.printStackTrace();
           }
       }
   
       /**
  -     * Remove the proxy naming context from the list of children that is stored in the parent object
  -     * @param the componentName of the object
  +     * Remove the proxy naming context from the list of children that is 
  +     * stored in the parent object
  +     * @param componentName the component name of the object
        */
       private void removeProxyNamingContext ( 
  -      org.omg.CosNaming.NameComponent[] componentName )
  +      NameComponent[] componentName )
       {
   
           // get the parent of the object
  -        org.omg.CosNaming.NameComponent[] parentName = 
  -           new org.omg.CosNaming.NameComponent[ componentName.length - 1 ];
  +        NameComponent[] parentName = 
  +           new NameComponent[ componentName.length - 1 ];
   
           for ( int i = 0; i < parentName.length; i++ )
           {
  @@ -1598,7 +1560,7 @@
           {
               e.printStackTrace();
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName ex )
  +        catch ( InvalidName ex )
           {
               ex.printStackTrace();
           }
  @@ -1639,15 +1601,13 @@
                       update_children[ k ] = children[ k ];
                   }
               }
  -
               for ( int i = index + 1; i < children.length ; i++ )
               {
                   update_children[ i - 1 ] = children[ i ];
               }
  -
               parent.pnc_children ( update_children );
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName ex )
  +        catch ( InvalidName ex )
           {
               ex.printStackTrace();
           }
  @@ -1656,8 +1616,8 @@
       /**
        * Create the naming context Corba reference from a persistent naming context 
        *   The pid of the Corba object correspond to the pid of the persistent object
  -     * @param the persistent naming context
  -     * @return the naming context
  +     * @param nc the persistent naming context
  +     * @return org.omg.CosNaming.NamingContext the naming context
        */
       private org.omg.CosNaming.NamingContext createReference( 
           namingPersistence.NamingContext nc )
  @@ -1665,18 +1625,13 @@
   
           verbose( "createReference" );
           byte[] nc_pid = nc.get_pid();
  -
           org.omg.CORBA.Object ncObj = null;
  -
           try
           {
  -
               ncObj = _poa().create_reference_with_id( 
                 nc_pid, org.omg.CosNaming.NamingContextExtHelper.id() );
               return org.omg.CosNaming.NamingContextExtHelper.narrow( ncObj );
  -
           }
  -
           // SJM: replaced WrongPolicy exception with Exception catch
           catch ( Exception ex )
           {
  @@ -1689,85 +1644,79 @@
        * Create a binding object from a persistent naming object, specifying the 
        * binding_name and the binding_type
        * @param no the naming object
  -     * @return the binding object
  +     * @return Binding the binding object
        */
  -    private org.omg.CosNaming.Binding getBinding ( namingPersistence.NamingObject no )
  +    private Binding getBinding ( namingPersistence.NamingObject no )
       {
           verbose( "getBinding namingObject" );
  -        org.omg.CosNaming.Binding binding = new org.omg.CosNaming.Binding();
  +        Binding binding = new Binding();
   
           try
           {
  -            org.omg.CosNaming.NameComponent[] name = 
  -              new org.omg.CosNaming.NameComponent[ 1 ];
  -            org.omg.CosNaming.NameComponent[] componentName = 
  +            NameComponent[] name = 
  +              new NameComponent[ 1 ];
  +            NameComponent[] componentName = 
                 org.openorb.util.NamingUtils.to_name ( no.componentName() );
               name[ 0 ] = componentName[ componentName.length - 1 ];
               binding.binding_name = name;
  -            binding.binding_type = org.omg.CosNaming.BindingType.nobject;
  +            binding.binding_type = BindingType.nobject;
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName e )
  +        catch ( InvalidName e )
           {
               e.printStackTrace();
           }
  -
           return binding;
  -
       }
   
       /**
        * Create a binding object from a persistent naming context, specifying the 
        * binding_name and the binding_type
  -     * @param no the naming context
  -     * @return the binding object
  +     * @param nc the naming context
  +     * @return Binding the binding object
        */
  -    private org.omg.CosNaming.Binding getBinding ( namingPersistence.NamingContext nc )
  +    private Binding getBinding ( namingPersistence.NamingContext nc )
       {
   
           verbose( "getBinding namingContext" );
  -        org.omg.CosNaming.Binding binding = new org.omg.CosNaming.Binding();
  -
  +        Binding binding = new Binding();
           try
           {
  -            org.omg.CosNaming.NameComponent[] name = 
  -              new org.omg.CosNaming.NameComponent[ 1 ];
  +            NameComponent[] name = 
  +              new NameComponent[ 1 ];
               verbose( "componentName : " + nc.componentName() );
  -            org.omg.CosNaming.NameComponent[] componentName = 
  +            NameComponent[] componentName = 
                 org.openorb.util.NamingUtils.to_name ( nc.componentName() );
               name[ 0 ] = componentName[ componentName.length - 1 ];
               binding.binding_name = name;
  -            binding.binding_type = org.omg.CosNaming.BindingType.ncontext;
  +            binding.binding_type = BindingType.ncontext;
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName e )
  +        catch ( InvalidName e )
           {
               e.printStackTrace();
           }
  -
           return binding;
       }
   
       /**
  -     * Create a binding object from a persistent proxy naming context, specifying 
  -     * the binding_name and the binding_type
  -     * @param no the proxy naming context
  -     * @return the binding object
  +     * Create a binding object from a persistent proxy naming context,  
  +     * specifying the binding_name and the binding_type
  +     * @param pnc the proxy naming context
  +     * @return Binding the binding object
        */
  -    private org.omg.CosNaming.Binding getBinding ( namingPersistence.ProxyNamingContext pnc )
  +    private Binding getBinding ( namingPersistence.ProxyNamingContext pnc )
       {
  -
  -        org.omg.CosNaming.Binding binding = new org.omg.CosNaming.Binding();
  -
  +        Binding binding = new Binding();
           try
           {
  -            org.omg.CosNaming.NameComponent[] name = 
  -              new org.omg.CosNaming.NameComponent[ 1 ];
  -            org.omg.CosNaming.NameComponent[] componentName = 
  +            NameComponent[] name = 
  +              new NameComponent[ 1 ];
  +            NameComponent[] componentName = 
                 org.openorb.util.NamingUtils.to_name ( pnc.componentName() );
               name[ 0 ] = componentName[ componentName.length - 1 ];
               binding.binding_name = name;
  -            binding.binding_type = org.omg.CosNaming.BindingType.ncontext;
  +            binding.binding_type = BindingType.ncontext;
           }
  -        catch ( org.omg.CosNaming.NamingContextPackage.InvalidName e )
  +        catch ( InvalidName e )
           {
               e.printStackTrace();
           }
  @@ -1780,14 +1729,14 @@
        * The Name that is stored in persistence contains the root name "NameService"
        * The returned path correspond to that NameComponent without the root.
        * @param the componentName including the root node
  -     * @return the componentName without the root node
  +     * @return NameComponent[] the componentName without the 
  +     *    root node
        */
  -    private org.omg.CosNaming.NameComponent[] getPath ( 
  -      org.omg.CosNaming.NameComponent[] componentName )
  +    private NameComponent[] getPath( NameComponent[] componentName )
       {
   
  -        org.omg.CosNaming.NameComponent[] path = 
  -          new org.omg.CosNaming.NameComponent[ componentName.length - 1 ];
  +        NameComponent[] path = 
  +          new NameComponent[ componentName.length - 1 ];
   
           for ( int k = 1; k < componentName.length ; k++ )
           {
  @@ -1799,6 +1748,7 @@
   
       /**
        * This method is used to print information when the verbose mode is activated
  +     * @param message the message
        */
       private void verbose( String message )
       {
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message