svn commit: r690456 - in /tomcat/sandbox/tomcat-lite/tomcat-coyote/org/apache/tomcat/util: DomUtil.java modeler/modules/MbeansSource.java

[costin]

Author: costin
Date: Fri Aug 29 21:23:04 2008
New Revision: 690456

URL: http://svn.apache.org/viewvc?rev=690456&view=rev
Log:
The xslt was only used there - no need to have a dep on it in.


Modified:
    tomcat/sandbox/tomcat-lite/tomcat-coyote/org/apache/tomcat/util/DomUtil.java
    
tomcat/sandbox/tomcat-lite/tomcat-coyote/org/apache/tomcat/util/modeler/modules/MbeansSource.java

Modified: 
tomcat/sandbox/tomcat-lite/tomcat-coyote/org/apache/tomcat/util/DomUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/tomcat-coyote/org/apache/tomcat/util/DomUtil.java?rev=690456&r1=690455&r2=690456&view=diff
==============================================================================
--- 
tomcat/sandbox/tomcat-lite/tomcat-coyote/org/apache/tomcat/util/DomUtil.java 
(original)
+++ 
tomcat/sandbox/tomcat-lite/tomcat-coyote/org/apache/tomcat/util/DomUtil.java 
Fri Aug 29 21:23:04 2008
@@ -18,18 +18,11 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.StringReader;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -258,13 +251,4 @@
         return doc;
     }
 
-    public static void writeXml( Node n, OutputStream os )
-            throws TransformerException
-    {
-        TransformerFactory tf=TransformerFactory.newInstance();
-        //identity
-        Transformer t=tf.newTransformer();
-        t.setOutputProperty(OutputKeys.INDENT, "yes");
-        t.transform(new DOMSource( n ), new StreamResult( os ));
-    }
 }

Modified: 
tomcat/sandbox/tomcat-lite/tomcat-coyote/org/apache/tomcat/util/modeler/modules/MbeansSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/tomcat-coyote/org/apache/tomcat/util/modeler/modules/MbeansSource.java?rev=690456&r1=690455&r2=690456&view=diff
==============================================================================
--- 
tomcat/sandbox/tomcat-lite/tomcat-coyote/org/apache/tomcat/util/modeler/modules/MbeansSource.java
 (original)
+++ 
tomcat/sandbox/tomcat-lite/tomcat-coyote/org/apache/tomcat/util/modeler/modules/MbeansSource.java
 Fri Aug 29 21:23:04 2008
@@ -19,6 +19,7 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,7 +29,12 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import javax.management.loading.MLet;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -308,7 +314,7 @@
             lastUpdate=time;
             try {
                 FileOutputStream fos=new FileOutputStream(location);
-                DomUtil.writeXml(document, fos);
+                writeXml(document, fos);
             } catch (TransformerException e) {
                 log.error( "Error writing");
             } catch (FileNotFoundException e) {
@@ -316,6 +322,17 @@
             }
         }
     }
+    
+    public static void writeXml( Node n, OutputStream os )
+            throws TransformerException
+    {
+        TransformerFactory tf=TransformerFactory.newInstance();
+        //identity
+        Transformer t=tf.newTransformer();
+        t.setOutputProperty(OutputKeys.INDENT, "yes");
+        t.transform(new DOMSource( n ), new StreamResult( os ));
+    }
+
 
     private void processAttribute(MBeanServer server,
                                   Node descN, String objectName ) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]