diff --git a/src/xercesc/dom/deprecated/DOMParser.cpp b/src/xercesc/dom/deprecated/DOMParser.cpp
index 4b1b1d0463ece3aa6731359da4399bd946257a18..26a98ae87b4af3ff1386ef9a5c620622ac7995c8 100644
--- a/src/xercesc/dom/deprecated/DOMParser.cpp
+++ b/src/xercesc/dom/deprecated/DOMParser.cpp
@@ -594,20 +594,6 @@ void DOMParser::resetErrors()
// ---------------------------------------------------------------------------
// DOMParser: Implementation of XMLEntityHandler interface
// ---------------------------------------------------------------------------
-InputSource*
-DOMParser::resolveEntity(const XMLCh* const publicId,
- const XMLCh* const systemId,
- const XMLCh* const /*baseURI*/)
-{
- //
- // Just map it to the SAX entity resolver. If there is not one installed,
- // return a null pointer to cause the default resolution.
- //
- if (fEntityResolver)
- return fEntityResolver->resolveEntity(publicId, systemId);
- return 0;
-}
-
InputSource* DOMParser::resolveEntity(XMLResourceIdentifier* resourceIdentifier)
{
//
diff --git a/src/xercesc/dom/deprecated/DOMParser.hpp b/src/xercesc/dom/deprecated/DOMParser.hpp
index d09001ab64323b701351c1c1e7cebc25cd010bac..220a945d0f07ffcd84cba2c50bd9d8793d9768d0 100644
--- a/src/xercesc/dom/deprecated/DOMParser.hpp
+++ b/src/xercesc/dom/deprecated/DOMParser.hpp
@@ -1258,36 +1258,6 @@ public :
*/
virtual void resetEntities();
- /** Resolve a public/system id
- *
- * This method allows a user installed entity handler to further
- * process any pointers to external entities. The applications can
- * implement 'redirection' via this callback. This method is also
- * borrowed from the SAX specification.
- *
- * @deprecated This method is no longer called (the other resolveEntity one is).
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the user installed resolveEntity
- * method or NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the parser which is
- * responsible to clean up the memory.
- * @see EntityResolver
- * @see XMLEntityHandler
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
/** Resolve a public/system id
*
* This method allows a user installed entity handler to further
diff --git a/src/xercesc/framework/XMLEntityHandler.hpp b/src/xercesc/framework/XMLEntityHandler.hpp
index 179dc8618a85ecae587b0d1a285561d5301607f1..beb15678c0a8aaa3886f21044cb2a92b2b80baa1 100644
--- a/src/xercesc/framework/XMLEntityHandler.hpp
+++ b/src/xercesc/framework/XMLEntityHandler.hpp
@@ -97,33 +97,6 @@ public:
*/
virtual void resetEntities() = 0;
- /**
- * This method allows the entity handler to provide customized
- * application specific entity resolution. This method is defined
- * by SAX 1.0 API.
- *
- * <i>Only one resolveEntity method will be used. If both setEntityResolver and
- * setXMLEntityResolver are called, then the last one is used.</i>
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the SAX resolveEntity method or
- * NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the parser which is
- * responsible to clean up the memory.
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- ) = 0;
-
/**
* This method allows the entity handler to provide customized
* application specific entity resolution.
diff --git a/src/xercesc/parsers/DOMLSParserImpl.cpp b/src/xercesc/parsers/DOMLSParserImpl.cpp
index 4536ed8539980ff1ae1598137993c7d0ede06a47..b5cf9778f2f3948c2d94d9c35aba3677fbf47a9e 100644
--- a/src/xercesc/parsers/DOMLSParserImpl.cpp
+++ b/src/xercesc/parsers/DOMLSParserImpl.cpp
@@ -791,26 +791,6 @@ void DOMLSParserImpl::resetErrors()
// ---------------------------------------------------------------------------
// DOMLSParserImpl: Implementation of XMLEntityHandler interface
// ---------------------------------------------------------------------------
-InputSource*
-DOMLSParserImpl::resolveEntity(const XMLCh* const publicId,
- const XMLCh* const systemId,
- const XMLCh* const baseURI)
-{
- //
- // Just map it to the SAX entity resolver. If there is not one installed,
- // return a null pointer to cause the default resolution.
- //
- if (fEntityResolver) {
-
- DOMLSInput* is = fEntityResolver->resolveResource(0, 0, publicId, systemId, baseURI);
-
- if (is)
- return new (getMemoryManager()) Wrapper4DOMLSInput(is, true, getMemoryManager());
- }
-
- return 0;
-}
-
InputSource*
DOMLSParserImpl::resolveEntity( XMLResourceIdentifier* resourceIdentifier )
{
diff --git a/src/xercesc/parsers/DOMLSParserImpl.hpp b/src/xercesc/parsers/DOMLSParserImpl.hpp
index fc66268e96172877a08bb4c9b3732ba565a5bdaf..fde12929d98cbdfe5e3ec515fa81988c3ee2cce2 100644
--- a/src/xercesc/parsers/DOMLSParserImpl.hpp
+++ b/src/xercesc/parsers/DOMLSParserImpl.hpp
@@ -500,36 +500,6 @@ public :
*/
virtual void resetEntities();
- /** Resolve a public/system id
- *
- * This method allows a user installed entity handler to further
- * process any pointers to external entities. The applications can
- * implement 'redirection' via this callback. This method is also
- * borrowed from the SAX specification.
- *
- * @deprecated This method is no longer called (the other resolveEntity one is).
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the user installed resolveEntity
- * method or NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the DOMLSParser which is
- * responsible to clean up the memory.
- * @see DOMLSResourceResolver
- * @see XMLEntityHandler
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
/** Resolve a public/system id
*
* This method allows a user installed entity handler to further
diff --git a/src/xercesc/parsers/SAX2XMLReaderImpl.cpp b/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
index 60e7499bfa3014bd36227d559dffb5c06b43c520..30adeae483b2ff8c74bfab7183def8f363b4c2ca 100644
--- a/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
+++ b/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
@@ -1125,17 +1125,6 @@ void SAX2XMLReaderImpl::resetEntities()
// Nothing to do for this one
}
-
-InputSource* SAX2XMLReaderImpl::resolveEntity( const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const)
-{
- // Just map to the SAX entity resolver handler
- if (fEntityResolver)
- return fEntityResolver->resolveEntity(publicId, systemId);
- return 0;
-}
-
InputSource* SAX2XMLReaderImpl::resolveEntity(XMLResourceIdentifier* resourceIdentifier)
{
//
diff --git a/src/xercesc/parsers/SAX2XMLReaderImpl.hpp b/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
index b550611fa3687f4a2996b798ed0820af00db02cb..63bd135231630a2f1e28a4bc2f55c02b80677fd1 100644
--- a/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
+++ b/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
@@ -1256,35 +1256,6 @@ public :
*/
virtual void resetEntities();
- /**
- * This method allows a user installed entity handler to further
- * process any pointers to external entities. The applications
- * can implement 'redirection' via this callback. The driver
- * should call the SAX EntityHandler 'resolveEntity' method.
- *
- * @deprecated This method is no longer called (the other resolveEntity one is).
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the SAX resolveEntity method or
- * NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the parser which is
- * responsible to clean up the memory.
- * @see EntityResolver
- * @see XMLEntityHandler
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
/** Resolve a public/system id
*
* This method allows a user installed entity handler to further
diff --git a/src/xercesc/parsers/SAXParser.cpp b/src/xercesc/parsers/SAXParser.cpp
index 2d7735c7de0d95a57d31c09279499021b0f602ed..ea192f83862d4c05d9c1785f936a0ef776594fba 100644
--- a/src/xercesc/parsers/SAXParser.cpp
+++ b/src/xercesc/parsers/SAXParser.cpp
@@ -1207,19 +1207,6 @@ void SAXParser::resetEntities()
// Nothing to do for this one
}
-
-InputSource*
-SAXParser::resolveEntity( const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const)
-{
- // Just map to the SAX entity resolver handler
- if (fEntityResolver)
- return fEntityResolver->resolveEntity(publicId, systemId);
- return 0;
-}
-
-
InputSource*
SAXParser::resolveEntity( XMLResourceIdentifier* resourceIdentifier )
{
diff --git a/src/xercesc/parsers/SAXParser.hpp b/src/xercesc/parsers/SAXParser.hpp
index 961977f756d22d2b5999f6d4cc7892883d2b9d72..76849b95f7622ff9a5c1df9fd756a3f02f549370 100644
--- a/src/xercesc/parsers/SAXParser.hpp
+++ b/src/xercesc/parsers/SAXParser.hpp
@@ -1664,35 +1664,6 @@ public :
*/
virtual void resetEntities();
- /**
- * This method allows a user installed entity handler to further
- * process any pointers to external entities. The applications
- * can implement 'redirection' via this callback. The driver
- * should call the SAX EntityHandler 'resolveEntity' method.
- *
- * @deprecated This method is no longer called (the other resolveEntity one is).
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the SAX resolveEntity method or
- * NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the parser which is
- * responsible to clean up the memory.
- * @see EntityResolver
- * @see XMLEntityHandler
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
/** Resolve a public/system id
*
* This method allows a user installed entity handler to further
diff --git a/src/xercesc/parsers/XercesDOMParser.cpp b/src/xercesc/parsers/XercesDOMParser.cpp
index 86bb7b7cbb97e510bec1d5871224e33c0bed6eb3..7c4ece9a7b2a751edde66daca687ed20ebb98c00 100644
--- a/src/xercesc/parsers/XercesDOMParser.cpp
+++ b/src/xercesc/parsers/XercesDOMParser.cpp
@@ -221,20 +221,6 @@ void XercesDOMParser::resetErrors()
// ---------------------------------------------------------------------------
// XercesDOMParser: Implementation of XMLEntityHandler interface
// ---------------------------------------------------------------------------
-InputSource*
-XercesDOMParser::resolveEntity(const XMLCh* const publicId,
- const XMLCh* const systemId,
- const XMLCh* const)
-{
- //
- // Just map it to the SAX entity resolver. If there is not one installed,
- // return a null pointer to cause the default resolution.
- //
- if (fEntityResolver)
- return fEntityResolver->resolveEntity(publicId, systemId);
- return 0;
-}
-
InputSource*
XercesDOMParser::resolveEntity(XMLResourceIdentifier* resourceIdentifier)
{
diff --git a/src/xercesc/parsers/XercesDOMParser.hpp b/src/xercesc/parsers/XercesDOMParser.hpp
index f581297b45996e8c3a8e11ab4e1ff281c436f74c..d046a214502cea8a313af9f083b62691f2048475 100644
--- a/src/xercesc/parsers/XercesDOMParser.hpp
+++ b/src/xercesc/parsers/XercesDOMParser.hpp
@@ -469,36 +469,6 @@ public :
*/
virtual void resetEntities();
- /** Resolve a public/system id
- *
- * This method allows a user installed entity handler to further
- * process any pointers to external entities. The applications can
- * implement 'redirection' via this callback. This method is also
- * borrowed from the SAX specification.
- *
- * @deprecated This method is no longer called (the other resolveEntity one is).
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the user installed resolveEntity
- * method or NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the parser which is
- * responsible to clean up the memory.
- * @see DOMLSResourceResolver
- * @see XMLEntityHandler
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
/** Resolve a public/system id
*
* This method allows a user installed entity handler to further
diff --git a/src/xercesc/validators/schema/XSDDOMParser.cpp b/src/xercesc/validators/schema/XSDDOMParser.cpp
index 9202562dcb02cbd883e8d169a96e6875a4426f33..fe873e35f4131c3f4b0aa07569f61e285d21f046 100644
--- a/src/xercesc/validators/schema/XSDDOMParser.cpp
+++ b/src/xercesc/validators/schema/XSDDOMParser.cpp
@@ -509,16 +509,6 @@ void XSDDOMParser::error(const unsigned int code
systemId, publicId, lineNum, colNum);
}
-InputSource* XSDDOMParser::resolveEntity(const XMLCh* const publicId,
- const XMLCh* const systemId,
- const XMLCh* const baseURI)
-{
- if (fUserEntityHandler)
- return fUserEntityHandler->resolveEntity(publicId, systemId, baseURI);
-
- return 0;
-}
-
InputSource*
XSDDOMParser::resolveEntity(XMLResourceIdentifier* resourceIdentifier)
{
diff --git a/src/xercesc/validators/schema/XSDDOMParser.hpp b/src/xercesc/validators/schema/XSDDOMParser.hpp
index 9c330c0a46c45dc0232995a1dcd823c8f9107312..ee8979d524b2be8a81e186557a8142a1da430339 100644
--- a/src/xercesc/validators/schema/XSDDOMParser.hpp
+++ b/src/xercesc/validators/schema/XSDDOMParser.hpp
@@ -259,13 +259,6 @@ public :
// -----------------------------------------------------------------------
// XMLEntityHandler interface
// -----------------------------------------------------------------------
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
virtual InputSource* resolveEntity(XMLResourceIdentifier* resourceIdentifier);
protected :