switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / PPI / ModuleManager.cc

diff --git a/senf/PPI/ModuleManager.cc b/senf/PPI/ModuleManager.cc
index d4733d4..c31145a 100644 (file)
--- a/senf/PPI/ModuleManager.cc
+++ b/senf/PPI/ModuleManager.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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 ModuleManager non-inline non-template implementation */
@@ -27,11 +32,10 @@
 //#include "ModuleManager.ih"
 
 // Custom includes
-#include <senf/Scheduler/Scheduler.hh>
 #include <senf/Utils/membind.hh>
-#include "Module.hh"
 #include <senf/Utils/Console/ParsedCommand.hh>
 #include <senf/Utils/Console/Sysdir.hh>
+#include "Module.hh"
 
 //#include "ModuleManager.mpp"
 #define prefix_
@@ -75,10 +79,10 @@ prefix_ senf::ppi::ModuleManager::ModuleManager()
       initRunner_ ("senf::ppi::init", membind(&ModuleManager::init, this),
                    scheduler::EventHook::PRE, false)
 {
-    senf::console::sysdir().add("ppi", consoleDir_);
+    console::sysdir().add("ppi", consoleDir_);
 
     consoleDir_
-        .add("dump", senf::console::factory::Command(
+        .add("dump", console::factory::Command(
                  senf::membind(&ModuleManager::dumpModules, this))
              .doc("Dump complete PPI structure\n"
                   "The dump will contain one paragraph for each module. The first line gives module\n"