[openejb-scm] openejb/modules/core/src/java/org/openejb/deployment EntityBuilder.java SessionBuilder.java

[dain]

dain        2004/10/01 01:19:18

  Modified:    modules/core/src/java/org/openejb/deployment
                        EntityBuilder.java SessionBuilder.java
  Log:

  http://issues.apache.org/jira/browse/GERONIMO-340
  Add support for ejb-ref resolution by matching on the ejb interfaces
  
  Revision  Changes    Path
  1.5       +2 -2      
openejb/modules/core/src/java/org/openejb/deployment/EntityBuilder.java
  
  Index: EntityBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/EntityBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EntityBuilder.java        29 Sep 2004 19:36:00 -0000      1.4
  +++ EntityBuilder.java        1 Oct 2004 05:19:18 -0000       1.5
  @@ -216,7 +216,7 @@
                   ENCConfigBuilder.assureEJBHomeInterface(home, cl);
   
                   String objectName = entityObjectName.getCanonicalName();
  -                earContext.getEJBRefContext().addEJBRemoteId(module.getModuleURI(), 
ejbName, objectName);
  +                earContext.getEJBRefContext().addEJBRemoteId(module.getModuleURI(), 
ejbName, objectName, false, home, remote);
               }
   
               // ejb-local-ref
  @@ -228,7 +228,7 @@
                   ENCConfigBuilder.assureEJBLocalHomeInterface(localHome, cl);
   
                   String objectName = entityObjectName.getCanonicalName();
  -                earContext.getEJBRefContext().addEJBLocalId(module.getModuleURI(), 
ejbName, objectName);
  +                earContext.getEJBRefContext().addEJBLocalId(module.getModuleURI(), 
ejbName, objectName, false, localHome, local);
               }
           }
       }
  
  
  
  1.5       +2 -2      
openejb/modules/core/src/java/org/openejb/deployment/SessionBuilder.java
  
  Index: SessionBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/SessionBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SessionBuilder.java       29 Sep 2004 19:36:00 -0000      1.4
  +++ SessionBuilder.java       1 Oct 2004 05:19:18 -0000       1.5
  @@ -237,7 +237,7 @@
                   ENCConfigBuilder.assureEJBHomeInterface(home, cl);
   
                   String objectName = sessionObjectName.getCanonicalName();
  -                earContext.getEJBRefContext().addEJBRemoteId(module.getModuleURI(), 
ejbName, objectName);
  +                earContext.getEJBRefContext().addEJBRemoteId(module.getModuleURI(), 
ejbName, objectName, true, home, remote);
               }
   
               // ejb-local-ref
  @@ -249,7 +249,7 @@
                   ENCConfigBuilder.assureEJBLocalHomeInterface(localHome, cl);
   
                   String objectName = sessionObjectName.getCanonicalName();
  -                earContext.getEJBRefContext().addEJBLocalId(module.getModuleURI(), 
ejbName, objectName);
  +                earContext.getEJBRefContext().addEJBLocalId(module.getModuleURI(), 
ejbName, objectName, true, localHome, local);
               }
           }
       }