[openejb-scm] openejb/modules/itests/src/java/org/openejb/test/stateless BasicStatelessBean.java BasicStatelessObject.java BeanTxStatelessBean.java

[djencks]

djencks     2005/02/14 14:53:42

  Modified:    modules/itests/src/java/org/openejb/test/stateless
                        BasicStatelessBean.java BasicStatelessObject.java
                        BeanTxStatelessBean.java
  Log:

  accidentally committed call to test that demos problem with UT 
(GERONIMO-579). This disables calling test and adds methods that get called.
  
  Revision  Changes    Path
  1.5       +41 -2     
openejb/modules/itests/src/java/org/openejb/test/stateless/BasicStatelessBean.java
  
  Index: BasicStatelessBean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/itests/src/java/org/openejb/test/stateless/BasicStatelessBean.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BasicStatelessBean.java   12 Jan 2005 21:11:42 -0000      1.4
  +++ BasicStatelessBean.java   14 Feb 2005 19:53:42 -0000      1.5
  @@ -50,10 +50,20 @@
   
   import javax.ejb.EJBException;
   import javax.ejb.SessionContext;
  +import javax.ejb.CreateException;
   import javax.naming.InitialContext;
  +import javax.naming.NamingException;
   import javax.sql.DataSource;
  +import javax.transaction.UserTransaction;
  +import javax.transaction.HeuristicMixedException;
  +import javax.transaction.HeuristicRollbackException;
  +import javax.transaction.RollbackException;
  +import javax.transaction.SystemException;
  +import javax.transaction.NotSupportedException;
   
   import org.openejb.test.ApplicationException;
  +import org.openejb.test.stateful.BasicStatefulObject;
  +import org.openejb.test.stateful.BasicStatefulHome;
   import org.openejb.test.object.OperationsPolicy;
   
   /**
  @@ -277,7 +287,7 @@
                /*[10] Test Enterprise_bean_access ///////////////*/
                try {
                        InitialContext jndiContext = new InitialContext( ); 
  -     
  +
                        Object obj = 
jndiContext.lookup("java:comp/env/stateless/beanReferences/Enterprise_bean_access");
        
                        policy.allow( policy.Enterprise_bean_access );
  @@ -287,5 +297,34 @@
        
                allowedOperationsTable.put(methodName, policy);
        }
  +
  +    public void accessBMTBean() throws EJBException {
  +        UserTransaction ut = ejbContext.getUserTransaction();
  +        try {
  +            ut.begin();
  +        } catch (NotSupportedException e) {
  +            throw new EJBException(e);
  +        } catch (SystemException e) {
  +            throw new EJBException(e);
  +        }
  +        try {
  +            BasicStatelessObject other = (BasicStatelessObject) 
ejbContext.getEJBObject();
  +            other.businessMethod("foo");
  +        } catch (RemoteException e) {
  +            throw new EJBException(e);
  +        }
  +        try {
  +            ut.commit();
  +        } catch (HeuristicMixedException e) {
  +            throw new EJBException(e);
  +        } catch (HeuristicRollbackException e) {
  +            throw new EJBException(e);
  +        } catch (RollbackException e) {
  +            throw new EJBException(e);
  +        } catch (SystemException e) {
  +            throw new EJBException(e);
  +        }
  +    }
  +
   
   }
  
  
  
  1.4       +3 -1      
openejb/modules/itests/src/java/org/openejb/test/stateless/BasicStatelessObject.java
  
  Index: BasicStatelessObject.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/itests/src/java/org/openejb/test/stateless/BasicStatelessObject.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BasicStatelessObject.java 16 Sep 2004 15:33:29 -0000      1.3
  +++ BasicStatelessObject.java 14 Feb 2005 19:53:42 -0000      1.4
  @@ -93,4 +93,6 @@
        * @return 
        */
       public OperationsPolicy getAllowedOperationsReport(String methodName) 
throws RemoteException;
  +
  +    public void accessBMTBean() throws RemoteException;
   }
  
  
  
  1.4       +6 -3      
openejb/modules/itests/src/java/org/openejb/test/stateless/BeanTxStatelessBean.java
  
  Index: BeanTxStatelessBean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/itests/src/java/org/openejb/test/stateless/BeanTxStatelessBean.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BeanTxStatelessBean.java  16 Sep 2004 15:33:29 -0000      1.3
  +++ BeanTxStatelessBean.java  14 Feb 2005 19:53:42 -0000      1.4
  @@ -53,9 +53,13 @@
   import javax.ejb.EJBException;
   import javax.ejb.SessionContext;
   import javax.naming.InitialContext;
  +import javax.naming.NamingException;
   import javax.sql.DataSource;
   import javax.transaction.RollbackException;
   import javax.transaction.UserTransaction;
  +import javax.transaction.HeuristicMixedException;
  +import javax.transaction.HeuristicRollbackException;
  +import javax.transaction.SystemException;
   
   import org.openejb.test.object.Account;
   import org.openejb.test.object.Transaction;
  @@ -171,8 +175,7 @@
           return acct;
       }
   
  -
  -    //    
  +    //
       // Remote interface methods
       //=============================