[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment OpenEJBModuleBuilder.java

[gdamour]

gdamour     2005/07/06 09:31:51

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        OpenEJBModuleBuilder.java
  Log:

  GERONIMO-708. cmp-connection-factory must be specified when CMP EntityBeans
  are configured.
  
  Revision  Changes    Path
  1.41      +5 -1      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- OpenEJBModuleBuilder.java 29 Jun 2005 21:34:55 -0000      1.40
  +++ OpenEJBModuleBuilder.java 6 Jul 2005 13:31:50 -0000       1.41
  @@ -434,6 +434,10 @@
           // @todo need a better schema name
           cmpEntityBuilder.buildCMPSchema(earContext, moduleJ2eeContext, 
ejbJar, openejbEjbJar, cl, ejbSchema, sqlSchema, globalSchema);
   
  +        if (null == connectionFactoryLocator && false == 
ejbSchema.getEntities().isEmpty()) {
  +            throw new DeploymentException("A cmp-connection-factory element 
must be specified as CMP EntityBeans are defined.");
  +        }
  +        
           // create an index of the openejb ejb configurations by ejb-name
           Map openejbBeans = new HashMap();
           //TODO NPE if enterprise-beans or session is missing