cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service MBeanMetadataXMLLoader.java

[dain]

dain        2003/11/10 20:37:48

  Modified:    
modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service
                        MBeanMetadataXMLLoader.java
  Log:
  Updated to reflect changed to loading GeronimoMBeanInfo later in deployment 
after
  the class loader is initialized.
  
  Revision  Changes    Path
  1.3       +2 -6      
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service/MBeanMetadataXMLLoader.java
  
  Index: MBeanMetadataXMLLoader.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service/MBeanMetadataXMLLoader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MBeanMetadataXMLLoader.java       24 Oct 2003 22:47:28 -0000      1.2
  +++ MBeanMetadataXMLLoader.java       11 Nov 2003 04:37:48 -0000      1.3
  @@ -63,8 +63,6 @@
   import javax.management.ObjectName;
   
   import org.apache.geronimo.kernel.deployment.DeploymentException;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfoXMLLoader;
   
   import org.w3c.dom.Element;
   import org.w3c.dom.NodeList;
  @@ -84,9 +82,7 @@
           }
           String descriptor = element.getAttribute("descriptor").trim();
           if (descriptor.length() > 0) {
  -            URI descriptorURI = baseURI.resolve(descriptor);
  -            GeronimoMBeanInfo geronimoMBeanInfo = 
GeronimoMBeanInfoXMLLoader.loadMBean(descriptorURI);
  -            md.setGeronimoMBeanInfo(geronimoMBeanInfo);
  +            md.setGeronimoMBeanDescriptor(descriptor);
           }
           String s = element.getAttribute("name").trim();
           try {