app component inherits from core component. OamModule uses name instead of class...

[anna.git] / include / anna / app / Component.hpp

diff --git a/include/anna/app/Component.hpp b/include/anna/app/Component.hpp
index eeed898..33198d8 100644 (file)
--- a/include/anna/app/Component.hpp
+++ b/include/anna/app/Component.hpp
@@ -1,47 +1,16 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// http://redmine.teslayout.com/projects/anna-suite
-//
-// 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 the copyright holder 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_app_Component_hpp
 #define anna_app_Component_hpp
 
 #include <vector>
-
-#include <anna/core/RuntimeException.hpp>
-#include <anna/core/mt/Mutex.hpp>
-
+#include <anna/core/util/Component.hpp>
 #include <anna/app/Application.hpp>
 
 namespace anna {
@@ -72,19 +41,13 @@ namespace app {
    Si el componente \em 'Clase' no hubiera sido registrado (instanciado) en nuestra aplicacion el metodo
    template anna::component lanzara una excepcion.
 */
-class Component : public Mutex {
+class Component : public anna::Component {
 public:
   /**
      Destructor.
   */
   virtual ~Component();
 
-  /**
-     Class name given in constructor.
-     \return El nombre de la clase indicado en el constructor.
-  */
-  const char* getClassName() const throw() { return a_className.c_str(); }
-
   /**
      Conecta explicitamente este componente con la aplicacion. Sera necesario invocar a este metodo
      cuando instanciemos un componentes despues de comenzar la ejecucion de nuestra aplicacion y
@@ -157,7 +120,6 @@ protected:
 private:
   typedef std::vector <std::string>::iterator iterator;
 
-  const std::string a_className;
   State::_v a_state;
   std::vector <std::string> a_predecessors;