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

[ammulder]

ammulder    2005/07/07 18:15:09

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

  Revert this once TranQL PK Generator patch (GERONIMO-725) is applied
  
  Revision  Changes    Path
  1.23      +2 -2      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPContainerBuilder.java
  
  Index: CMPContainerBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPContainerBuilder.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- CMPContainerBuilder.java  7 Jul 2005 21:37:07 -0000       1.22
  +++ CMPContainerBuilder.java  7 Jul 2005 22:15:09 -0000       1.23
  @@ -293,7 +293,7 @@
           }
   
           // build the vop table
  -        LinkedHashMap vopMap = buildVopMap(beanClass, cacheTable, 
cmrNoPrefetchFieldAccessors[1], cmp1Bridge, identityDefiner, 
ejb.getPrimaryKeyGenerator(), primaryKeyTransform, localProxyTransform, 
remoteProxyTransform, finders);
  +        LinkedHashMap vopMap = buildVopMap(beanClass, cacheTable, 
cmrNoPrefetchFieldAccessors[1], cmp1Bridge, identityDefiner, 
ejb.getPrimaryKeyGeneratorDelegate(), primaryKeyTransform, localProxyTransform, 
remoteProxyTransform, finders);
   
           InterfaceMethodSignature[] signatures = (InterfaceMethodSignature[]) 
vopMap.keySet().toArray(new InterfaceMethodSignature[vopMap.size()]);
           VirtualOperation[] vtable = (VirtualOperation[]) 
vopMap.values().toArray(new VirtualOperation[vopMap.size()]);
  
  
  
  1.34      +2 -2      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java
  
  Index: CMPEntityBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- CMPEntityBuilder.java     7 Jul 2005 21:37:07 -0000       1.33
  +++ CMPEntityBuilder.java     7 Jul 2005 22:15:09 -0000       1.34
  @@ -325,7 +325,7 @@
                       throw new DeploymentException("Unable to load PK 
Generator for EJB "+ejbName, e);
                   }
               }
  -            ejb = new EJB(ejbName, abstractSchemaName, pkClass, 
proxyFactory, keyGenerator, unknownPK);
  +            ejb = new EJB(ejbName, abstractSchemaName, pkClass, 
proxyFactory, (org.tranql.pkgenerator.PrimaryKeyGeneratorDelegate)keyGenerator, 
unknownPK);
   
               Table table = new Table(ejbName, openEjbEntity.getTableName());