[openejb-scm] openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity BasicBMPEntityContainerTest.java BasicCMPEntityContainerTest.java

[djencks]

djencks     2005/03/15 00:32:43

  Modified:    modules/openejb-builder/src/test/org/openejb/deployment/entity
                        BasicBMPEntityContainerTest.java
                        BasicCMPEntityContainerTest.java
  Log:

  Make transaction policy mapping more generic and implement the 
no-distributed-transactions corba tx propagation polices.  CORBA operation name 
to method signature mapping is not yet really implemented
  
  Revision  Changes    Path
  1.5       +4 -5      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicBMPEntityContainerTest.java
  
  Index: BasicBMPEntityContainerTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicBMPEntityContainerTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BasicBMPEntityContainerTest.java  26 Jan 2005 23:28:02 -0000      1.4
  +++ BasicBMPEntityContainerTest.java  15 Mar 2005 05:32:43 -0000      1.5
  @@ -61,9 +61,8 @@
   import org.openejb.deployment.DeploymentHelper;
   import org.openejb.dispatch.InterfaceMethodSignature;
   import org.openejb.security.SecurityConfiguration;
  -import org.openejb.transaction.ContainerPolicy;
  -import org.openejb.transaction.TransactionPolicy;
   import org.openejb.transaction.TransactionPolicySource;
  +import org.openejb.transaction.TransactionPolicyType;
   
   /**
    * @version $Revision$ $Date$
  @@ -151,8 +150,8 @@
           builder.setLocalJndiNames(new String[0]);
           builder.setUnshareableResources(new HashSet());
           builder.setTransactionPolicySource(new TransactionPolicySource() {
  -            public TransactionPolicy getTransactionPolicy(String methodIntf, 
InterfaceMethodSignature signature) {
  -                return ContainerPolicy.Required;
  +            public TransactionPolicyType getTransactionPolicy(String 
methodIntf, InterfaceMethodSignature signature) {
  +                return TransactionPolicyType.Required;
               }
           });
           builder.setSecurityConfiguration(new SecurityConfiguration());
  
  
  
  1.11      +6 -9      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicCMPEntityContainerTest.java
  
  Index: BasicCMPEntityContainerTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/BasicCMPEntityContainerTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- BasicCMPEntityContainerTest.java  4 Mar 2005 09:35:50 -0000       1.10
  +++ BasicCMPEntityContainerTest.java  15 Mar 2005 05:32:43 -0000      1.11
  @@ -53,9 +53,8 @@
   import java.sql.SQLException;
   import java.sql.Statement;
   import java.util.Collections;
  -import java.util.HashSet;
   import java.util.HashMap;
  -
  +import java.util.HashSet;
   import javax.ejb.NoSuchObjectLocalException;
   import javax.ejb.ObjectNotFoundException;
   import javax.management.ObjectName;
  @@ -63,13 +62,12 @@
   
   import junit.framework.AssertionFailedError;
   import junit.framework.TestCase;
  -
  +import org.apache.geronimo.gbean.GBeanData;
   import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
   import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
   import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   import org.apache.geronimo.kernel.Kernel;
   import org.apache.geronimo.kernel.jmx.JMXUtil;
  -import org.apache.geronimo.gbean.GBeanData;
   import org.axiondb.jdbc.AxionDataSource;
   import org.openejb.ContainerIndex;
   import org.openejb.deployment.CMPContainerBuilder;
  @@ -78,9 +76,8 @@
   import org.openejb.dispatch.InterfaceMethodSignature;
   import org.openejb.proxy.EJBProxyFactory;
   import org.openejb.security.SecurityConfiguration;
  -import org.openejb.transaction.ContainerPolicy;
  -import org.openejb.transaction.TransactionPolicy;
   import org.openejb.transaction.TransactionPolicySource;
  +import org.openejb.transaction.TransactionPolicyType;
   import org.tranql.cache.CacheSlot;
   import org.tranql.cache.CacheTable;
   import org.tranql.cache.GlobalSchema;
  @@ -420,8 +417,8 @@
           builder.setLocalJndiNames(new String[0]);
           builder.setUnshareableResources(new HashSet());
           builder.setTransactionPolicySource(new TransactionPolicySource() {
  -            public TransactionPolicy getTransactionPolicy(String methodIntf, 
InterfaceMethodSignature signature) {
  -                return ContainerPolicy.Required;
  +            public TransactionPolicyType getTransactionPolicy(String 
methodIntf, InterfaceMethodSignature signature) {
  +                return TransactionPolicyType.Required;
               }
           });
           builder.setSecurityConfiguration(new SecurityConfiguration());