[jBoss-Dev] CVS update: jboss/src/main/org/jboss/configurationConfigurationService.java

[jBoss CVS Development]

  User: kimptonc
  Date: 01/03/07 01:46:53

  Modified:    src/main/org/jboss/configuration ConfigurationService.java
  Log:
  changed to use jaxp xml parser and added parser independant xml outputting
  
  Revision  Changes    Path
  1.19      +16 -15    jboss/src/main/org/jboss/configuration/ConfigurationService.java
  
  Index: ConfigurationService.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/configuration/ConfigurationService.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ConfigurationService.java 2001/02/18 21:32:08     1.18
  +++ ConfigurationService.java 2001/03/07 09:46:53     1.19
  @@ -19,17 +19,19 @@
   
   import org.w3c.dom.*;
   import org.xml.sax.*;
  -import com.sun.xml.tree.*;
  +import javax.xml.parsers.*;
   
  +
   import org.jboss.logging.Log;
   import org.jboss.util.ServiceMBeanSupport;
  +import org.jboss.util.XmlHelper;
   
   /**
    *   <description>
    *
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.18 $
  + *   @version $Revision: 1.19 $
    */
   public class ConfigurationService
      extends ServiceMBeanSupport
  @@ -157,8 +159,9 @@
      {
           Writer out = new StringWriter();
   
  -        // Create new ProjectX XML doc
  -        XmlDocument doc = new XmlDocument();
  +        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
  +        DocumentBuilder builder = factory.newDocumentBuilder();
  +        Document doc = builder.newDocument();
   
           Element serverElement = doc.createElement("server");
   
  @@ -201,7 +204,8 @@
           doc.appendChild(serverElement);
   
           // Write configuration
  -        doc.write(out, "UTF-8");
  +        XmlHelper.write(out, doc);
  +
           out.close();
   
           // Return configuration
  @@ -249,14 +253,14 @@
   
          // Parse XML
          Document userConf;
  -       XmlDocumentBuilder xdb = new XmlDocumentBuilder();
  -       Parser parser = new com.sun.xml.parser.Parser();
  -       xdb.setParser(parser);
  +       DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
  +       DocumentBuilder parser = factory.newDocumentBuilder();
  +
   
          try
          {
  -           parser.parse(new InputSource(new StringReader(cfg)));
  -           userConf = xdb.getDocument();
  +           userConf = parser.parse(new InputSource(new StringReader(cfg)));
  +           //userConf = xdb.getDocument();
          }
          catch (SAXException se)
          {
  @@ -276,14 +280,11 @@
   
             // Parse XML
             Document autoConf;
  -          xdb = new XmlDocumentBuilder();
  -          parser = new com.sun.xml.parser.Parser();
  -          xdb.setParser(parser);
   
             try
             {
  -              parser.parse(new InputSource(new StringReader(cfg)));
  -              autoConf = xdb.getDocument();
  +              autoConf = parser.parse(new InputSource(new StringReader(cfg)));
  +              //autoConf = xdb.getDocument();
             }
             catch (SAXException se)
             {