[jBoss-Dev] CVS update: jboss/src/main/org/jboss/jdbcJDBCDataSourceLoader.java XADataSourceLoader.java

[jBoss CVS Development]

  User: mulder  
  Date: 00/09/13 04:51:32

  Modified:    src/main/org/jboss/jdbc JDBCDataSourceLoader.java
                        XADataSourceLoader.java
  Log:
  Remove the JNDI prefixes for Minerva pools (xa. and jdbc.).  The more I
  think about that the less user-friendly it is, and I think people will
  realize whether they're using a transactional data source or not.
  
  Change the "Hypersonic" data source to use Minerva instead of
  DataSourceImpl.
  
  Also, drop the src/lib/xml.jar file that I meant to remove last night but
  somehow overlooked.
  
  Revision  Changes    Path
  1.4       +3 -3      jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoader.java
  
  Index: JDBCDataSourceLoader.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JDBCDataSourceLoader.java 2000/08/31 16:37:07     1.3
  +++ JDBCDataSourceLoader.java 2000/09/13 11:51:32     1.4
  @@ -25,7 +25,7 @@
   /**
    * Service that loads a JDBC 1 connection pool.  The constructors are called by
    * the JMX engine based on your MLET tags.
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class JDBCDataSourceLoader extends ServiceMBeanSupport implements 
JDBCDataSourceLoaderMBean {
  @@ -206,9 +206,9 @@
           source.initialize();
   
           // Bind in JNDI
  -        bind(new InitialContext(), "jdbc."+source.getPoolName(), source);
  +        bind(new InitialContext(), source.getPoolName(), source);
   
  -        log.log("JDBC Connection pool "+source.getPoolName()+" bound to 
jdbc."+source.getPoolName());
  +        log.log("JDBC Connection pool "+source.getPoolName()+" bound to 
"+source.getPoolName());
   
           // Test database
           source.getConnection().close();
  
  
  
  1.8       +3 -3      jboss/src/main/org/jboss/jdbc/XADataSourceLoader.java
  
  Index: XADataSourceLoader.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/jdbc/XADataSourceLoader.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XADataSourceLoader.java   2000/08/31 16:37:08     1.7
  +++ XADataSourceLoader.java   2000/09/13 11:51:32     1.8
  @@ -29,7 +29,7 @@
    * pool generates connections that are registered with the current Transaction
    * and support two-phase commit.  The constructors are called by the JMX engine
    * based on your MLET tags.
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class XADataSourceLoader extends ServiceMBeanSupport
  @@ -270,9 +270,9 @@
           source.initialize();
   
           // Bind in JNDI
  -        bind(new InitialContext(), "xa."+source.getPoolName(), source);
  +        bind(new InitialContext(), source.getPoolName(), source);
   
  -        log.log("XA Connection pool "+source.getPoolName()+" bound to 
xa."+source.getPoolName());
  +        log.log("XA Connection pool "+source.getPoolName()+" bound to 
"+source.getPoolName());
   
           // Test database
           source.getConnection().close();