switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / PPI / DebugModules.hh

diff --git a/senf/PPI/DebugModules.hh b/senf/PPI/DebugModules.hh
index 27212c6..00e65c8 100644 (file)
--- a/senf/PPI/DebugModules.hh
+++ b/senf/PPI/DebugModules.hh
@@ -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 DebugModules public header */
@@ -28,14 +33,13 @@
 
 // Custom includes
 #include <deque>
-#include "../Utils/safe_bool.hh"
-#include "../Packets/Packets.hh"
+#include <senf/Utils/safe_bool.hh>
 #include "MonitorModule.hh"
 #include "ActiveFeeder.hh"
-#include "../Utils/Logger/SenfLog.hh"
+#include <senf/Utils/Logger/SenfLog.hh>
 
 //#include "DebugModules.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace ppi {
@@ -186,18 +190,18 @@ namespace debug {
 
     private:
         void request();
-        
+
         Queue packets_;
     };
 
     /** \brief Active, queue-based packet source
 
-        The ActiveFeederSource contains a packet queue containing the packets to be precessed. These
+        The ActiveFeederSource contains a packet queue containing the packets to be processed. These
         packets are actively fed into the network when it is run with senf::ppi::run() until it is
         empty, when senf::ppi::run() will return.
 
         \note senf::ppi::run will return as soon as no events are active. If want you want is to
-            precess a set of packets placed into the ActiveFeederSource queue you must make sure,
+            Process a set of packets placed into the ActiveFeederSource queue you must make sure,
             that eventually all events in the module are disabled by throttling or other
             activities. Otherwise, senf::ppi::run() will \e not return.
 
@@ -263,7 +267,7 @@ namespace debug {
 
     /** \brief Log received packets
 
-        This module will log all packets sent to it's input using SENF_LOG to the given log
+        This module will %log all packets sent to it's input using SENF_LOG to the given %log
         \a Stream, \a Area and \a Level.
      */
     template < class Stream = log::Debug,
@@ -285,7 +289,7 @@ namespace debug {
 
 }}}}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "DebugModules.cci"
 //#include "DebugModules.ct"
 #include "DebugModules.cti"