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

[dain]

dain        2005/02/11 17:30:25

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

  CMP container builder now propertly maps remove methods. This eliminates the 
ArrayIndexOutOfBoundsException in TransactionPolicyManager.
  Handle and HomeHandle can not be copied with serialization on client side.
  Added Handle copy tests to itest suite
  
  Revision  Changes    Path
  1.11      +4 -5      
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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CMPContainerBuilder.java  2 Feb 2005 12:53:06 -0000       1.10
  +++ CMPContainerBuilder.java  11 Feb 2005 22:30:25 -0000      1.11
  @@ -125,7 +125,6 @@
   import org.tranql.identity.IdentityDefiner;
   import org.tranql.identity.IdentityDefinerBuilder;
   import org.tranql.identity.IdentityTransform;
  -import org.tranql.identity.UndefinedIdentityException;
   import org.tranql.identity.UserDefinedIdentity;
   import org.tranql.pkgenerator.PrimaryKeyGeneratorDelegate;
   import org.tranql.ql.QueryException;
  @@ -396,7 +395,7 @@
           return cmrFieldAccessors;
       }
   
  -    private FaultHandler buildFaultHandler(AssociationEndFaultHandlerBuilder 
handlerBuilder, CMRField field, int slot) throws UndefinedIdentityException, 
QueryException {
  +    private FaultHandler buildFaultHandler(AssociationEndFaultHandlerBuilder 
handlerBuilder, CMRField field, int slot) throws QueryException {
           IdentityDefinerBuilder identityDefinerBuilder = new 
IdentityDefinerBuilder(ejbSchema, globalSchema);
           Association association = field.getAssociation();
           CMRField relatedField = (CMRField) association.getOtherEnd(field);
  @@ -559,12 +558,12 @@
                           new CMPRemoveMethod(beanClass, signature, 
cacheTable, cmrFieldAccessors));
   
                   // ejbHome.remove(primaryKey)
  -                vopMap.put(new InterfaceMethodSignature("ejbRemove", new 
Class[]{Object.class}, true),
  +                vopMap.put(new InterfaceMethodSignature("remove", new 
Class[]{Object.class}, true),
                           new CMPRemoveMethod(beanClass, signature, 
cacheTable, cmrFieldAccessors));
   
                   // ejbHome.remove(handle)
                   Class handleClass = 
getClassLoader().loadClass("javax.ejb.Handle");
  -                vopMap.put(new InterfaceMethodSignature("ejbRemove", new 
Class[]{handleClass}, true),
  +                vopMap.put(new InterfaceMethodSignature("remove", new 
Class[]{handleClass}, true),
                           new CMPRemoveMethod(beanClass, signature, 
cacheTable, cmrFieldAccessors));
               } else if (name.equals("ejbActivate")) {
                   vopMap.put(MethodHelper.translateToInterface(signature)