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

[dain]

dain        2004/11/30 18:04:17

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

  Geronimo Kernel now throws Geronimo specific exception instead of JMX 
exceptions
  
  Revision  Changes    Path
  1.3       +9 -9      
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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DeploymentHelper.java     16 Nov 2004 23:07:27 -0000      1.2
  +++ DeploymentHelper.java     30 Nov 2004 23:04:17 -0000      1.3
  @@ -51,10 +51,8 @@
   import java.util.HashSet;
   import java.util.Map;
   import java.util.Set;
  -import javax.management.InstanceAlreadyExistsException;
  -import javax.management.InstanceNotFoundException;
  -import javax.management.ObjectName;
   import javax.management.MalformedObjectNameException;
  +import javax.management.ObjectName;
   
   import org.apache.geronimo.connector.ActivationSpecWrapper;
   import org.apache.geronimo.connector.ResourceAdapterModuleImpl;
  @@ -63,17 +61,19 @@
   import org.apache.geronimo.connector.work.GeronimoWorkManager;
   import org.apache.geronimo.gbean.GBeanData;
   import org.apache.geronimo.gbean.jmx.GBeanMBean;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
  +import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
  +import org.apache.geronimo.kernel.GBeanNotFoundException;
  +import org.apache.geronimo.kernel.InternalKernelException;
   import org.apache.geronimo.kernel.Kernel;
  -import org.apache.geronimo.kernel.config.InvalidConfigException;
   import org.apache.geronimo.kernel.jmx.JMXUtil;
   import org.apache.geronimo.pool.ThreadPool;
   import org.apache.geronimo.timer.vm.VMStoreThreadPooledNonTransactionalTimer;
   import org.apache.geronimo.timer.vm.VMStoreThreadPooledTransactionalTimer;
   import org.apache.geronimo.transaction.GeronimoTransactionManager;
   import org.apache.geronimo.transaction.context.TransactionContextManager;
  -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
  -import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
  -import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
   import org.openejb.deployment.mdb.mockra.MockActivationSpec;
   import org.openejb.deployment.mdb.mockra.MockResourceAdapter;
   
  @@ -182,7 +182,7 @@
           start(kernel, activationSpecGBean);
       }
   
  -    private static void start(Kernel kernel, GBeanData gbeanData) throws 
InvalidConfigException, InstanceAlreadyExistsException, 
InstanceNotFoundException {
  +    private static void start(Kernel kernel, GBeanData gbeanData) throws 
InternalKernelException, GBeanAlreadyExistsException , GBeanNotFoundException {
           kernel.loadGBean(gbeanData, DeploymentHelper.class.getClassLoader());
           kernel.startGBean(gbeanData.getName());
       }