[jboss-cvs-commits] jbosscx/src/main/org/jboss/resource/connectionmanager BaseConnectionManager2.java

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

  User: d_jencks
  Date: 02/04/24 22:08:37

  Modified:    src/main/org/jboss/resource/connectionmanager
                        BaseConnectionManager2.java
  Log:
  Changed jsr-77 components to match naming scheme a little better
  
  Revision  Changes    Path
  1.5       +14 -15    jbosscx/src/main/org/jboss/resource/connectionmanager/BaseConnectionManager2.java
  
  Index: BaseConnectionManager2.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/connectionmanager/BaseConnectionManager2.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BaseConnectionManager2.java	23 Apr 2002 04:44:58 -0000	1.4
  +++ BaseConnectionManager2.java	25 Apr 2002 05:08:36 -0000	1.5
  @@ -247,15 +247,14 @@
      protected void createService() throws Exception
      {
         // Create JSR-77 JCAConnectionFactory Managed Object
  -      jcaConnectionFactory = JCAConnectionFactory.create(
  -                                      getServer(),
  -                                      getServiceName().getKeyProperty("service"),
  -                                      getServiceName());
  +      jcaConnectionFactory = JCAConnectionFactory.create(getServer(),
  +                                                         getServiceName().getKeyProperty("name"),
  +                                                         getServiceName());
   
         // Create JSR-77 JCAManagedConnectionFactory Managed Object
         jcaManagedConnectionFactory = JCAManagedConnectionFactory.create(getServer(),
  -                                      managedConnectionFactoryName.getKeyProperty("service"),
  -                                      jcaConnectionFactory);
  +                                                                       managedConnectionFactoryName.getKeyProperty("name"),
  +                                                                       jcaConnectionFactory);
      }
   
      protected void startService() throws Exception
  @@ -344,15 +343,15 @@
      
      protected void destroyService() 
      {
  -      JCAManagedConnectionFactory.destroy(
  -                                     getServer(),
  -                                     managedConnectionFactoryName.getKeyProperty("service")
  -                                  );
  -
  -      JCAConnectionFactory.destroy(
  -                             getServer(),
  -                             getServiceName().getKeyProperty("service")
  -                           );
  +      // Destroy JSR-77 JCAManagedConnectionFactory Managed Object
  +      JCAManagedConnectionFactory.destroy(getServer(),
  +                                          managedConnectionFactoryName.getKeyProperty("name")
  +                                          );
  +      
  +      // Destroy JSR-77 JCAConnectionFactory Managed Object
  +      JCAConnectionFactory.destroy(getServer(),
  +                                   getServiceName().getKeyProperty("name")
  +                                   );
      }
   
      /**