[openejb-scm] openejb/modules/core/src/java/org/openejb EJBModuleImpl.java GenericEJBContainer.java

[jboynes]

jboynes     2005/09/14 13:55:05

  Modified:    modules/core/src/java/org/openejb EJBModuleImpl.java
                        GenericEJBContainer.java
  Log:

  do not use JTAResource name
  
  Revision  Changes    Path
  1.18      +2 -2      
openejb/modules/core/src/java/org/openejb/EJBModuleImpl.java
  
  Index: EJBModuleImpl.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/EJBModuleImpl.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- EJBModuleImpl.java        18 Aug 2005 18:15:59 -0000      1.17
  +++ EJBModuleImpl.java        14 Sep 2005 17:55:05 -0000      1.18
  @@ -214,7 +214,7 @@
           infoBuilder.addAttribute("deploymentDescriptor", String.class, true);
           infoBuilder.addReference("ConnectionFactory", 
ConnectionProxyFactory.class, NameFactory.JCA_CONNECTION_FACTORY);
           infoBuilder.addAttribute("Delegate", 
ConnectionFactoryDelegate.class, true);
  -        infoBuilder.addReference("TransactionContextManager", 
TransactionContextManager.class, NameFactory.JTA_RESOURCE);
  +        infoBuilder.addReference("TransactionContextManager", 
TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
           infoBuilder.addAttribute("TMDelegate", 
TransactionManagerDelegate.class, true);
   
           infoBuilder.addAttribute("kernel", Kernel.class, false);
  
  
  
  1.53      +2 -2      
openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java
  
  Index: GenericEJBContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- GenericEJBContainer.java  10 Aug 2005 02:24:56 -0000      1.52
  +++ GenericEJBContainer.java  14 Sep 2005 17:55:05 -0000      1.53
  @@ -446,7 +446,7 @@
           infoFactory.addAttribute("homeTxPolicyConfig", Serializable.class, 
true);
           infoFactory.addAttribute("remoteTxPolicyConfig", Serializable.class, 
true);
   
  -        infoFactory.addReference("TransactionContextManager", 
TransactionContextManager.class, NameFactory.JTA_RESOURCE);
  +        infoFactory.addReference("TransactionContextManager", 
TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
           infoFactory.addReference("TrackedConnectionAssociator", 
TrackedConnectionAssociator.class, NameFactory.JCA_CONNECTION_TRACKER);
           infoFactory.addReference("Timer", ThreadPooledTimer.class, 
NameFactory.GERONIMO_SERVICE);