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

[dain]

dain        2004/10/14 03:07:16

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

  CMP 1.1 beans now work as well a CMP 2.0 beans
  
  Revision  Changes    Path
  1.6       +6 -1      
openejb/modules/core/src/java/org/openejb/deployment/CMPEntityBuilder.java
  
  Index: CMPEntityBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/CMPEntityBuilder.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CMPEntityBuilder.java     13 Oct 2004 18:53:22 -0000      1.5
  +++ CMPEntityBuilder.java     14 Oct 2004 07:07:16 -0000      1.6
  @@ -116,9 +116,14 @@
               EntityBeanType entityBean = entityBeans[i];
               if ("Container".equals(getString(entityBean.getPersistenceType()))) {
                   String ejbName = getString(entityBean.getEjbName());
  -                String abstractSchemaName = 
getString(entityBean.getAbstractSchemaName());
   
                   boolean cmp2 = isCMP2(entityBean);
  +                String abstractSchemaName;
  +                if (cmp2) {
  +                    abstractSchemaName = 
getString(entityBean.getAbstractSchemaName());
  +                } else {
  +                    abstractSchemaName = ejbName;
  +                }
   
                   ObjectName entityObjectName = super.createEJBObjectName(earContext, 
ejbModuleName, entityBean);