X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FtestServer.cc;h=fe42969cf94a8ee1cdfce41a28105fdc8f808ef9;hb=259da4c692259311c6ec99566b57f5ed1e68e93e;hp=f0d500ed02f70a78707a5d88c047cf726c9245f5;hpb=9c0078ac0054789badff2a987364ed0448b080ef;p=senf.git

diff --git a/Console/testServer.cc b/Console/testServer.cc
index f0d500e..fe42969 100644
--- a/Console/testServer.cc
+++ b/Console/testServer.cc
@@ -30,7 +30,7 @@
 #include <iostream>
 #include "Server.hh"
 #include "Node.hh"
-#include "ObjectDirectory.hh"
+#include "ScopedDirectory.hh"
 #include "../Scheduler/Scheduler.hh"
 #include "../Utils/Logger/SenfLog.hh"
 
@@ -40,13 +40,13 @@
 
 namespace {
     
-    void fn(std::ostream & output, 
-            senf::console::CommandNode::Arguments const & arguments) {
-        senf::console::CommandNode::Arguments::iterator i (arguments.begin());
-        senf::console::CommandNode::Arguments::iterator i_end (arguments.end());
+    void fn(std::ostream & output, senf::console::ParseCommandInfo const & command) {
+        typedef senf::console::ParseCommandInfo::ArgumentsRange::iterator iterator;
+        iterator i (command.arguments().begin());
+        iterator i_end (command.arguments().end());
         for (; i != i_end; ++i) {
-            senf::console::CommandNode::Arguments::value_type::iterator j (i->begin());
-            senf::console::CommandNode::Arguments::value_type::iterator j_end (i->end());
+            iterator::value_type::iterator j (i->begin());
+            iterator::value_type::iterator j_end (i->end());
             for (; j != j_end; ++j) 
                 output << j->value() << ' ';
         }
@@ -55,38 +55,53 @@ namespace {
 
     struct TestObject
     {
-        senf::console::ObjectDirectory<TestObject> dir;
+        senf::console::ScopedDirectory<TestObject> dir;
 
         TestObject() : dir(this) {
             dir.add("blub", &TestObject::blub)
                 .doc("Example of a member function");
         }
         
-        void blub(std::ostream & output, senf::console::CommandNode::Arguments const & args) {
+        void blub(std::ostream & output, senf::console::ParseCommandInfo const &) {
             output << "blub\n";
         }
     };
 
+    void shutdownServer(std::ostream &, senf::console::ParseCommandInfo const &)
+    {
+        senf::Scheduler::instance().terminate();
+        throw senf::console::Executor::ExitException();
+    }
+
 }
 
 int main(int, char const **)
 {
     senf::log::ConsoleTarget::instance().route< senf::SenfLog, senf::log::NOTICE >();
 
-    senf::console::root().doc("This is the console test application");
-    senf::console::root().mkdir("network")
+    senf::console::root()
+        .doc("This is the console test application");
+    senf::console::root()
+        .mkdir("network")
         .doc("Network related settings");
-    senf::console::root()["network"].mkdir("eth0")
+    senf::console::root()["network"]
+        .mkdir("eth0")
         .doc("Ethernet device eth0");
-    senf::console::root().mkdir("server");
-    senf::console::root()["network"].add("route", &fn)
+    senf::console::root()
+        .mkdir("server");
+    senf::console::root()["server"]
+        .add("shutdown", &shutdownServer)
+        .doc("Terminate server application");
+    senf::console::root()["network"]
+        .add("route", &fn)
         .doc("Example of a directly registered function");
 
     TestObject test;
-    senf::console::root().add("testob", test.dir)
+    senf::console::root()
+        .add("testob", test.dir)
         .doc("Example of an instance directory");
 
-    senf::console::Server::start( senf::INet4SocketAddress("127.0.0.1:23232") )
+    senf::console::Server::start( senf::INet4SocketAddress("0.0.0.0:23232") )
         .name("testServer");
 
     senf::Scheduler::instance().process();