Index: src/main/java/org/exolab/castor/tools/MappingTool.java
===================================================================
--- src/main/java/org/exolab/castor/tools/MappingTool.java	(Revision 6909)
+++ src/main/java/org/exolab/castor/tools/MappingTool.java	(Arbeitskopie)
@@ -262,7 +262,7 @@
                 xmlClass = _introspector.generateClassDescriptor( cls );
                 introspected = true;
             } else {
-                xmlClass = _resolver.resolveXML( cls );
+                xmlClass = (XMLClassDescriptor) _resolver.resolve( cls );
                 introspected = Introspector.introspected(xmlClass);
             }
         } catch ( Exception except ) {
Index: src/main/java/org/exolab/castor/xml/XMLMappingLoader.java
===================================================================
--- src/main/java/org/exolab/castor/xml/XMLMappingLoader.java	(Revision 6909)
+++ src/main/java/org/exolab/castor/xml/XMLMappingLoader.java	(Arbeitskopie)
@@ -282,7 +282,7 @@
             //-- check compiled descriptors 
             if (_cdResolver == null) { createResolver(); }
             try {
-                referenceDesc = _cdResolver.resolveXML(type);
+                referenceDesc = (XMLClassDescriptor) _cdResolver.resolve(type);
             } catch (ResolverException rx) {
                 throw new MappingException(rx);
             }
Index: src/main/java/org/exolab/castor/xml/XMLClassDescriptorResolver.java
===================================================================
--- src/main/java/org/exolab/castor/xml/XMLClassDescriptorResolver.java	(Revision 6909)
+++ src/main/java/org/exolab/castor/xml/XMLClassDescriptorResolver.java	(Arbeitskopie)
@@ -53,6 +53,7 @@
 
 import java.util.Iterator;
 
+
 /**
  * An interface for finding or "resolving" XMLClassDescriptor classes.
  * 
@@ -68,13 +69,12 @@
  */
 public interface XMLClassDescriptorResolver extends ClassDescriptorResolver {
     
-    /**
-     * Returns the XMLClassDescriptor for the given class
-     * @param type the Class to find the XMLClassDescriptor for
-     * @return the XMLClassDescriptor for the given class
-    **/
-    XMLClassDescriptor resolveXML(Class type) 
-        throws ResolverException;
+//    /**
+//     * Returns the XMLClassDescriptor for the given class
+//     * @param type the Class to find the XMLClassDescriptor for
+//     * @return the XMLClassDescriptor for the given class
+//    **/
+//    ClassDescriptor resolve(Class type) throws ResolverException;
     
     /**
      * Returns the XMLClassDescriptor for the given class name
Index: src/main/java/org/exolab/castor/xml/UnmarshalHandler.java
===================================================================
--- src/main/java/org/exolab/castor/xml/UnmarshalHandler.java	(Revision 6909)
+++ src/main/java/org/exolab/castor/xml/UnmarshalHandler.java	(Arbeitskopie)
@@ -3387,7 +3387,7 @@
 
 
         try {
-            classDesc = _cdResolver.resolveXML(_class);
+            classDesc = (XMLClassDescriptor) _cdResolver.resolve(_class);
         }
         catch(ResolverException rx) {
             // TODO
Index: src/main/java/org/exolab/castor/xml/Validator.java
===================================================================
--- src/main/java/org/exolab/castor/xml/Validator.java	(Revision 6909)
+++ src/main/java/org/exolab/castor/xml/Validator.java	(Arbeitskopie)
@@ -105,7 +105,7 @@
 
         if (! MarshalFramework.isPrimitive(object.getClass())) {
             try {
-                classDesc = context.getResolver().resolveXML(object.getClass());
+                classDesc = (XMLClassDescriptor) context.getResolver().resolve(object.getClass());
             } catch (ResolverException rx) {
                 throw new ValidationException(rx);
             }
Index: src/main/java/org/exolab/castor/xml/Marshaller.java
===================================================================
--- src/main/java/org/exolab/castor/xml/Marshaller.java	(Revision 6909)
+++ src/main/java/org/exolab/castor/xml/Marshaller.java	(Arbeitskopie)
@@ -2224,7 +2224,7 @@
 
         try {
             if (!isPrimitive(_class))
-                classDesc = _cdResolver.resolveXML(_class);
+                classDesc = (XMLClassDescriptor) _cdResolver.resolve(_class);
         }
         catch(ResolverException rx) {
             Throwable actual = rx.getCause();
Index: src/main/java/org/exolab/castor/xml/util/XMLClassDescriptorResolverImpl.java
===================================================================
--- src/main/java/org/exolab/castor/xml/util/XMLClassDescriptorResolverImpl.java	(Revision 6909)
+++ src/main/java/org/exolab/castor/xml/util/XMLClassDescriptorResolverImpl.java	(Arbeitskopie)
@@ -153,9 +153,9 @@
     /**
      * {@inheritDoc}
      *
-     * @see org.exolab.castor.xml.XMLClassDescriptorResolver#resolveXML(java.lang.Class)
+     * @see org.exolab.castor.xml.XMLClassDescriptorResolver#resolve(java.lang.Class)
      */
-    public XMLClassDescriptor resolveXML(Class type) throws ResolverException {
+    public ClassDescriptor resolve(Class type) throws ResolverException {
         if (type == null) {
             return null;
         }
@@ -188,15 +188,6 @@
     /**
      * {@inheritDoc}
      *
-     * @see org.exolab.castor.xml.ClassDescriptorResolver#resolve(java.lang.Class)
-     */
-    public ClassDescriptor resolve(Class type) throws ResolverException {
-        return resolveXML(type);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
      * @see org.exolab.castor.xml.XMLClassDescriptorResolver#resolve(java.lang.String)
      */
     public XMLClassDescriptor resolve(String className) throws ResolverException {