[jboss-cvs] jbosstest/src/main/org/jboss/test/jca/adapter TestConnection.java TestConnectionFactory.java TestManagedConnectionFactory.java

[David J. <d_j...@us...>]

  User: d_jencks
  Date: 02/06/29 04:22:12

  Modified:    src/main/org/jboss/test/jca/adapter Tag: Branch_3_0
                        TestConnection.java TestConnectionFactory.java
                        TestManagedConnectionFactory.java
  Log:
  Made the EnterpriseContext UserTx also enroll checked out Connection handles in a new tx
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +66 -7     jbosstest/src/main/org/jboss/test/jca/adapter/TestConnection.java
  
  Index: TestConnection.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/jca/adapter/TestConnection.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- TestConnection.java	24 Mar 2002 22:00:44 -0000	1.1
  +++ TestConnection.java	29 Jun 2002 11:22:12 -0000	1.1.2.1
  @@ -8,6 +8,14 @@
    */
   package org.jboss.test.jca.adapter;
   
  +import javax.resource.ResourceException;
  +import javax.resource.cci.Connection;
  +import javax.resource.cci.ConnectionMetaData;
  +import javax.resource.cci.Interaction;
  +import javax.resource.cci.LocalTransaction;
  +import javax.resource.cci.ResultSetInfo;
  +
  +
   
   
   /**
  @@ -21,7 +29,7 @@
    */
   
   public class TestConnection 
  -{
  + implements Connection {
   
      private TestManagedConnection mc;
      private boolean mcIsNull = true;
  @@ -32,12 +40,6 @@
         mcIsNull = false;
      }
   
  -   public void close()
  -   {
  -      mc.connectionClosed(this);
  -      mcIsNull = true;
  -   }
  -
      public boolean isInTx()
      {
         return mc.isInTx();
  @@ -53,6 +55,63 @@
         {
            this.mc = mc;
         } // end of else
  +   }
  +
  +
  +   // implementation of javax.resource.cci.Connection interface
  +
  +   /**
  +    *
  +    * @exception javax.resource.ResourceException <description>
  +    */
  +   public void close()
  +   {
  +      mc.connectionClosed(this);
  +      mcIsNull = true;
  +   }
  +
  +   /**
  +    *
  +    * @return <description>
  +    * @exception javax.resource.ResourceException <description>
  +    */
  +   public Interaction createInteraction() throws ResourceException
  +   {
  +      // TODO: implement this javax.resource.cci.Connection method
  +      return null;
  +   }
  +
  +   /**
  +    *
  +    * @return <description>
  +    * @exception javax.resource.ResourceException <description>
  +    */
  +   public LocalTransaction getLocalTransaction() throws ResourceException
  +   {
  +      // TODO: implement this javax.resource.cci.Connection method
  +      return null;
  +   }
  +
  +   /**
  +    *
  +    * @return <description>
  +    * @exception javax.resource.ResourceException <description>
  +    */
  +   public ConnectionMetaData getMetaData() throws ResourceException
  +   {
  +      // TODO: implement this javax.resource.cci.Connection method
  +      return null;
  +   }
  +
  +   /**
  +    *
  +    * @return <description>
  +    * @exception javax.resource.ResourceException <description>
  +    */
  +   public ResultSetInfo getResultSetInfo() throws ResourceException
  +   {
  +      // TODO: implement this javax.resource.cci.Connection method
  +      return null;
      }
      
   }// TestConnection
  
  
  
  1.1.2.1   +18 -12    jbosstest/src/main/org/jboss/test/jca/adapter/TestConnectionFactory.java
  
  Index: TestConnectionFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/jca/adapter/TestConnectionFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- TestConnectionFactory.java	24 Mar 2002 22:00:44 -0000	1.1
  +++ TestConnectionFactory.java	29 Jun 2002 11:22:12 -0000	1.1.2.1
  @@ -17,6 +17,8 @@
   import javax.resource.cci.ConnectionSpec;
   import javax.resource.cci.RecordFactory;
   import javax.resource.cci.ResourceAdapterMetaData;
  +import javax.resource.spi.ConnectionManager;
  +import javax.resource.Referenceable;
   
   // Generated package name
   /**
  @@ -29,11 +31,18 @@
    * @version
    */
   
  -public class TestConnectionFactory implements ConnectionFactory
  +public class TestConnectionFactory implements ConnectionFactory, Referenceable
   {
  -   public TestConnectionFactory ()
  +
  +   private final ConnectionManager cm;
  +   private final TestManagedConnectionFactory mcf;
  +
  +   private Reference ref;
  +
  +   public TestConnectionFactory (final ConnectionManager cm, final TestManagedConnectionFactory mcf)
      {
  -      
  +      this.cm = cm;
  +      this.mcf = mcf;
      }
      // implementation of javax.resource.Referenceable interface
   
  @@ -41,9 +50,9 @@
       *
       * @param param1 <description>
       */
  -   public void setReference(Reference param1)
  +   public void setReference(Reference ref)
      {
  -     // TODO: implement this javax.resource.Referenceable method
  +      this.ref = ref;
      }
      // implementation of javax.naming.Referenceable interface
   
  @@ -54,8 +63,7 @@
       */
      public Reference getReference() throws NamingException
      {
  -     // TODO: implement this javax.naming.Referenceable method
  -     return null;
  +      return ref;
      }
      // implementation of javax.resource.cci.ConnectionFactory interface
   
  @@ -66,8 +74,7 @@
       */
      public Connection getConnection() throws ResourceException
      {
  -     // TODO: implement this javax.resource.cci.ConnectionFactory method
  -     return null;
  +      return (Connection)cm.allocateConnection(mcf, null);
      }
   
      /**
  @@ -76,10 +83,9 @@
       * @return <description>
       * @exception javax.resource.ResourceException <description>
       */
  -   public Connection getConnection(ConnectionSpec param1) throws ResourceException
  +   public Connection getConnection(ConnectionSpec ignore) throws ResourceException
      {
  -     // TODO: implement this javax.resource.cci.ConnectionFactory method
  -     return null;
  +      return (Connection)cm.allocateConnection(mcf, null);
      }
   
      /**
  
  
  
  1.1.2.3   +4 -5      jbosstest/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java
  
  Index: TestManagedConnectionFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/jca/adapter/TestManagedConnectionFactory.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- TestManagedConnectionFactory.java	24 May 2002 15:38:25 -0000	1.1.2.2
  +++ TestManagedConnectionFactory.java	29 Jun 2002 11:22:12 -0000	1.1.2.3
  @@ -88,10 +88,10 @@
       * @return <description>
       * @exception javax.resource.ResourceException <description>
       */
  -   public Object createConnectionFactory(ConnectionManager param1) throws ResourceException
  +   public Object createConnectionFactory(ConnectionManager cm) throws ResourceException
      {
        // TODO: implement this javax.resource.spi.ManagedConnectionFactory method
  -     return null;
  +     return new TestConnectionFactory(cm, this);
      }
   
      /**
  @@ -101,8 +101,7 @@
       */
      public Object createConnectionFactory() throws ResourceException
      {
  -     // TODO: implement this javax.resource.spi.ManagedConnectionFactory method
  -     return null;
  +      throw new ResourceException("not yet implemented");
      }
   
      /**
  @@ -114,7 +113,7 @@
       */
      public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cri) throws ResourceException
      {
  -     return new TestManagedConnection(subject, (TestConnectionRequestInfo)cri, id++);
  +      return new TestManagedConnection(subject, (TestConnectionRequestInfo)cri, id++);
      }
   
      /**