X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FEventManager.cc;h=40f1a760fd981d0d20bbf3eac3a70fd1d3311346;hb=refs%2Fheads%2Fmaster;hp=ddd4e2393c5d410427c071db83ac9ca62016bdb2;hpb=7661548b20e6c7627f54bff87e0758396fd523ef;p=senf.git

diff --git a/senf/Scheduler/EventManager.cc b/senf/Scheduler/EventManager.cc
index ddd4e23..40f1a76 100644
--- a/senf/Scheduler/EventManager.cc
+++ b/senf/Scheduler/EventManager.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program 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 Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief EventManager non-inline non-template implementation */
@@ -31,7 +36,7 @@
 #include <senf/Utils/membind.hh>
 #include <senf/Utils/Console/ScopedDirectory.hh>
 #include <senf/Utils/Console/ParsedCommand.hh>
-#include <senf/Utils/Console/Sysdir.hh>
+#include "ConsoleDir.hh"
 #include "FIFORunner.hh"
 
 //#include "EventManager.mpp"
@@ -41,8 +46,8 @@
 prefix_ senf::scheduler::detail::EventManager::EventManager()
 {
 #ifndef SENF_DISABLE_CONSOLE
-    consoleDir_().add("events", senf::console::factory::Command(
-                          senf::membind(&EventManager::listEvents, this))
+    consoleDir().add("events", console::factory::Command(
+            membind(&EventManager::listEvents, this))
         .doc("List all scheduler events sorted by priority\n"
              "\n"
              "Columns:\n"
@@ -60,8 +65,6 @@ prefix_ senf::scheduler::detail::EventManager::EventManager()
              "              -  event disabled\n"
              "    INFO    further event specific information")
         );
-
-    senf::console::sysdir().add("scheduler", consoleDir_());
 #endif
 }