jbossas4 (4.2.3.GA-4) dom4j.diff

Summary

 jmx/src/main/javax/management/modelmbean/DescriptorSupport.java |   16 ++++----
 jmx/src/main/org/jboss/mx/metadata/JBossXMBean10.java           |   18 +++++-----
 jmx/src/main/org/jboss/mx/metadata/XMLMetaData.java             |   10 ++---
 jmx/src/main/org/jboss/mx/modelmbean/XMBean.java                |   12 +++---
 4 files changed, 28 insertions(+), 28 deletions(-)

    
download this patch

Patch contents

Index: jbossas-4.2.2.GA/jmx/src/main/javax/management/modelmbean/DescriptorSupport.java
===================================================================
--- jbossas-4.2.2.GA.orig/jmx/src/main/javax/management/modelmbean/DescriptorSupport.java	2007-11-02 19:03:37.000000000 +0530
+++ jbossas-4.2.2.GA/jmx/src/main/javax/management/modelmbean/DescriptorSupport.java	2007-11-02 19:04:09.000000000 +0530
@@ -40,14 +40,14 @@
 import javax.management.MBeanException;
 import javax.management.RuntimeOperationsException;
 
-import org.jboss.dom4j.Attribute;
-import org.jboss.dom4j.Document;
-import org.jboss.dom4j.DocumentException;
-import org.jboss.dom4j.DocumentHelper;
-import org.jboss.dom4j.Element;
-import org.jboss.dom4j.io.OutputFormat;
-import org.jboss.dom4j.io.SAXReader;
-import org.jboss.dom4j.io.XMLWriter;
+import org.dom4j.Attribute;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.SAXReader;
+import org.dom4j.io.XMLWriter;
 import org.jboss.mx.modelmbean.ModelMBeanConstants;
 import org.jboss.mx.util.Serialization;
 import org.jboss.util.xml.JBossEntityResolver;
Index: jbossas-4.2.2.GA/jmx/src/main/org/jboss/mx/metadata/JBossXMBean10.java
===================================================================
--- jbossas-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/metadata/JBossXMBean10.java	2007-11-02 19:04:27.000000000 +0530
+++ jbossas-4.2.2.GA/jmx/src/main/org/jboss/mx/metadata/JBossXMBean10.java	2007-11-02 19:04:39.000000000 +0530
@@ -42,8 +42,8 @@
 import javax.management.modelmbean.ModelMBeanNotificationInfo;
 import javax.management.modelmbean.ModelMBeanOperationInfo;
 
-import org.jboss.dom4j.Attribute;
-import org.jboss.dom4j.Element;
+import org.dom4j.Attribute;
+import org.dom4j.Element;
 import org.jboss.logging.Logger;
 import org.jboss.mx.modelmbean.XMBeanConstants;
 import org.jboss.mx.util.JBossNotCompliantMBeanException;
@@ -472,7 +472,7 @@
                // if attribute type is org.w3c.dom.Element we need
                // to make the conversion anyway.
                
-               // descriptor(org.jboss.dom4j.Element) -> element (org.w3c.dom.Element)
+               // descriptor(org.dom4j.Element) -> element (org.w3c.dom.Element)
                try
                {
                   org.w3c.dom.Element element = toW3CElement(descriptor);
@@ -555,7 +555,7 @@
                      value = editor.getValue();
                   }
                }
-               catch (org.jboss.dom4j.DocumentException e)
+               catch (org.dom4j.DocumentException e)
                {
                   throw new JBossNotCompliantMBeanException(
                         "cannot convert '" + which + "' descriptor to org.w3c.dom.Element", e);
@@ -570,14 +570,14 @@
    }
 
    /**
-    * Convert org.jboss.dom4j.Element->org.w3c.dom.Element
+    * Convert org.dom4j.Element->org.w3c.dom.Element
     */
