X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frouter_flexml.hpp;h=9b5d890361a0fdf5550361d08897b62778f84815;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=9b779efc7f968ac38a25837e04b5890b74b57598;hpb=637a685d61a9ff0e3f398a59da426979815c4d68;p=metaproxy-moved-to-github.git

diff --git a/src/router_flexml.hpp b/src/router_flexml.hpp
index 9b779ef..9b5d890 100644
--- a/src/router_flexml.hpp
+++ b/src/router_flexml.hpp
@@ -1,7 +1,5 @@
-/* $Id: router_flexml.hpp,v 1.17 2007-05-09 21:23:09 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,15 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Metaproxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #ifndef ROUTER_FLEXML_HPP
 #define ROUTER_FLEXML_HPP
 
-#include "router.hpp"
+#include <metaproxy/router.hpp>
 
 #include "factory_filter.hpp"
 
@@ -30,37 +27,37 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <boost/scoped_ptr.hpp>
 
-namespace metaproxy_1 
+namespace metaproxy_1
 {
-    class RouterFleXML : public metaproxy_1::Router 
+    class RouterFleXML : public metaproxy_1::Router
     {
         class Rep;
         class Route;
         class Pos;
     public:
-        RouterFleXML(std::string xmlconf, metaproxy_1::FactoryFilter &factory);
-        RouterFleXML(xmlDocPtr doc, metaproxy_1::FactoryFilter &factory);
-        
+        RouterFleXML(std::string xmlconf, metaproxy_1::FactoryFilter &factory,
+            bool test_only);
+        RouterFleXML(xmlDocPtr doc, metaproxy_1::FactoryFilter &factory,
+                     bool test_only, const char *file_include_path);
+
         ~RouterFleXML();
 
         virtual RoutePos *createpos() const;
-        class XMLError1 : public std::runtime_error {
-        public:
-            XMLError1(const std::string msg) :
-                std::runtime_error("XMLError : " + msg) {} ;
-        };
+        void start();
+        void stop(int signo);
     private:
         boost::scoped_ptr<Rep> m_p;
     };
- 
+
 };
 #endif
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+