[Jboss-cvs] JBossAS SVN: r57030 - in branches/Branch_4_0/jmx: . src/main/javax/management/modelmbean src/main/org/jboss/mx/metadata src/main/org/jboss/mx/modelmbean
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 20 18:02:09 EDT 2006
Author: dimitris at jboss.org
Date: 2006-09-20 18:02:00 -0400 (Wed, 20 Sep 2006)
New Revision: 57030
Modified:
branches/Branch_4_0/jmx/.classpath
branches/Branch_4_0/jmx/build.xml
branches/Branch_4_0/jmx/src/main/javax/management/modelmbean/DescriptorSupport.java
branches/Branch_4_0/jmx/src/main/org/jboss/mx/metadata/JBossXMBean10.java
branches/Branch_4_0/jmx/src/main/org/jboss/mx/metadata/XMLMetaData.java
branches/Branch_4_0/jmx/src/main/org/jboss/mx/modelmbean/XMBean.java
Log:
JBAS-3666, remove the dom4j dependency from the jmx module, bundle a jarjar'ed dom4j in jboss-jmx.jar. dom4j moved from root lib to server/all|default/lib
Modified: branches/Branch_4_0/jmx/.classpath
===================================================================
--- branches/Branch_4_0/jmx/.classpath 2006-09-20 22:01:08 UTC (rev 57029)
+++ branches/Branch_4_0/jmx/.classpath 2006-09-20 22:02:00 UTC (rev 57030)
@@ -7,6 +7,6 @@
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
- <classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/dom4j-jarjar/lib/dom4j-jarjar.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_4_0/jmx/build.xml
===================================================================
--- branches/Branch_4_0/jmx/build.xml 2006-09-20 22:01:08 UTC (rev 57029)
+++ branches/Branch_4_0/jmx/build.xml 2006-09-20 22:02:00 UTC (rev 57030)
@@ -80,7 +80,7 @@
<path id="library.classpath">
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
+ <path refid="jboss.dom4j.jarjar.classpath"/>
<path refid="sax.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="apache.bcel.classpath"/>
@@ -266,6 +266,10 @@
<fileset dir="${build.gen-src}">
<include name="**/*.xml"/>
</fileset>
+ <!-- include dom4j-jarjar -->
+ <zipfileset src="${jboss.dom4j.jarjar.lib}/dom4j-jarjar.jar">
+ <include name="org/jboss/dom4j/**"/>
+ </zipfileset>
</jar>
<!-- Build the jboss-jmx-core.jar -->
Modified: branches/Branch_4_0/jmx/src/main/javax/management/modelmbean/DescriptorSupport.java
===================================================================
--- branches/Branch_4_0/jmx/src/main/javax/management/modelmbean/DescriptorSupport.java 2006-09-20 22:01:08 UTC (rev 57029)
+++ branches/Branch_4_0/jmx/src/main/javax/management/modelmbean/DescriptorSupport.java 2006-09-20 22:02:00 UTC (rev 57030)
@@ -40,14 +40,14 @@
import javax.management.MBeanException;
import javax.management.RuntimeOperationsException;
-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.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.jboss.mx.modelmbean.ModelMBeanConstants;
import org.jboss.mx.util.Serialization;
import org.jboss.util.xml.JBossEntityResolver;
Modified: branches/Branch_4_0/jmx/src/main/org/jboss/mx/metadata/JBossXMBean10.java
===================================================================
--- branches/Branch_4_0/jmx/src/main/org/jboss/mx/metadata/JBossXMBean10.java 2006-09-20 22:01:08 UTC (rev 57029)
+++ branches/Branch_4_0/jmx/src/main/org/jboss/mx/metadata/JBossXMBean10.java 2006-09-20 22:02:00 UTC (rev 57030)
@@ -42,8 +42,8 @@
import javax.management.modelmbean.ModelMBeanNotificationInfo;
import javax.management.modelmbean.ModelMBeanOperationInfo;
-import org.dom4j.Attribute;
-import org.dom4j.Element;
+import org.jboss.dom4j.Attribute;
+import org.jboss.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.dom4j.Element) -> element (org.w3c.dom.Element)
+ // descriptor(org.jboss.dom4j.Element) -> element (org.w3c.dom.Element)
try
{
org.w3c.dom.Element element = toW3CElement(descriptor);
@@ -555,7 +555,7 @@
value = editor.getValue();
}
}
- catch (org.dom4j.DocumentException e)
+ catch (org.jboss.dom4j.DocumentException e)
{
throw new JBossNotCompliantMBeanException(
"cannot convert '" + which + "' descriptor to org.w3c.dom.Element", e);
@@ -570,14 +570,14 @@
}
/**
- * Convert org.dom4j.Element->org.w3c.dom.Element
+ * Convert org.jboss.dom4j.Element->org.w3c.dom.Element
*/
- private org.w3c.dom.Element toW3CElement(org.dom4j.Element d4element)
- throws org.dom4j.DocumentException
+ private org.w3c.dom.Element toW3CElement(org.jboss.dom4j.Element d4element)
+ throws org.jboss.dom4j.DocumentException
{
// prepare
- org.dom4j.Document d4doc = org.dom4j.DocumentFactory.getInstance().createDocument();
- org.dom4j.io.DOMWriter d4Writer = new org.dom4j.io.DOMWriter();
+ org.jboss.dom4j.Document d4doc = org.jboss.dom4j.DocumentFactory.getInstance().createDocument();
+ org.jboss.dom4j.io.DOMWriter d4Writer = new org.jboss.dom4j.io.DOMWriter();
// copy
d4doc.setRootElement(d4element.createCopy());
// convert
Modified: branches/Branch_4_0/jmx/src/main/org/jboss/mx/metadata/XMLMetaData.java
===================================================================
--- branches/Branch_4_0/jmx/src/main/org/jboss/mx/metadata/XMLMetaData.java 2006-09-20 22:01:08 UTC (rev 57029)
+++ branches/Branch_4_0/jmx/src/main/org/jboss/mx/metadata/XMLMetaData.java 2006-09-20 22:02:00 UTC (rev 57030)
@@ -30,11 +30,11 @@
import javax.management.MBeanInfo;
import javax.management.NotCompliantMBeanException;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.DocumentType;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
+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.jboss.mx.modelmbean.XMBeanConstants;
import org.jboss.mx.service.ServiceConstants;
import org.jboss.mx.util.JBossNotCompliantMBeanException;
Modified: branches/Branch_4_0/jmx/src/main/org/jboss/mx/modelmbean/XMBean.java
===================================================================
--- branches/Branch_4_0/jmx/src/main/org/jboss/mx/modelmbean/XMBean.java 2006-09-20 22:01:08 UTC (rev 57029)
+++ branches/Branch_4_0/jmx/src/main/org/jboss/mx/modelmbean/XMBean.java 2006-09-20 22:02:00 UTC (rev 57030)
@@ -296,9 +296,9 @@
org.w3c.dom.Document doc = builder.newDocument();
doc.appendChild(doc.importNode(element, true));
- org.dom4j.io.DOMReader domReader = new org.dom4j.io.DOMReader();
- org.dom4j.Document dom4jDoc = domReader.read(doc);
- org.dom4j.Element dom4jElem = dom4jDoc.getRootElement();
+ 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();
dom4jElem.detach();
createXMBean(resource, dom4jElem, version);
}
@@ -309,14 +309,14 @@
}
- public XMBean(Object resource, org.dom4j.Element element, String version) throws MBeanException, NotCompliantMBeanException
+ public XMBean(Object resource, org.jboss.dom4j.Element element, String version) throws MBeanException, NotCompliantMBeanException
{
// this(resource, OBJECT_REF);
createXMBean(resource, element, version);
}
- private void createXMBean(Object resource, org.dom4j.Element element, String version)
+ private void createXMBean(Object resource, org.jboss.dom4j.Element element, String version)
throws MBeanException, NotCompliantMBeanException
{
try
More information about the jboss-cvs-commits
mailing list