[openejb-scm] openejb/modules/core/src/test/org/openejb/deployment EJBConfigBuilderTest.java

[dain]

dain        2004/06/15 17:37:38

  Modified:    modules/core/src/test/org/openejb/deployment
                        EJBConfigBuilderTest.java
  Log:

  Updated to 77 object name 
geronimo.server:j2eeType=JCAManagedConnectionFactory,name=MyName
  
  Revision  Changes    Path
  1.14      +6 -6      
openejb/modules/core/src/test/org/openejb/deployment/EJBConfigBuilderTest.java
  
  Index: EJBConfigBuilderTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/deployment/EJBConfigBuilderTest.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- EJBConfigBuilderTest.java 11 Jun 2004 19:19:16 -0000      1.13
  +++ EJBConfigBuilderTest.java 15 Jun 2004 21:37:38 -0000      1.14
  @@ -63,7 +63,6 @@
   import java.util.Set;
   import java.util.jar.JarFile;
   import java.util.jar.JarOutputStream;
  -
   import javax.ejb.EJBHome;
   import javax.management.ObjectName;
   import javax.sql.DataSource;
  @@ -80,8 +79,8 @@
   import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
   import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
   import org.apache.geronimo.kernel.Kernel;
  -import org.apache.geronimo.kernel.jmx.JMXUtil;
   import org.apache.geronimo.kernel.config.Configuration;
  +import org.apache.geronimo.kernel.jmx.JMXUtil;
   import org.apache.geronimo.kernel.management.State;
   import org.apache.geronimo.naming.jmx.JMXReferenceFactory;
   import org.apache.geronimo.system.configuration.LocalConfigStore;
  @@ -287,7 +286,7 @@
   
               GBeanMBean tmGBean = new 
GBeanMBean(GeronimoTransactionManager.GBEAN_INFO);
               Set patterns = new HashSet();
  -            
patterns.add(ObjectName.getInstance("geronimo.management:J2eeType=ManagedConnectionFactory,*"));
  +            
patterns.add(ObjectName.getInstance("geronimo.server:j2eeType=JCAManagedConnectionFactory,*"));
               tmGBean.setReferencePatterns("resourceManagers", patterns);
               ObjectName tmObjectName = ObjectName.getInstance(j2eeDomainName + 
":type=TransactionManager");
               kernel.loadGBean(tmObjectName, tmGBean);
  @@ -436,10 +435,11 @@
       protected void setUp() throws Exception {
           super.setUp();
           String str = System.getProperty(javax.naming.Context.URL_PKG_PREFIXES);
  -        if (str == null)
  +        if (str == null) {
               str = ":org.apache.geronimo.naming";
  -        else
  +        } else {
               str = str + ":org.apache.geronimo.naming";
  +        }
           System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, str);
       }
   }