Index: src/test/java/org/ow2/petals/jbi/component/mock/MockEndpointRegistry.java
===================================================================
--- src/test/java/org/ow2/petals/jbi/component/mock/MockEndpointRegistry.java	(revision 15487)
+++ src/test/java/org/ow2/petals/jbi/component/mock/MockEndpointRegistry.java	(working copy)
@@ -259,7 +259,7 @@
         return null;
     }
 
-    public Document getDescription(String serviceName, String endpointName) {
+    public String getDescription(String serviceName, String endpointName) {
         return null;
     }
 
@@ -346,7 +346,7 @@
     /**
      * {@inheritDoc}
      */
-    public Document getEndpointDescriptorForEndpoint(
+    public String getEndpointDescriptorForEndpoint(
             org.ow2.petals.jbi.messaging.endpoint.ServiceEndpoint endpoint)
             throws RegistryException {
         // TODO Auto-generated method stub
Index: src/test/java/org/ow2/petals/jbi/messaging/routing/mock/MockEndpointRegistry.java
===================================================================
--- src/test/java/org/ow2/petals/jbi/messaging/routing/mock/MockEndpointRegistry.java	(revision 15487)
+++ src/test/java/org/ow2/petals/jbi/messaging/routing/mock/MockEndpointRegistry.java	(working copy)
@@ -178,7 +178,7 @@
         return null;
     }
 
-    public Document getDescription(String serviceName, String endpointName) {
+    public String getDescription(String serviceName, String endpointName) {
         return null;
     }
 
@@ -272,7 +272,7 @@
     /**
      * {@inheritDoc}
      */
-    public Document getEndpointDescriptorForEndpoint(
+    public String getEndpointDescriptorForEndpoint(
             org.ow2.petals.jbi.messaging.endpoint.ServiceEndpoint endpoint)
             throws RegistryException {
         // TODO Auto-generated method stub
Index: src/main/java/org/ow2/petals/jbi/messaging/registry/BaseEndpointRegistry.java
===================================================================
--- src/main/java/org/ow2/petals/jbi/messaging/registry/BaseEndpointRegistry.java	(revision 15487)
+++ src/main/java/org/ow2/petals/jbi/messaging/registry/BaseEndpointRegistry.java	(working copy)
@@ -284,7 +284,7 @@
     /**
      * {@inheritDoc}
      */
-    public Document getEndpointDescriptorForEndpoint(ServiceEndpoint endpoint)
+    public String getEndpointDescriptorForEndpoint(ServiceEndpoint endpoint)
             throws org.ow2.petals.jbi.messaging.registry.RegistryException {
 
         if (this.log.isDebugEnabled()) {
@@ -296,19 +296,16 @@
         if (endpoint == null) {
             throw new org.ow2.petals.jbi.messaging.registry.RegistryException("Null endpoint");
         }
-        Document result = endpoint.getDescription();
-        if (result == null) {
+//        Document result = endpoint.getDescription();
+//        if (result == null) {
             // try to get the endpoint from the registry
             try {
                 Endpoint e = this.client.get(this.getKey(endpoint), true);
-                if ((e != null) && (e.getDescription() != null)) {
-                    result = XMLUtil.createDocumentFromString(e.getDescription());
-                }
+                return (e == null) ? null : e.getDescription();
             } catch (RegistryException e) {
                 throw new org.ow2.petals.jbi.messaging.registry.RegistryException(e.getMessage());
             }
-        }
-        return result;
+//        }
     }
 
     public ServiceEndpoint[] getExternalEndpointsForInterface(QName interfaceName)
@@ -565,7 +562,7 @@
     /**
      * {@inheritDoc}
      */
-    public Document getDescription(String serviceName, String endpointName)
+    public String getDescription(String serviceName, String endpointName)
             throws org.ow2.petals.jbi.messaging.registry.RegistryException {
 
         if (this.log.isDebugEnabled()) {
Index: src/main/java/org/ow2/petals/jbi/messaging/registry/EndpointRegistry.java
===================================================================
--- src/main/java/org/ow2/petals/jbi/messaging/registry/EndpointRegistry.java	(revision 15487)
+++ src/main/java/org/ow2/petals/jbi/messaging/registry/EndpointRegistry.java	(working copy)
@@ -162,7 +162,7 @@
      *            non null
      * @return Document the DOM representation of the descriptor (WSDL)
      */
-    Document getEndpointDescriptorForEndpoint(ServiceEndpoint endpoint) throws RegistryException;
+    String getEndpointDescriptorForEndpoint(ServiceEndpoint endpoint) throws RegistryException;
 
     /**
      * Return the interfaces for the specified endpoint. This will get this
Index: src/main/java/org/ow2/petals/jbi/messaging/registry/EndpointRegistryMBean.java
===================================================================
--- src/main/java/org/ow2/petals/jbi/messaging/registry/EndpointRegistryMBean.java	(revision 15487)
+++ src/main/java/org/ow2/petals/jbi/messaging/registry/EndpointRegistryMBean.java	(working copy)
@@ -191,5 +191,5 @@
      * @throws Exception
      *             if an error occurs during endpoint description retrieval
      */
-    Document getDescription(String serviceName, String endpointName) throws JBIException;
+    String getDescription(String serviceName, String endpointName) throws JBIException;
 }