[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment MdbBuilder.java OpenEJBModuleBuilder.java

[djencks]

djencks     2005/02/19 15:22:58

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        MdbBuilder.java OpenEJBModuleBuilder.java
  Log:

  Clean up NameFactory interface and use.  Fix cmp problem introduced with last 
commit
  
  Revision  Changes    Path
  1.13      +2 -1      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java
  
  Index: MdbBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MdbBuilder.java   19 Feb 2005 18:24:43 -0000      1.12
  +++ MdbBuilder.java   19 Feb 2005 20:22:58 -0000      1.13
  @@ -272,9 +272,10 @@
           }
           //construct name from components
           try {
  -            return 
NameFactory.getResourceComponentName(resourceLocator.getDomain(),
  +            return NameFactory.getComponentName(resourceLocator.getDomain(),
                       resourceLocator.getServer(),
                       resourceLocator.getApplication(),
  +                    NameFactory.JCA_RESOURCE,
                       resourceLocator.getModule(),
                       resourceLocator.getName(),
                       NameFactory.JCA_RESOURCE_ADAPTER,
  
  
  
  1.28      +3 -2      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- OpenEJBModuleBuilder.java 19 Feb 2005 18:24:43 -0000      1.27
  +++ OpenEJBModuleBuilder.java 19 Feb 2005 20:22:58 -0000      1.28
  @@ -483,9 +483,10 @@
           }
           //construct name from components
           try {
  -            return 
NameFactory.getResourceComponentName(resourceLocator.getDomain(),
  +            return NameFactory.getComponentName(resourceLocator.getDomain(),
                       resourceLocator.getServer(),
                       resourceLocator.getApplication(),
  +                    NameFactory.JCA_RESOURCE,
                       resourceLocator.getModule(),
                       resourceLocator.getName(),
                       //todo determine type from iface class