-   private org.w3c.dom.Element toW3CElement(org.jboss.dom4j.Element d4element)
-      throws org.jboss.dom4j.DocumentException
+   private org.w3c.dom.Element toW3CElement(org.dom4j.Element d4element)
+      throws org.dom4j.DocumentException
    {
       // prepare
-      org.jboss.dom4j.Document d4doc = org.jboss.dom4j.DocumentFactory.getInstance().createDocument();
-      org.jboss.dom4j.io.DOMWriter d4Writer = new org.jboss.dom4j.io.DOMWriter();
+      org.dom4j.Document d4doc = org.dom4j.DocumentFactory.getInstance().createDocument();
+      org.dom4j.io.DOMWriter d4Writer = new org.dom4j.io.DOMWriter();
       // copy
       d4doc.setRootElement(d4element.createCopy());
       // convert
Index: jbossas-4.2.2.GA/jmx/src/main/org/jboss/mx/metadata/XMLMetaData.java
===================================================================
--- jbossas-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/metadata/XMLMetaData.java	2007-11-02 19:04:52.000000000 +0530
+++ jbossas-4.2.2.GA/jmx/src/main/org/jboss/mx/metadata/XMLMetaData.java	2007-11-02 19:05:02.000000000 +0530
@@ -30,11 +30,11 @@
 import javax.management.MBeanInfo;
 import javax.management.NotCompliantMBeanException;
 
-import org.jboss.dom4j.Document;
-import org.jboss.dom4j.DocumentException;
-import org.jboss.dom4j.DocumentType;
-import org.jboss.dom4j.Element;
-import org.jboss.dom4j.io.SAXReader;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentType;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
 import org.jboss.mx.modelmbean.XMBeanConstants;
 import org.jboss.mx.service.ServiceConstants;
 import org.jboss.mx.util.JBossNotCompliantMBeanException;
Index: jbossas-4.2.2.GA/jmx/src/main/org/jboss/mx/modelmbean/XMBean.java
===================================================================
--- jbossas-4.2.2.GA.orig/jmx/src/main/org/jboss/mx/modelmbean/XMBean.java	2007-11-02 19:05:14.000000000 +0530
+++ jbossas-4.2.2.GA/jmx/src/main/org/jboss/mx/modelmbean/XMBean.java	2007-11-02 19:05:25.000000000 +0530
@@ -296,9 +296,9 @@
          org.w3c.dom.Document doc = builder.newDocument();
          doc.appendChild(doc.importNode(element, true));
 
-         org.jboss.dom4j.io.DOMReader domReader = new org.jboss.dom4j.io.DOMReader();
-         org.jboss.dom4j.Document dom4jDoc = domReader.read(doc);
-         org.jboss.dom4j.Element dom4jElem = dom4jDoc.getRootElement();
+         org.dom4j.io.DOMReader domReader = new org.dom4j.io.DOMReader();
+         org.dom4j.Document dom4jDoc = domReader.read(doc);
+         org.dom4j.Element dom4jElem = dom4jDoc.getRootElement();
          dom4jElem.detach();
          createXMBean(resource, dom4jElem, version);
       }
@@ -309,14 +309,14 @@
 
    }
 
-   public XMBean(Object resource, org.jboss.dom4j.Element element, String version) throws MBeanException, NotCompliantMBeanException
+   public XMBean(Object resource, org.dom4j.Element element, String version) throws MBeanException, NotCompliantMBeanException
    {
       //      this(resource, OBJECT_REF);
       createXMBean(resource, element, version);
 
    }
 
-   private void createXMBean(Object resource, org.jboss.dom4j.Element element, String version)
+   private void createXMBean(Object resource, org.dom4j.Element element, String version)
          throws MBeanException, NotCompliantMBeanException
    {
       try
@@ -500,4 +500,4 @@
          ((NotificationListener)resource).handleNotification(notification, handback);
    }
 
-}
\ No newline at end of file
+}