svn commit: r1601240 - /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java

[oh...@apache.org]

Author: oheger
Date: Sun Jun  8 18:25:12 2014
New Revision: 1601240

URL: http://svn.apache.org/r1601240
Log:
XMLConfiguration no longer implements the EntityResolver interface.

The resolveEntity() method has already been deprecated in the 1.x version.
Entities are now exclusively resolved by an external resolver.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java?rev=1601240&r1=1601239&r2=1601240&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java Sun Jun  8 18:25:12 2014
@@ -184,9 +184,8 @@ import org.xml.sax.helpers.DefaultHandle
  * @version $Id$
  */
 public class XMLConfiguration extends BaseHierarchicalConfiguration implements
-        EntityResolver, EntityRegistry, FileBasedConfiguration,
-        FileLocatorAware, InputStreamSupport
-{
+        EntityRegistry, FileBasedConfiguration, FileLocatorAware,
+        InputStreamSupport {
     /**
      * The serial version UID.
      */
@@ -1083,34 +1082,6 @@ public class XMLConfiguration extends Ba
     }
 
     /**
-     * Resolves the requested external entity. This is the default
-     * implementation of the {@code EntityResolver} interface. It checks
-     * the passed in public ID against the registered entity IDs and uses a
-     * local URL if possible.
-     *
-     * @param publicId the public identifier of the entity being referenced
-     * @param systemId the system identifier of the entity being referenced
-     * @return an input source for the specified entity
-     * @throws SAXException if a parsing exception occurs
-     * @since 1.5
-     * @deprecated Use getEntityResolver().resolveEntity()
-     */
-    @Override
-    @Deprecated
-    public InputSource resolveEntity(String publicId, String systemId)
-            throws SAXException
-    {
-        try
-        {
-            return entityResolver.resolveEntity(publicId, systemId);
-        }
-        catch (IOException e)
-        {
-            throw new SAXException(e);
-        }
-    }
-
-    /**
      * Returns a map with the entity IDs that have been registered using the
      * {@code registerEntityId()} method.
      *