Merge remote-tracking branch 'origin/master' into rewrite-filter

[metaproxy-moved-to-github.git] / src / ex_router_flexml.cpp

diff --git a/src/ex_router_flexml.cpp b/src/ex_router_flexml.cpp
index d5637a6..7916540 100644 (file)
--- a/src/ex_router_flexml.cpp
+++ b/src/ex_router_flexml.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2008 Index Data
+   Copyright (C) 2005-2013 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
@@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <iostream>
 #include <stdexcept>
 
-#include "filter.hpp"
-#include "package.hpp"
+#include <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
 #include "router_flexml.hpp"
 #include "factory_static.hpp"
 
@@ -32,13 +32,13 @@ namespace mp = metaproxy_1;
 
 int main(int argc, char **argv)
 {
-    try 
+    try
     {
         int ret;
         char *arg;
         char *fname = 0;
 
-        while ((ret = options("h{help}c{config}:", 
+        while ((ret = options("h{help}c{config}:",
                               argv, argc, &arg)) != -2)
         {
             switch(ret)
@@ -74,10 +74,10 @@ int main(int argc, char **argv)
         if (doc)
         {
             mp::FactoryStatic factory;
-            mp::RouterFleXML router(doc, factory, false);
+            mp::RouterFleXML router(doc, factory, false, 0);
 
            mp::Package pack;
-        
+
             pack.router(router).move();
 
             xmlFreeDoc(doc);
@@ -95,8 +95,9 @@ int main(int argc, char **argv)
 /*
  * 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
  */
+