Removed ConfigVM class.

diff --git a/components/configfile/configfilecomponent.cpp b/components/configfile/configfilecomponent.cpp
index e094f0b654370c801e175bb3b3ef033f385b642d..073bb0fd5fb6f1dfdc288b76bb0d162a5313762b 100644 (file)
--- a/components/configfile/configfilecomponent.cpp
+++ b/components/configfile/configfilecomponent.cpp
@@ -38,7 +38,14 @@ void ConfigFileComponent::Start(void)
                throw logic_error("Missing 'configFilename' property");
 
        vector<ConfigItem::Ptr> configItems = ConfigCompiler::CompileFile(filename);
-       ConfigVM::ExecuteItems(configItems);
+
+       Application::Log(LogInformation, "configfile", "Executing config items...");
+
+       vector<ConfigItem::Ptr>::iterator it;
+       for (it = configItems.begin(); it != configItems.end(); it++) {
+               ConfigItem::Ptr item = *it;
+               item->Commit();
+       }
 }
 
 void ConfigFileComponent::Stop(void)

diff --git a/dyn/Makefile.am b/dyn/Makefile.am
index f21da81edf9bff1a5c15f08ceea37e86300a6909..31ee61811d2c917caa118ab914c00bd27b06f34c 100644 (file)
--- a/dyn/Makefile.am
+++ b/dyn/Makefile.am
@@ -11,8 +11,6 @@ AM_YFLAGS = -d
 libdyn_la_SOURCES = \
        configcompiler.cpp \
        configcompiler.h \
-       configvm.cpp \
-       configvm.h \
        config_lexer.ll \
        config_parser.yy \
        i2-dyn.h \

diff --git a/dyn/configvm.cpp b/dyn/configvm.cpp
deleted file mode 100644 (file)
index 9a274f8..0000000
--- a/dyn/configvm.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/)        *
- *                                                                            *
- * 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.                     *
- *                                                                            *
- * 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.                               *
- *                                                                            *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
- ******************************************************************************/
-
-#include "i2-dyn.h"
-
-using namespace icinga;
-
-void ConfigVM::ExecuteItems(const vector<ConfigItem::Ptr>& items)
-{
-       vector<ConfigItem::Ptr>::const_iterator it;
-
-       Application::Log(LogInformation, "dyn", "Executing config items...");
-
-       for (it = items.begin(); it != items.end(); it++) {
-               ConfigItem::Ptr obj = *it;
-               obj->Commit();
-       }
-}

diff --git a/dyn/configvm.h b/dyn/configvm.h
deleted file mode 100644 (file)
index b6238b1..0000000
--- a/dyn/configvm.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/)        *
- *                                                                            *
- * 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.                     *
- *                                                                            *
- * 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.                               *
- *                                                                            *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
- ******************************************************************************/
-
-#ifndef CONFIGVM_H
-#define CONFIGVM_H
-
-namespace icinga
-{
-
-class I2_DYN_API ConfigVM
-{
-public:
-       static void ExecuteItems(const vector<ConfigItem::Ptr>& items);
-};
-
-}
-
-#endif /* CONFIGVM_H */

diff --git a/dyn/i2-dyn.h b/dyn/i2-dyn.h
index 3db7e0e93602476e794711ceb0ca2b58e404d0a1..29a201d3637c0827c6e12aefea493cb31c42caab 100644 (file)
--- a/dyn/i2-dyn.h
+++ b/dyn/i2-dyn.h
@@ -49,6 +49,5 @@ using std::endl;
 #include "expressionlist.h"
 #include "configitem.h"
 #include "configcompiler.h"
-#include "configvm.h"
 
 #endif /* I2DYN_H */