[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejbContainer.java ContainerFactory.java

[jBoss CVS Development]

  User: salborini
  Date: 00/08/22 12:27:16

  Modified:    src/main/org/jboss/ejb Container.java ContainerFactory.java
  Log:
  Fixed bug about external/internal ejb-refs
  
  Revision  Changes    Path
  1.24      +9 -7      jboss/src/main/org/jboss/ejb/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/Container.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Container.java    2000/08/18 03:20:53     1.23
  +++ Container.java    2000/08/22 19:27:15     1.24
  @@ -67,7 +67,7 @@
    *   @see ContainerFactory
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *   @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.23 $
  + *   @version $Revision: 1.24 $
    */
   public abstract class Container
   {
  @@ -400,16 +400,18 @@
   
                   if (ref.getLink() != null)
                   {
  -                   // External link
  -                   Logger.debug("Binding "+ref.getName()+" to external JNDI source: 
"+ref.getLink());
  +                   // Internal link
  +                   Logger.debug("Binding "+ref.getName()+" to internal JNDI source: 
"+ref.getLink());
                      bind(ctx, ref.getName(), new LinkRef(ref.getLink()));
                   }
                   else
                   {
  -                   // Internal link
  -                   String link = 
getBeanMetaData().getApplicationMetaData().getJndiFromHome(ref.getHome());
  -                                Logger.debug("Binding "+ref.getName()+" to internal 
JNDI source: "+link);
  -                   bind(ctx, ref.getName(), new LinkRef(link));
  +                   // External link
  +                                if (ref.getJndiName() == null) {
  +                                        throw new DeploymentException("ejb-ref 
"+ref.getName()+", expected either ejb-link in ejb-jar.xml or jndi-name in jboss.xml");
  +                                }
  +                                Logger.debug("Binding "+ref.getName()+" to external 
JNDI source: "+ref.getJndiName());
  +                   bind(ctx, ref.getName(), new LinkRef(ref.getJndiName()));
                   }
                }
             }
  
  
  
  1.36      +2 -2      jboss/src/main/org/jboss/ejb/ContainerFactory.java
  
  Index: ContainerFactory.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/ContainerFactory.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ContainerFactory.java     2000/08/21 07:51:37     1.35
  +++ ContainerFactory.java     2000/08/22 19:27:16     1.36
  @@ -76,7 +76,7 @@
   *   @author <a href="mailto:[EMAIL PROTECTED]">Juha Lindfors</a>
   *   @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
   *
  -*   @version $Revision: 1.35 $
  +*   @version $Revision: 1.36 $
   */
   public class ContainerFactory
        extends org.jboss.util.ServiceMBeanSupport
  @@ -605,7 +605,7 @@
                        deployments.put(origUrl, app);
                } catch (Throwable e)
                {
  -                     // DEBUG Logger.exception(e);
  +                     Logger.debug(e.getMessage());
   
                        app.stop();
                        app.destroy();