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

diff --git a/itl/notification.conf b/itl/notification.conf
index f7dcc6d4d286959b111a1692c238773adde974e4..7df7f8aa958a84ef02a83163b558b34e0536756a 100644 (file)
--- 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 e555a35fa2cbbe8ca44453417fbaa58dd0a6fcee..b75de064612e96c5d883745de4eaa28a68378635 100644 (file)
--- 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 14bbe99018826693ec958434900ddedae98a3c43..5301b6d2a50f41974c73d764f6165227cee8b0f8 100644 (file)
--- 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 1d9a563102f4822da134a5c5ee4bd2e257c07239..a48296458479dcd2f0fb61b9d7489be059e28f78 100644 (file)
--- 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 0269c8b7cf2aba82a4f521b5cd0a1c68a850715e..82754346a1af4c7a37f33dde5b71325cee14e81e 100644 (file)
--- 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 92c39f03f63a7ece74b486f37863c758697a6942..5e38d8465de313c6ebfd1cd66694e190fd8f6b8f 100644 (file)
--- 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 a66a9828914d45c1eb99992027bcc1fdacb41e5f..d7b86976f1203259ede2f1ccf6fbf23a832970bb 100644 (file)
--- 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)