[icinga-checkins] icinga.org: icinga2/master: Removed the native:: prefix for built-in functions.

git at icinga.org git at icinga.org
Fri Feb 15 12:41:42 CET 2013


Module: icinga2
Branch: master
Commit: efd108982a86868a47b5af83fc2a8ffc8eb0b29d
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=efd108982a86868a47b5af83fc2a8ffc8eb0b29d

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Fri Feb 15 12:41:32 2013 +0100

Removed the native:: prefix for built-in functions.

---

 itl/notification.conf                 |    2 +-
 itl/service.conf                      |    4 ++--
 itl/types.conf                        |    4 ++--
 lib/config/configtype.cpp             |    2 +-
 lib/icinga/host.cpp                   |    2 +-
 lib/icinga/nullchecktask.cpp          |    2 +-
 lib/icinga/pluginnotificationtask.cpp |    2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/itl/notification.conf b/itl/notification.conf
index f7dcc6d..7df7f8a 100644
--- a/itl/notification.conf
+++ b/itl/notification.conf
@@ -19,6 +19,6 @@
 
 abstract object Notification "plugin-notification" {
 	methods = {
-		notify = "native::PluginNotification"
+		notify = "PluginNotification"
 	}
 }
diff --git a/itl/service.conf b/itl/service.conf
index e555a35..b75de06 100644
--- a/itl/service.conf
+++ b/itl/service.conf
@@ -27,12 +27,12 @@ abstract object Service "itl-service" {
 
 abstract object Service "null-service" inherits "itl-service" {
 	methods = {
-		check = "native::NullCheck"
+		check = "NullCheck"
 	}
 }
 
 abstract object Service "plugin-service" inherits "itl-service" {
 	methods = {
-		check = "native::PluginCheck"
+		check = "PluginCheck"
 	}
 }
diff --git a/itl/types.conf b/itl/types.conf
index 14bbe99..5301b6d 100644
--- a/itl/types.conf
+++ b/itl/types.conf
@@ -31,7 +31,7 @@ type DynamicObject {
 	%attribute string "__type",
 
 	%attribute dictionary "methods" {
-		%validator "native::ValidateMethods",
+		%validator "ValidateMethods",
 
 		%attribute string "*",
 	},
@@ -68,7 +68,7 @@ type Host {
 		}
 	},
 	%attribute dictionary "services" {
-		%validator "native::ValidateServiceDictionary",
+		%validator "ValidateServiceDictionary",
 
 		%attribute string "*",
 		%attribute dictionary "*" {
diff --git a/lib/config/configtype.cpp b/lib/config/configtype.cpp
index 1d9a563..a482964 100644
--- a/lib/config/configtype.cpp
+++ b/lib/config/configtype.cpp
@@ -21,7 +21,7 @@
 
 using namespace icinga;
 
-REGISTER_SCRIPTFUNCTION("native::ValidateMethods", &ConfigType::ValidateMethods);
+REGISTER_SCRIPTFUNCTION("ValidateMethods", &ConfigType::ValidateMethods);
 
 ConfigType::ConfigType(const String& name, const DebugInfo& debuginfo)
 	: m_Name(name), m_RuleList(boost::make_shared<TypeRuleList>()), m_DebugInfo(debuginfo)
diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 0269c8b..8275434 100644
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -24,7 +24,7 @@ using namespace icinga;
 map<String, map<String, weak_ptr<Service> > > Host::m_ServicesCache;
 bool Host::m_ServicesCacheValid = true;
 
-REGISTER_SCRIPTFUNCTION("native::ValidateServiceDictionary", &Host::ValidateServiceDictionary);
+REGISTER_SCRIPTFUNCTION("ValidateServiceDictionary", &Host::ValidateServiceDictionary);
 
 static AttributeDescription hostAttributes[] = {
 	{ "slave_services", Attribute_Transient }
diff --git a/lib/icinga/nullchecktask.cpp b/lib/icinga/nullchecktask.cpp
index 92c39f0..5e38d84 100644
--- a/lib/icinga/nullchecktask.cpp
+++ b/lib/icinga/nullchecktask.cpp
@@ -21,7 +21,7 @@
 
 using namespace icinga;
 
-REGISTER_SCRIPTFUNCTION("native::NullCheck",  &NullCheckTask::ScriptFunc);
+REGISTER_SCRIPTFUNCTION("NullCheck",  &NullCheckTask::ScriptFunc);
 
 void NullCheckTask::ScriptFunc(const ScriptTask::Ptr& task, const vector<Value>& arguments)
 {
diff --git a/lib/icinga/pluginnotificationtask.cpp b/lib/icinga/pluginnotificationtask.cpp
index a66a982..d7b8697 100644
--- a/lib/icinga/pluginnotificationtask.cpp
+++ b/lib/icinga/pluginnotificationtask.cpp
@@ -21,7 +21,7 @@
 
 using namespace icinga;
 
-REGISTER_SCRIPTFUNCTION("native::PluginNotification",  &PluginNotificationTask::ScriptFunc);
+REGISTER_SCRIPTFUNCTION("PluginNotification",  &PluginNotificationTask::ScriptFunc);
 
 PluginNotificationTask::PluginNotificationTask(const ScriptTask::Ptr& task, const Process::Ptr& process,
     const String& service, const String& command)





More information about the icinga-checkins mailing list