[jboss-cvs] jboss-ejb3/src/test/org/jboss/ejb3/test/stateful ...

[Bill DeCoste]

  User: bdecoste
  Date: 06/07/24 17:28:28

  Modified:    src/test/org/jboss/ejb3/test/stateful   StatefulBean.java
                        Stateful.java
  Log:
  MDB cleanup, standalone test for standard testcases, fixed class level @Resources jndi env bindings
  
  Revision  Changes    Path
  1.17      +11 -2     jboss-ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StatefulBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- StatefulBean.java	23 May 2006 22:50:49 -0000	1.16
  +++ StatefulBean.java	24 Jul 2006 21:28:28 -0000	1.17
  @@ -27,6 +27,7 @@
   import java.io.IOException;
   
   import javax.annotation.Resource;
  +import javax.annotation.Resources;
   import javax.ejb.Init;
   import javax.ejb.Local;
   import javax.ejb.Remote;
  @@ -35,6 +36,10 @@
   import javax.ejb.PrePassivate;
   import javax.ejb.PostActivate;
   import javax.interceptor.Interceptors;
  +import javax.naming.InitialContext;
  +import javax.naming.NamingEnumeration;
  +
  +import org.jboss.ejb3.Container;
   
   import org.jboss.annotation.ejb.RemoteBinding;
   import org.jboss.annotation.ejb.cache.simple.CacheConfig;
  @@ -47,7 +52,7 @@
    * Comment
    *
    * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  - * @version $Revision: 1.16 $
  + * @version $Revision: 1.17 $
    */
   @Stateful(name="StatefulBean")
   @Remote(org.jboss.ejb3.test.stateful.Stateful.class)
  @@ -57,6 +62,7 @@
                  factory = org.jboss.ejb3.test.stateful.StatefulRemoteProxyFactory.class)
   @CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
   @SecurityDomain("test")
  + at Resources({@Resource(name="jdbc/ds", mappedName="java:/DefaultDS")})
   public class StatefulBean implements org.jboss.ejb3.test.stateful.Stateful
   {
      private static final Logger log = Logger.getLogger(StatefulBean.class);
  @@ -90,10 +96,13 @@
         return sessionContext.isCallerInRole("role");
      }
      
  -   public void testResources()
  +   public void testResources() throws Exception
      {
         datasource.toString();
         connectionFactory.toString();
  +      
  +      javax.sql.DataSource ds = (javax.sql.DataSource)new InitialContext().lookup(Container.ENC_CTX_NAME + "/env/jdbc/ds");
  +      ds.toString();
      }
   
      public String getState()
  
  
  
  1.12      +2 -2      jboss-ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Stateful.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- Stateful.java	23 May 2006 22:50:49 -0000	1.11
  +++ Stateful.java	24 Jul 2006 21:28:28 -0000	1.12
  @@ -27,7 +27,7 @@
    * Comment
    *
    * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  - * @version $Revision: 1.11 $
  + * @version $Revision: 1.12 $
    */
   public interface Stateful
   {
  @@ -51,6 +51,6 @@
      
      public void removeBean();
      
  -   void testResources();
  +   void testResources() throws Exception;
   
   }