[openejb-scm] openejb/modules/openejb-builder/src/test/org/openejb/deployment DeploymentHelper.java DeploymentTestContants.java

[djencks]

djencks     2005/02/19 15:22:58

  Modified:    modules/openejb-builder/src/test/org/openejb/deployment
                        DeploymentHelper.java DeploymentTestContants.java
  Log:

  Clean up NameFactory interface and use.  Fix cmp problem introduced with last 
commit
  
  Revision  Changes    Path
  1.8       +3 -3      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java
  
  Index: DeploymentHelper.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DeploymentHelper.java     19 Feb 2005 18:24:43 -0000      1.7
  +++ DeploymentHelper.java     19 Feb 2005 20:22:58 -0000      1.8
  @@ -107,8 +107,8 @@
       static {
           try {
               RESOURCE_ADAPTER_MODULE_NAME = NameFactory.getModuleName(null, 
null, null, null, null, raContext);
  -            RESOURCE_ADAPTER_NAME = 
NameFactory.getResourceComponentName(null, null, null, null, "MockRA", 
NameFactory.JCA_RESOURCE_ADAPTER, raContext);
  -            ACTIVATIONSPEC_NAME = NameFactory.getResourceComponentName(null, 
null, null, null, "MockRA", NameFactory.JCA_ACTIVATION_SPEC, raContext);
  +            RESOURCE_ADAPTER_NAME = NameFactory.getComponentName(null, null, 
null, null, null, "MockRA", NameFactory.JCA_RESOURCE_ADAPTER, raContext);
  +            ACTIVATIONSPEC_NAME = NameFactory.getComponentName(null, null, 
null, null, null, "MockRA", NameFactory.JCA_ACTIVATION_SPEC, raContext);
           } catch (MalformedObjectNameException e) {
               throw new RuntimeException(e);
           }
  
  
  
  1.5       +2 -2      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestContants.java
  
  Index: DeploymentTestContants.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestContants.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeploymentTestContants.java       19 Feb 2005 18:24:43 -0000      1.4
  +++ DeploymentTestContants.java       19 Feb 2005 20:22:58 -0000      1.5
  @@ -124,7 +124,7 @@
           private static ObjectName createConnectionObjectName() {
               try {
                   J2eeContext j2eeContext = new J2eeContextImpl(DOMAIN_NAME, 
SERVER_NAME, NameFactory.NULL, NameFactory.RESOURCE_ADAPTER_MODULE, 
"testejbmodule", "testapp", NameFactory.J2EE_APPLICATION);
  -                return NameFactory.getResourceComponentName(null, null, 
NameFactory.NULL, "org/apache/geronimo/DefaultDatabase", "DefaultDatasource", 
NameFactory.JCA_MANAGED_CONNECTION_FACTORY, j2eeContext);
  +                return NameFactory.getComponentName(null, null, 
NameFactory.NULL, NameFactory.JCA_RESOURCE, 
"org/apache/geronimo/DefaultDatabase", "DefaultDatasource", 
NameFactory.JCA_MANAGED_CONNECTION_FACTORY, j2eeContext);
               } catch (MalformedObjectNameException e) {
                   return null;
               }