Misuse of typename.

[shibboleth/cpp-xmltooling.git] / xmltooling / util / ReloadableXMLFile.h

diff --git a/xmltooling/util/ReloadableXMLFile.h b/xmltooling/util/ReloadableXMLFile.h
index 345d2aa..cb4c5c3 100644 (file)
--- a/xmltooling/util/ReloadableXMLFile.h
+++ b/xmltooling/util/ReloadableXMLFile.h
@@ -23,13 +23,13 @@
 #ifndef __xmltooling_reloadable_h__
 #define __xmltooling_reloadable_h__
 
+#include <xmltooling/logging.h>
 #include <xmltooling/Lockable.h>
 #include <xmltooling/util/Threads.h>
 
 #include <ctime>
 #include <string>
 #include <xercesc/dom/DOM.hpp>
-#include <log4cpp/Category.hh>
 
 namespace xmltooling {
 
@@ -52,13 +52,13 @@ namespace xmltooling {
          *  <dt>validate</dt>
          *  <dd>use a validating parser</dd>
          *  <dt>reloadChanges</dt>
-         *  <dd>enables monitoring of resources for changes</dd>
+         *  <dd>enables monitoring of local file for changes</dd>
          * </dl>
          * 
          * @param e     DOM to supply configuration
          * @param log   logging object to use
          */
-        ReloadableXMLFile(const xercesc::DOMElement* e, log4cpp::Category& log);
+        ReloadableXMLFile(const xercesc::DOMElement* e, logging::Category& log);
     
         virtual ~ReloadableXMLFile() {
             delete m_lock;
@@ -74,17 +74,10 @@ namespace xmltooling {
          * @return a pair consisting of a flag indicating whether to take ownership of
          *      the document, and the root element of the tree to load
          */
-        virtual std::pair<bool,xercesc::DOMElement*> load();
-        
-        /**
-         * Overrideable method to determine whether a remote resource remains valid.
-         * 
-         * @return  true iff the resource remains valid and should not be reloaded
-         */
-        virtual bool isValid() const {
-            return true;
+        virtual std::pair<bool,xercesc::DOMElement*> load() {
+            return load(false);
         }
-
+        
         /** Root of the original DOM element passed into constructor. */
         const xercesc::DOMElement* m_root;
         
@@ -96,15 +89,21 @@ namespace xmltooling {
         
         /** Resource location, may be a local path or a URI. */
         std::string m_source;
+
+        /** Path to backup copy for remote resources. */
+        std::string m_backing;
         
-        /** Last modification of local resource. */
+        /** Last modification of local resource or reload of remote resource. */
         time_t m_filestamp;
-        
+
+        /** Time in seconds to wait before trying for new copy of remote resource. */
+        time_t m_reloadInterval;
+
         /** Shared lock for guarding reloads. */
         RWLock* m_lock;
         
         /** Logging object. */
-        log4cpp::Category& m_log;
+        logging::Category& m_log;
 
     public:
         Lockable* lock();
@@ -113,6 +112,9 @@ namespace xmltooling {
             if (m_lock)
                 m_lock->unlock();
         }
+
+    private:
+        std::pair<bool,xercesc::DOMElement*> load(bool backup);
     };
 
 };