[openejb-scm] openejb1/modules/core/src/java/org/openejb/core DeploymentInfo.java

[dblevins]

dblevins    2005/08/26 17:28:34

  Modified:    modules/core/src/java/org/openejb/core DeploymentInfo.java
  Log:

  This code was checking for specific container implementation classes and 
altering it's
  building logic.  This is a point of weakness in the pluggable container 
concept and
  needs to be cleaned up beyond the fixes I've just made.
  
  Revision  Changes    Path
  1.6       +4 -4      
openejb1/modules/core/src/java/org/openejb/core/DeploymentInfo.java
  
  Index: DeploymentInfo.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/DeploymentInfo.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DeploymentInfo.java       25 Aug 2005 04:39:00 -0000      1.5
  +++ DeploymentInfo.java       26 Aug 2005 21:28:34 -0000      1.6
  @@ -260,7 +260,7 @@
               } else if ( componentType == STATEFUL ){
                   policy = new TxNotSupported((TransactionContainer) container 
);
                   policy = new StatefulContainerManagedTxPolicy( policy );
  -            } else if ( componentType == CMP_ENTITY && container instanceof 
CastorCMP11_EntityContainer){
  +            } else if ( componentType == CMP_ENTITY ){
                   policy = new TxNotSupported((TransactionContainer) container 
);
                   policy = new CastorCmpEntityTxPolicy( policy );
               } else {
  @@ -670,7 +670,7 @@
                   policy = new StatefulContainerManagedTxPolicy( policy );
               }
   
  -        } else if ( componentType == CMP_ENTITY && container instanceof 
CastorCMP11_EntityContainer){
  +        } else if ( componentType == CMP_ENTITY ){
               policy = new CastorCmpEntityTxPolicy( policy );
           }
           methodTransactionAttributes.put( method, byteValue );