Index: src/main/java/org/ow2/petals/jbi/management/util/XMLResult.java
===================================================================
--- src/main/java/org/ow2/petals/jbi/management/util/XMLResult.java	(revision 16370)
+++ src/main/java/org/ow2/petals/jbi/management/util/XMLResult.java	(working copy)
@@ -25,14 +25,13 @@
 import java.io.InputStream;
 
 import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
+import org.ow2.petals.commons.threadlocal.DocumentBuilders;
 import org.w3c.dom.Document;
 
 /**
@@ -304,9 +303,8 @@
      */
     public static void validateManagementMessage(String managementMessage, InputStream xsd)
             throws Exception {
-        DocumentBuilder parser;
-        parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        Document document = parser.parse(new ByteArrayInputStream(managementMessage.getBytes()));
+        Document document = DocumentBuilders.getDefaultDocumentBuilder().parse(
+                new ByteArrayInputStream(managementMessage.getBytes()));
         SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
 
         StreamSource schemaFile = new StreamSource(xsd);
Index: src/main/java/org/ow2/petals/jbi/messaging/endpoint/JBIServiceEndpointImpl.java
===================================================================
--- src/main/java/org/ow2/petals/jbi/messaging/endpoint/JBIServiceEndpointImpl.java	(revision 16370)
+++ src/main/java/org/ow2/petals/jbi/messaging/endpoint/JBIServiceEndpointImpl.java	(working copy)
@@ -18,19 +18,19 @@
  */
 package org.ow2.petals.jbi.messaging.endpoint;
 
+import static org.ow2.petals.jbi.Constants.ENDPOINT_NAME;
+import static org.ow2.petals.jbi.Constants.EPR_NAME;
+import static org.ow2.petals.jbi.Constants.JBI_NAMESPACE;
+import static org.ow2.petals.jbi.Constants.SERVICE_NAME;
+
 import javax.xml.namespace.QName;
 
+import org.ow2.petals.commons.threadlocal.DocumentBuilders;
 import org.ow2.petals.service.ServiceEndpointImpl;
-import org.ow2.petals.util.XMLUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 
-import static org.ow2.petals.jbi.Constants.ENDPOINT_NAME;
-import static org.ow2.petals.jbi.Constants.EPR_NAME;
-import static org.ow2.petals.jbi.Constants.JBI_NAMESPACE;
-import static org.ow2.petals.jbi.Constants.SERVICE_NAME;
-
 /**
  * The JBI implementation of the petals service endpoint
  * 
@@ -58,7 +58,7 @@
      * {@inheritDoc}
      */
     public DocumentFragment getAsReference(QName operationName) {
-        Document doc = XMLUtil.newDocument();
+        Document doc = DocumentBuilders.getNamespaceDocumentBuilder().newDocument();
         if (doc == null) {
             return null;
         }
Index: src/main/java/org/ow2/petals/util/XMLUtil.java
===================================================================
--- src/main/java/org/ow2/petals/util/XMLUtil.java	(revision 16370)
+++ src/main/java/org/ow2/petals/util/XMLUtil.java	(working copy)
@@ -33,9 +33,6 @@
 import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
@@ -45,6 +42,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.ow2.petals.commons.threadlocal.DocumentBuilders;
 import org.ow2.petals.commons.threadlocal.Transformers;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -393,17 +391,12 @@
      */
     public static Document createDocumentFromString(final String xml) {
         Document doc = null;
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setNamespaceAware(true);
-        DocumentBuilder builder;
+
         try {
-            builder = factory.newDocumentBuilder();
             InputStream in = new ByteArrayInputStream(xml.getBytes());
             InputSource inputSource = new InputSource(in);
-            doc = builder.parse(inputSource);
+            doc = DocumentBuilders.getNamespaceDocumentBuilder().parse(inputSource);
             doc.normalize();
-        } catch (ParserConfigurationException e) {
-            LOGGER.log(Level.SEVERE, "Bad XML parser configuration", e);
         } catch (SAXException e) {
             LOGGER.log(Level.SEVERE,
                 "Bad XML fragment can't be transformed to a DOM tree.", e);
@@ -592,49 +585,4 @@
             throw new Exception("Can not write document to output stream");
         }
     }
-
-    /**
-     * Load a document from an input stream.
-     * 
-     * @param inputStream
-     * @return
-     * @throws IOException
-     * @throws SAXException
-     */
-    public static Document loadDocument(InputStream inputStream)
-        throws IOException, SAXException {
-
-        DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory
-            .newInstance();
-        docBuilderFactory.setNamespaceAware(true);
-
-        DocumentBuilder docBuilder = null;
-        try {
-            docBuilder = docBuilderFactory.newDocumentBuilder();
-        } catch (ParserConfigurationException pce) {
-            pce.printStackTrace();
-        }
-
-        Document document = null;
-        try {
-            document = docBuilder.parse(inputStream);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return document;
-    }
-
-    public static Document newDocument() {
-        Document doc = null;
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setNamespaceAware(true);
-        DocumentBuilder builder;
-        try {
-            builder = factory.newDocumentBuilder();
-            doc = builder.newDocument();
-        } catch (ParserConfigurationException e) {
-            LOGGER.log(Level.SEVERE, "Bad XML parser configuration", e);
-        }
-        return doc;
-    }
 }