Multi-line svn commit, see body.

[shibboleth/cpp-opensaml.git] / saml / saml2 / metadata / impl / XMLMetadataProvider.cpp

diff --git a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
index f1e3bc7..f3f2b39 100644 (file)
--- a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
@@ -29,8 +29,8 @@
 #include <xmltooling/util/ReloadableXMLFile.h>
 
 using namespace opensaml::saml2md;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 #if defined (_MSC_VER)
@@ -45,7 +45,7 @@ namespace opensaml {
         {
         public:
             XMLMetadataProvider(const DOMElement* e)
-                : AbstractMetadataProvider(e), ReloadableXMLFile(e, Category::getInstance(SAML_LOGCAT".MetadataProvider")),
+                : AbstractMetadataProvider(e), ReloadableXMLFile(e, Category::getInstance(SAML_LOGCAT".MetadataProvider.XML")),
                     m_object(NULL) {
             }
             virtual ~XMLMetadataProvider() {
@@ -63,12 +63,8 @@ namespace opensaml {
         protected:
             pair<bool,DOMElement*> load();
 
-            bool isValid() const {
-                const TimeBoundSAMLObject* bound=dynamic_cast<const TimeBoundSAMLObject*>(m_object);
-                return bound ? bound->isValid() : false;
-            }
-
         private:
+            using AbstractMetadataProvider::index;
             void index();
         
             XMLObject* m_object;