geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment RAR_1_5ConfigBuilder.java
Date Tue, 09 Mar 2004 20:48:26 GMT
djencks     2004/03/09 12:48:26

  Modified:    modules/connector/src/java/org/apache/geronimo/connector/deployment
                        RAR_1_5ConfigBuilder.java
  Log:
  fix admin object deployment
  
  Revision  Changes    Path
  1.5       +10 -8     incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilder.java
  
  Index: RAR_1_5ConfigBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RAR_1_5ConfigBuilder.java	9 Mar 2004 18:02:02 -0000	1.4
  +++ RAR_1_5ConfigBuilder.java	9 Mar 2004 20:48:26 -0000	1.5
  @@ -211,7 +211,7 @@
                       */
                       managedConnectionFactoryGBean.setReferencePatterns("Kernel", Collections.singleton(Kernel.KERNEL));
                       managedConnectionFactoryGBean.setAttribute("SelfName", managedConnectionFactoryObjectName);
  -                  } catch (Exception e) {
  +                } catch (Exception e) {
                       throw new DeploymentException(e);
                   }
                   context.addGBean(managedConnectionFactoryObjectName, managedConnectionFactoryGBean);
  @@ -232,14 +232,16 @@
                   GerAdminobjectInstanceType gerAdminobjectInstance = gerAdminObject.getAdminobjectInstanceArray()[j];
                   GBeanInfoFactory adminObjectInfoFactory = new GBeanInfoFactory(AdminObjectWrapper.class.getName(),
AdminObjectWrapper.getGBeanInfo());
                   GBeanMBean adminObjectGBean = setUpDynamicGBean(adminObjectInfoFactory,
adminobject.getConfigPropertyArray(), gerAdminobjectInstance.getConfigPropertySettingArray());
  -                ObjectName adminObjectObjectName = null;
                   try {
  -                    adminObjectObjectName = ObjectName.getInstance(JMXReferenceFactory.BASE_ADMIN_OBJECT_NAME
+ gerAdminobjectInstance.getAdminobjectName());
  -                } catch (MalformedObjectNameException e) {
  -                    throw new DeploymentException("Could not construct ManagedConnectionFactory
object name", e);
  +                    ObjectName adminObjectObjectName = ObjectName.getInstance(JMXReferenceFactory.BASE_ADMIN_OBJECT_NAME
+ gerAdminobjectInstance.getAdminobjectName());
  +                    adminObjectGBean.setAttribute("AdminObjectInterface", cl.loadClass(adminobject.getAdminobjectInterface().getStringValue()));
  +                    adminObjectGBean.setAttribute("AdminObjectClass", cl.loadClass(adminobject.getAdminobjectClass().getStringValue()));
  +                    adminObjectGBean.setReferencePatterns("Kernel", Collections.singleton(Kernel.KERNEL));
  +                    adminObjectGBean.setAttribute("SelfName", adminObjectObjectName);
  +                    context.addGBean(adminObjectObjectName, adminObjectGBean);
  +                } catch (Exception e) {
  +                    throw new DeploymentException("Could not construct AdminObject", e);
                   }
  -                context.addGBean(adminObjectObjectName, adminObjectGBean);
  -
               }
           }
   
  
  
  

Mime
View raw message