Changed LICENSE. Now referenced to web site and file on project root directory

[anna.git] / include / anna / core / core.hpp

diff --git a/include/anna/core/core.hpp b/include/anna/core/core.hpp
index 6e76863..f9d8165 100644 (file)
--- a/include/anna/core/core.hpp
+++ b/include/anna/core/core.hpp
@@ -1,47 +1,19 @@
-// ANNA - Anna is Not 'N' Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #ifndef anna_core_core_hpp
 #define anna_core_core_hpp
 
 /**
-Proporciona las clases y patrones de desarrollo básico, que podrían ser utilizados por cualquier
-aplicación y/o plataforma.
+Proporciona las clases y patrones de desarrollo b�sico, que podr�an ser utilizados por cualquier
+aplicaci�n y/o plataforma.
 
-El ejecutable deberá enlazarse con la librería: libanna.core.a
+El ejecutable deber� enlazarse con la librer�a: libanna.core.a
 
 El <b>Packet Header</b> es anna.h
 
@@ -54,7 +26,7 @@ namespace anna {}
 #include <anna/core/Allocator.hpp>
 #include <anna/core/AutoPointer.hpp>
 #include <anna/core/Cloneable.hpp>
-#include <anna/core/Configuration.hpp>
+#include <anna/core/util/Configuration.hpp>
 #include <anna/core/define.autoenum.hpp>
 #include <anna/core/Exception.hpp>
 #include <anna/core/functions.hpp>
@@ -79,10 +51,8 @@ namespace anna {}
 #include <anna/core/oam/Handler.hpp>
 #include <anna/core/oam/Module.hpp>
 #include <anna/core/oam/Counter.hpp>
-#include <anna/core/oam/CounterManager.hpp>
 #include <anna/core/oam/CounterRecorder.hpp>
 #include <anna/core/oam/CounterScope.hpp>
-#include <anna/core/oam/CounterSummarizer.hpp>
 #include <anna/core/tracing/Configuration.hpp>
 #include <anna/core/tracing/Logger.hpp>
 #include <anna/core/tracing/TraceFunction.hpp>