switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / Logger / Config.hh

diff --git a/senf/Utils/Logger/Config.hh b/senf/Utils/Logger/Config.hh
index 9f0f735..adf2c42 100644 (file)
--- a/senf/Utils/Logger/Config.hh
+++ b/senf/Utils/Logger/Config.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 Config public header */
@@ -31,7 +36,7 @@
 
 //#include "Config.mpp"
 #include "Config.ih"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 /** \defgroup config Configuration
 
@@ -77,7 +82,7 @@
     </pre>
 
     All the entries specified via \c SENF_LOG_CONF are applied in a fixed order:
-    
+
     \li First the entries which have both a stream and an area specified are checked
     \li next all entries with area but no stream given are checked
     \li followed by all entries with a given stream but no area
@@ -105,7 +110,7 @@
     consoleLog.route<foo::Transactions, senf::log::IMPORTANT>();
 
     fileLog.route<foo::Transactions>();
-    \endcode 
+    \endcode
     Here we see an already relatively complex setup: All debug messages (that is, those, which are
     not disabled at compile time) are routed to the console. We also route important transactions to
     the console \e except transactions from the \c foo::SomeClass area. The \c fileLog simply
@@ -119,13 +124,13 @@
         enabled \e explicitly by setting \c SENF_LOG_CONF so they can be routed.
 
     \section config_fallback Fallback routing
-    
+
     There are two cases, where this setup may lead to inadvertently lost log messages:
     \li When using a library which does internally use the Logger but not initializing the logger in
         your application.
     \li When log messages are created during initialization of static objects.
     Since no route is set up in these cases, the messages will be dropped.
-    
+
     To counter this problem, the logger is initially in <em>fallback routing</em> state. If any log
     message arrives in this state, the message will be logged to the console if it is above the
     default runtime limit of it's stream. The first routing statement on any target will take the
@@ -152,7 +157,7 @@ namespace senf {
 namespace log {
 
     ///\ingroup config
-    ///\{
+    //\{
 
 #   ifdef DOXYGEN
 
@@ -175,7 +180,7 @@ namespace log {
             <tr><td>name</td>            <td>::= arbitrary C++ identifier</td></tr>
             </table>
 
-        \ref SENF_LOG_CONF is a Boost.Preprocessor style sequence of 3-tuples. 
+        \ref SENF_LOG_CONF is a Boost.Preprocessor style sequence of 3-tuples.
 
         The first tuple element \e optional_stream specifies the stream to match. If this is
         <tt>(_)</tt>, the entry will match any stream.
@@ -195,13 +200,13 @@ namespace log {
 #   endif
 
     /** \brief Check, if logging is enabled for stream/area/level tuple
-        
+
         This is a template meta-function which will check, whether logging to the given combination
         of parameters \a Stream, \a Area and \a Level is compile-time enabled. The logging might
         still be disabled at runtime.
         \code
-        if (senf::log::Enabled<senf::log::Debug, 
-                               senf::log::DefaultArea, 
+        if (senf::log::Enabled<senf::log::Debug,
+                               senf::log::DefaultArea,
                                senf::log::VERBOSE>::value) {
             // ...
         }
@@ -218,11 +223,11 @@ namespace log {
                 >= detail::Config<Stream,Area>::compileLimit::value );
     };
 
-    ///\}
+    //\}
 
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "Config.cci"
 //#include "Config.ct"
 //#include "Config.cti"