Remove the replication feature and clean up the code.

components/Makefile.am

@@ -4,9 +4,7 @@
 SUBDIRS = \
 	checker \
 	compat \
-	delegation \
 	demo \
 	ido_mysql \
 	livestatus \
-	notification \
-	replication
+	notification

components/checker/checkercomponent.cpp

@@ -18,29 +18,24 @@
  ******************************************************************************/
 
 #include "checker/checkercomponent.h"
-#include "remoting/endpointmanager.h"
 #include "base/dynamictype.h"
 #include "base/objectlock.h"
+#include "base/utility.h"
 #include "base/logger_fwd.h"
 #include <boost/exception/diagnostic_information.hpp>
+#include <boost/foreach.hpp>
 
 using namespace icinga;
 
 REGISTER_TYPE(CheckerComponent);
 
-CheckerComponent::CheckerComponent(const Dictionary::Ptr& serializedUpdate)
-	: DynamicObject(serializedUpdate)
-{ }
-
 void CheckerComponent::Start(void)
 {
-	m_Endpoint = Endpoint::MakeEndpoint("checker", false);
+	DynamicObject::Start();
 
-	/* dummy registration so the delegation module knows this is a checker
-	   TODO: figure out a better way for this */
-	m_Endpoint->RegisterSubscription("checker");
+	DynamicObject::OnStarted.connect(bind(&CheckerComponent::ObjectStartedHandler, this, _1));
+	DynamicObject::OnStopped.connect(bind(&CheckerComponent::ObjectStoppedHandler, this, _1));
 
-	Service::OnCheckerChanged.connect(bind(&CheckerComponent::CheckerChangedHandler, this, _1));
 	Service::OnNextCheckChanged.connect(bind(&CheckerComponent::NextCheckChangedHandler, this, _1));
 
 	m_Stopped = false;
@@ -51,12 +46,15 @@ void CheckerComponent::Start(void)
 	m_ResultTimer->SetInterval(5);
 	m_ResultTimer->OnTimerExpired.connect(boost::bind(&CheckerComponent::ResultTimerHandler, this));
 	m_ResultTimer->Start();
+
+	BOOST_FOREACH(const Service::Ptr& service, DynamicType::GetObjects<Service>()) {
+		if (service->IsActive())
+			ObjectStartedHandler(service);
+	}
 }
 
 void CheckerComponent::Stop(void)
 {
-	m_Endpoint->Unregister();
-
 	{
 		boost::mutex::scoped_lock lock(m_Mutex);
 		m_Stopped = true;
@@ -83,7 +81,7 @@ void CheckerComponent::CheckThreadProc(void)
 		CheckTimeView::iterator it = idx.begin();
 		Service::Ptr service = *it;
 
-		if (!service->IsRegistered()) {
+		if (!service->IsActive()) {
 			idx.erase(it);
 			continue;
 		}
@@ -191,19 +189,34 @@ void CheckerComponent::ResultTimerHandler(void)
 	Log(LogInformation, "checker", msgbuf.str());
 }
 
-void CheckerComponent::CheckerChangedHandler(const Service::Ptr& service)
+void CheckerComponent::ObjectStartedHandler(const DynamicObject::Ptr& object)
 {
-	boost::mutex::scoped_lock lock(m_Mutex);
+	if (object->GetType() != DynamicType::GetByName("Service"))
+		return;
 
-	String checker = service->GetCurrentChecker();
+	Service::Ptr service = static_pointer_cast<Service>(object);
+
+	{
+		boost::mutex::scoped_lock lock(m_Mutex);
 
-	if (checker == EndpointManager::GetInstance()->GetIdentity() || Endpoint::GetByName(checker) == m_Endpoint) {
 		if (m_PendingServices.find(service) != m_PendingServices.end())
 			return;
 
 		m_IdleServices.insert(service);
 		m_CV.notify_all();
-	} else {
+	}
+}
+
+void CheckerComponent::ObjectStoppedHandler(const DynamicObject::Ptr& object)
+{
+	if (object->GetType() != DynamicType::GetByName("Service"))
+		return;
+
+	Service::Ptr service = static_pointer_cast<Service>(object);
+
+	{
+		boost::mutex::scoped_lock lock(m_Mutex);
+
 		m_IdleServices.erase(service);
 		m_PendingServices.erase(service);
 		m_CV.notify_all();

components/checker/checkercomponent.h

@@ -73,14 +73,10 @@ public:
 		>
 	> ServiceSet;
 
-	CheckerComponent(const Dictionary::Ptr& serializedUpdate);
-
 	virtual void Start(void);
 	virtual void Stop(void);
 
 private:
-	Endpoint::Ptr m_Endpoint;
-
 	boost::mutex m_Mutex;
 	boost::condition_variable m_CV;
 	bool m_Stopped;
@@ -98,7 +94,8 @@ private:
 
 	void AdjustCheckTimer(void);
 
-	void CheckerChangedHandler(const Service::Ptr& service);
+	void ObjectStartedHandler(const DynamicObject::Ptr& object);
+	void ObjectStoppedHandler(const DynamicObject::Ptr& object);
 	void NextCheckChangedHandler(const Service::Ptr& service);
 
 	void RescheduleCheckTimer(void);

components/compat/checkresultreader.cpp

@@ -33,12 +33,6 @@ using namespace icinga;
 
 REGISTER_TYPE(CheckResultReader);
 
-CheckResultReader::CheckResultReader(const Dictionary::Ptr& properties)
-	: DynamicObject(properties)
-{
-	RegisterAttribute("spool_dir", Attribute_Config, &m_SpoolDir);
-}
-
 /**
  * @threadsafety Always.
  */
@@ -50,16 +44,6 @@ void CheckResultReader::Start(void)
 	m_ReadTimer->Start();
 }
 
-/**
- * @threadsafety Always.
- */
-CheckResultReader::Ptr CheckResultReader::GetByName(const String& name)
-{
-	DynamicObject::Ptr configObject = DynamicObject::GetObject("CheckResultReader", name);
-
-	return dynamic_pointer_cast<CheckResultReader>(configObject);
-}
-
 /**
  * @threadsafety Always.
  */
@@ -96,7 +80,7 @@ void CheckResultReader::ProcessCheckResultFile(const String& path) const
 		if (line.empty() || line[0] == '#')
 			continue; /* Ignore comments and empty lines. */
 
-		int pos = line.find_first_of('=');
+		size_t pos = line.find_first_of('=');
 
 		if (pos == std::string::npos)
 			continue; /* Ignore invalid lines. */
@@ -149,3 +133,19 @@ void CheckResultReader::ProcessCheckResultFile(const String& path) const
 		service->SetNextCheck(Utility::GetTime() + service->GetCheckInterval());
 	}
 }
+
+void CheckResultReader::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
+{
+	DynamicObject::InternalSerialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config)
+		bag->Set("spool_dir", m_SpoolDir);
+}
+
+void CheckResultReader::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
+{
+	DynamicObject::InternalDeserialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config)
+		m_SpoolDir = bag->Get("spool_dir");
+}

components/compat/checkresultreader.h

@@ -37,18 +37,18 @@ class CheckResultReader : public DynamicObject
 {
 public:
 	DECLARE_PTR_TYPEDEFS(CheckResultReader);
-
-	CheckResultReader(const Dictionary::Ptr& properties);
-
-	static CheckResultReader::Ptr GetByName(const String& name);
+	DECLARE_TYPENAME(CheckResultReader);
 
 	String GetSpoolDir(void) const;
 
 protected:
 	virtual void Start(void);
 
+	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
+	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
+
 private:
-	Attribute<String> m_SpoolDir;
+	String m_SpoolDir;
 
 	Timer::Ptr m_ReadTimer;
 	void ReadTimerHandler(void) const;

components/compat/compatcomponent.cpp

@@ -56,6 +56,8 @@ REGISTER_TYPE(CompatComponent);
  */
 void CompatComponent::Start(void)
 {
+	DynamicObject::Start();
+
 	m_StatusTimer = boost::make_shared<Timer>();
 	m_StatusTimer->SetInterval(15);
 	m_StatusTimer->OnTimerExpired.connect(boost::bind(&CompatComponent::StatusTimerHandler, this));
@@ -75,11 +77,10 @@ void CompatComponent::Start(void)
  */
 String CompatComponent::GetStatusPath(void) const
 {
-	Value statusPath = m_StatusPath;
-	if (statusPath.IsEmpty())
+	if (m_StatusPath.IsEmpty())
 		return Application::GetLocalStateDir() + "/cache/icinga2/status.dat";
 	else
-		return statusPath;
+		return m_StatusPath;
 }
 
 /**
@@ -89,11 +90,10 @@ String CompatComponent::GetStatusPath(void) const
  */
 String CompatComponent::GetObjectsPath(void) const
 {
-	Value objectsPath = m_ObjectsPath;
-	if (objectsPath.IsEmpty())
+	if (m_ObjectsPath.IsEmpty())
 		return Application::GetLocalStateDir() + "/cache/icinga2/objects.cache";
 	else
-		return objectsPath;
+		return m_ObjectsPath;
 }
 
 /**
@@ -103,20 +103,12 @@ String CompatComponent::GetObjectsPath(void) const
  */
 String CompatComponent::GetCommandPath(void) const
 {
-	Value commandPath = m_CommandPath;
-	if (commandPath.IsEmpty())
+	if (m_CommandPath.IsEmpty())
 		return Application::GetLocalStateDir() + "/run/icinga2/icinga2.cmd";
 	else
-		return commandPath;
+		return m_CommandPath;
 }
 
-CompatComponent::CompatComponent(const Dictionary::Ptr& serializedUpdate)
-	: DynamicObject(serializedUpdate)
-{
-	RegisterAttribute("status_path", Attribute_Config, &m_StatusPath);
-	RegisterAttribute("objects_path", Attribute_Config, &m_ObjectsPath);
-	RegisterAttribute("command_path", Attribute_Config, &m_CommandPath);
-}
 
 #ifndef _WIN32
 void CompatComponent::CommandPipeThread(const String& commandPath)
@@ -240,7 +232,7 @@ void CompatComponent::DumpTimePeriod(std::ostream& fp, const TimePeriod::Ptr& tp
 	   << "\t" << "timeperiod_name" << "\t" << tp->GetName() << "\n"
 	   << "\t" << "alias" << "\t" << tp->GetName() << "\n";
 
-	Dictionary::Ptr ranges = tp->Get("ranges");
+	Dictionary::Ptr ranges = tp->GetRanges();
 
 	if (ranges) {
 		ObjectLock olock(ranges);
@@ -426,12 +418,12 @@ void CompatComponent::DumpServiceStatusAttrs(std::ostream& fp, const Service::Pt
 	fp << "\t" << "check_command=" << attrs->Get("check_command") << "\n"
 	   << "\t" << "event_handler=" << attrs->Get("event_handler") << "\n"
 	   << "\t" << "check_period=" << attrs->Get("check_period") << "\n"
-	   << "\t" << "check_interval=" << attrs->Get("check_interval") << "\n"
-	   << "\t" << "retry_interval=" << attrs->Get("retry_interval") << "\n"
+	   << "\t" << "check_interval=" << static_cast<double>(attrs->Get("check_interval")) << "\n"
+	   << "\t" << "retry_interval=" << static_cast<double>(attrs->Get("retry_interval")) << "\n"
 	   << "\t" << "has_been_checked=" << attrs->Get("has_been_checked") << "\n"
 	   << "\t" << "should_be_scheduled=" << attrs->Get("should_be_scheduled") << "\n"
-	   << "\t" << "check_execution_time=" << attrs->Get("check_execution_time") << "\n"
-	   << "\t" << "check_latency=" << attrs->Get("check_latency") << "\n"
+	   << "\t" << "check_execution_time=" << static_cast<double>(attrs->Get("check_execution_time")) << "\n"
+	   << "\t" << "check_latency=" << static_cast<double>(attrs->Get("check_latency")) << "\n"
 	   << "\t" << "current_state=" << attrs->Get("current_state") << "\n"
 	   << "\t" << "state_type=" << attrs->Get("state_type") << "\n"
 	   << "\t" << "plugin_output=" << attrs->Get("plugin_output") << "\n"
@@ -642,9 +634,7 @@ void CompatComponent::StatusTimerHandler(void)
 		 << "# This file is auto-generated. Do not modify this file." << "\n"
 		 << "\n";
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Host")) {
-		Host::Ptr host = static_pointer_cast<Host>(object);
-
+	BOOST_FOREACH(const Host::Ptr& host, DynamicType::GetObjects<Host>()) {
 		std::ostringstream tempstatusfp;
 		tempstatusfp << std::fixed;
 		DumpHostStatus(tempstatusfp, host);
@@ -656,9 +646,7 @@ void CompatComponent::StatusTimerHandler(void)
 		objectfp << tempobjectfp.str();
 	}
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("HostGroup")) {
-		HostGroup::Ptr hg = static_pointer_cast<HostGroup>(object);
-
+	BOOST_FOREACH(const HostGroup::Ptr& hg, DynamicType::GetObjects<HostGroup>()) {
 		std::ostringstream tempobjectfp;
 		tempobjectfp << std::fixed;
 
@@ -675,9 +663,7 @@ void CompatComponent::StatusTimerHandler(void)
 		objectfp << tempobjectfp.str();
 	}
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Service")) {
-		Service::Ptr service = static_pointer_cast<Service>(object);
-
+	BOOST_FOREACH(const Service::Ptr& service, DynamicType::GetObjects<Service>()) {
 		std::ostringstream tempstatusfp;
 		tempstatusfp << std::fixed;
 		DumpServiceStatus(tempstatusfp, service);
@@ -689,9 +675,7 @@ void CompatComponent::StatusTimerHandler(void)
 		objectfp << tempobjectfp.str();
 	}
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("ServiceGroup")) {
-		ServiceGroup::Ptr sg = static_pointer_cast<ServiceGroup>(object);
-
+	BOOST_FOREACH(const ServiceGroup::Ptr& sg, DynamicType::GetObjects<ServiceGroup>()) {
 		std::ostringstream tempobjectfp;
 		tempobjectfp << std::fixed;
 
@@ -721,9 +705,7 @@ void CompatComponent::StatusTimerHandler(void)
 		objectfp << tempobjectfp.str();
 	}
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("User")) {
-		User::Ptr user = static_pointer_cast<User>(object);
-
+	BOOST_FOREACH(const User::Ptr& user, DynamicType::GetObjects<User>()) {
 		std::ostringstream tempobjectfp;
 		tempobjectfp << std::fixed;
 
@@ -740,9 +722,7 @@ void CompatComponent::StatusTimerHandler(void)
 		objectfp << tempobjectfp.str();
 	}
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("UserGroup")) {
-		UserGroup::Ptr ug = static_pointer_cast<UserGroup>(object);
-
+	BOOST_FOREACH(const UserGroup::Ptr& ug, DynamicType::GetObjects<UserGroup>()) {
 		std::ostringstream tempobjectfp;
 		tempobjectfp << std::fixed;
 
@@ -758,27 +738,19 @@ void CompatComponent::StatusTimerHandler(void)
 		objectfp << tempobjectfp.str();
 	}
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("CheckCommand")) {
-		Command::Ptr command = static_pointer_cast<Command>(object);
-
+	BOOST_FOREACH(const Command::Ptr& command, DynamicType::GetObjects<CheckCommand>()) {
 		DumpCommand(objectfp, command);
 	}
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("NotificationCommand")) {
-		Command::Ptr command = static_pointer_cast<Command>(object);
-
+	BOOST_FOREACH(const Command::Ptr& command, DynamicType::GetObjects<NotificationCommand>()) {
 		DumpCommand(objectfp, command);
 	}
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("EventCommand")) {
-		Command::Ptr command = static_pointer_cast<Command>(object);
-
+	BOOST_FOREACH(const Command::Ptr& command, DynamicType::GetObjects<EventCommand>()) {
 		DumpCommand(objectfp, command);
 	}
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("TimePeriod")) {
-		TimePeriod::Ptr tp = static_pointer_cast<TimePeriod>(object);
-
+	BOOST_FOREACH(const TimePeriod::Ptr& tp, DynamicType::GetObjects<TimePeriod>()) {
 		DumpTimePeriod(objectfp, tp);
 	}
 
@@ -806,3 +778,25 @@ void CompatComponent::StatusTimerHandler(void)
 		    << boost::errinfo_file_name(objectspathtmp));
 	}
 }
+
+void CompatComponent::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
+{
+	DynamicObject::InternalSerialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config) {
+		bag->Set("status_path", m_StatusPath);
+		bag->Set("objects_path", m_ObjectsPath);
+		bag->Set("command_path", m_CommandPath);
+	}
+}
+
+void CompatComponent::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
+{
+	DynamicObject::InternalDeserialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config) {
+		m_StatusPath = bag->Get("status_path");
+		m_ObjectsPath = bag->Get("objects_path");
+		m_CommandPath = bag->Get("command_path");
+	}
+}

components/compat/compatcomponent.h

@@ -42,14 +42,16 @@ class CompatComponent : public DynamicObject
 public:
 	DECLARE_PTR_TYPEDEFS(CompatComponent);
 
-	CompatComponent(const Dictionary::Ptr& serializedUpdate);
-
+protected:
 	virtual void Start(void);
 
+	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
+	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
+
 private:
-	Attribute<String> m_StatusPath;
-	Attribute<String> m_ObjectsPath;
-	Attribute<String> m_CommandPath;
+	String m_StatusPath;
+	String m_ObjectsPath;
+	String m_CommandPath;
 
 #ifndef _WIN32
 	boost::thread m_CommandThread;

components/compat/compatlog.cpp

@@ -18,12 +18,9 @@
  ******************************************************************************/
 
 #include "compat/compatlog.h"
-#include "icinga/checkresultmessage.h"
-#include "icinga/downtimemessage.h"
 #include "icinga/service.h"
 #include "icinga/checkcommand.h"
 #include "icinga/notification.h"
-#include "icinga/notificationmessage.h"
 #include "icinga/macroprocessor.h"
 #include "config/configcompilercontext.h"
 #include "base/dynamictype.h"
@@ -43,33 +40,16 @@ using namespace icinga;
 REGISTER_TYPE(CompatLog);
 REGISTER_SCRIPTFUNCTION(ValidateRotationMethod, &CompatLog::ValidateRotationMethod);
 
-CompatLog::CompatLog(const Dictionary::Ptr& serializedUpdate)
-	: DynamicObject(serializedUpdate), m_LastRotation(0)
-{
-	RegisterAttribute("log_dir", Attribute_Config, &m_LogDir);
-	RegisterAttribute("rotation_method", Attribute_Config, &m_RotationMethod);
-}
-
-/**
- * @threadsafety Always.
- */
-void CompatLog::OnAttributeChanged(const String& name)
-{
-	ASSERT(!OwnsLock());
-
-	if (name == "rotation_method")
-		ScheduleNextRotation();
-}
+CompatLog::CompatLog(void)
+	: m_LastRotation(0)
+{ }
 
 /**
  * @threadsafety Always.
  */
 void CompatLog::Start(void)
 {
-	m_Endpoint = Endpoint::MakeEndpoint("compatlog_" + GetName(), false);
-	m_Endpoint->RegisterTopicHandler("checker::CheckResult",
-	    boost::bind(&CompatLog::CheckResultRequestHandler, this, _3));
-
+	Service::OnNewCheckResult.connect(bind(&CompatLog::CheckResultHandler, this, _1, _2));
 	Service::OnDowntimeChanged.connect(bind(&CompatLog::DowntimeHandler, this, _1, _2));
 	Service::OnNotificationSentChanged.connect(bind(&CompatLog::NotificationSentHandler, this, _1, _2, _3, _4, _5, _6));
 	Service::OnFlappingChanged.connect(bind(&CompatLog::FlappingHandler, this, _1, _2));
@@ -82,16 +62,6 @@ void CompatLog::Start(void)
 	ScheduleNextRotation();
 }
 
-/**
- * @threadsafety Always.
- */
-CompatLog::Ptr CompatLog::GetByName(const String& name)
-{
-	DynamicObject::Ptr configObject = DynamicObject::GetObject("CompatLog", name);
-
-	return dynamic_pointer_cast<CompatLog>(configObject);
-}
-
 /**
  * @threadsafety Always.
  */
@@ -117,24 +87,13 @@ String CompatLog::GetRotationMethod(void) const
 /**
  * @threadsafety Always.
  */
-void CompatLog::CheckResultRequestHandler(const RequestMessage& request)
+void CompatLog::CheckResultHandler(const Service::Ptr& service, const Dictionary::Ptr &cr)
 {
-	CheckResultMessage params;
-	if (!request.GetParams(&params))
-		return;
-
-	String svcname = params.GetService();
-	Service::Ptr service = Service::GetByName(svcname);
-
 	Host::Ptr host = service->GetHost();
 
 	if (!host)
 		return;
 
-	Dictionary::Ptr cr = params.GetCheckResult();
-	if (!cr)
-		return;
-
 	Dictionary::Ptr vars_after = cr->Get("vars_after");
 
 	long state_after = vars_after->Get("state");
@@ -273,7 +232,7 @@ void CompatLog::DowntimeHandler(const Service::Ptr& service, DowntimeState downt
 /**
  * @threadsafety Always.
  */
-void CompatLog::NotificationSentHandler(const Service::Ptr& service, const String& username,
+void CompatLog::NotificationSentHandler(const Service::Ptr& service, const User::Ptr& user,
 		NotificationType const& notification_type, Dictionary::Ptr const& cr,
 		const String& author, const String& comment_text)
 {
@@ -310,7 +269,7 @@ void CompatLog::NotificationSentHandler(const Service::Ptr& service, const Strin
 
         std::ostringstream msgbuf;
         msgbuf << "SERVICE NOTIFICATION: "
-		<< username << ";"
+		<< user->GetName() << ";"
                 << host->GetName() << ";"
                 << service->GetShortName() << ";"
                 << notification_type_str << " "
@@ -327,7 +286,7 @@ void CompatLog::NotificationSentHandler(const Service::Ptr& service, const Strin
         if (service == host->GetHostCheckService()) {
                 std::ostringstream msgbuf;
                 msgbuf << "HOST NOTIFICATION: "
-			<< username << ";"
+			<< user->GetName() << ";"
                         << host->GetName() << ";"
                 	<< notification_type_str << " "
 			<< "(" << Service::StateToString(service->GetState()) << ");"
@@ -463,9 +422,7 @@ void CompatLog::ReopenFile(bool rotate)
 	WriteLine("LOG ROTATION: " + GetRotationMethod());
 	WriteLine("LOG VERSION: 2.0");
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Host")) {
-		Host::Ptr host = static_pointer_cast<Host>(object);
-
+	BOOST_FOREACH(const Host::Ptr& host, DynamicType::GetObjects<Host>()) {
 		Service::Ptr hc = host->GetHostCheckService();
 
 		if (!hc)
@@ -486,9 +443,7 @@ void CompatLog::ReopenFile(bool rotate)
 		WriteLine(msgbuf.str());
 	}
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Service")) {
-		Service::Ptr service = static_pointer_cast<Service>(object);
-
+	BOOST_FOREACH(const Service::Ptr& service, DynamicType::GetObjects<Service>()) {
 		Host::Ptr host = service->GetHost();
 
 		if (!host)
@@ -580,7 +535,27 @@ void CompatLog::ValidateRotationMethod(const String& location, const Dictionary:
 
 	if (!rotation_method.IsEmpty() && rotation_method != "HOURLY" && rotation_method != "DAILY" &&
 	    rotation_method != "WEEKLY" && rotation_method != "MONTHLY" && rotation_method != "NONE") {
-		ConfigCompilerContext::GetContext()->AddError(false, "Validation failed for " +
+		ConfigCompilerContext::GetInstance()->AddError(false, "Validation failed for " +
 		    location + ": Rotation method '" + rotation_method + "' is invalid.");
 	}
 }
+
+void CompatLog::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
+{
+	DynamicObject::InternalSerialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config) {
+		bag->Set("log_dir", m_LogDir);
+		bag->Set("rotation_method", m_RotationMethod);
+	}
+}
+
+void CompatLog::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
+{
+	DynamicObject::InternalDeserialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config) {
+		m_LogDir = bag->Get("log_dir");
+		m_RotationMethod = bag->Get("rotation_method");
+	}
+}

components/compat/compatlog.h

@@ -38,10 +38,9 @@ class CompatLog : public DynamicObject
 {
 public:
 	DECLARE_PTR_TYPEDEFS(CompatLog);
+	DECLARE_TYPENAME(CompatLog);
 
-	CompatLog(const Dictionary::Ptr& serializedUpdate);
-
-	static CompatLog::Ptr GetByName(const String& name);
+	CompatLog(void);
 
 	String GetLogDir(void) const;
 	String GetRotationMethod(void) const;
@@ -49,22 +48,23 @@ public:
 	static void ValidateRotationMethod(const String& location, const Dictionary::Ptr& attrs);
 
 protected:
-	virtual void OnAttributeChanged(const String& name);
 	virtual void Start(void);
 
+	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
+	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
+
 private:
-	Attribute<String> m_LogDir;
-	Attribute<String> m_RotationMethod;
+	String m_LogDir;
+	String m_RotationMethod;
 
 	double m_LastRotation;
 
 	void WriteLine(const String& line);
 	void Flush(void);
 
-	Endpoint::Ptr m_Endpoint;
-	void CheckResultRequestHandler(const RequestMessage& request);
+	void CheckResultHandler(const Service::Ptr& service, const Dictionary::Ptr& cr);
 	void DowntimeHandler(const Service::Ptr& service, DowntimeState downtime_state);
-	void NotificationSentHandler(const Service::Ptr& service, const String& username, NotificationType const& notification_type, Dictionary::Ptr const& cr, const String& author, const String& comment_text);
+	void NotificationSentHandler(const Service::Ptr& service, const User::Ptr& user, NotificationType const& notification_type, Dictionary::Ptr const& cr, const String& author, const String& comment_text);
 	void FlappingHandler(const Service::Ptr& service, FlappingState flapping_state);
 
 	Timer::Ptr m_RotationTimer;

components/delegation/.gitignore

@@ -1 +0,0 @@
-delegation-type.cpp

components/delegation/Makefile.am

@@ -1,37 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-pkglib_LTLIBRARIES = \
-	libdelegation.la
-
-EXTRA_DIST = \
-	delegation-type.conf
-
-.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
-	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
-
-libdelegation_la_SOURCES = \
-	delegationcomponent.cpp \
-	delegationcomponent.h \
-	delegation-type.cpp
-
-libdelegation_la_CPPFLAGS = \
-	$(LTDLINCL) \
-	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/lib \
-	-I${top_srcdir}/components
-
-libdelegation_la_LDFLAGS = \
-	$(BOOST_LDFLAGS) \
-	-module \
-	-no-undefined \
-	@RELEASE_INFO@ \
-	@VERSION_INFO@
-
-libdelegation_la_LIBADD = \
-	$(BOOST_SIGNALS_LIB) \
-	$(BOOST_THREAD_LIB) \
-	$(BOOST_SYSTEM_LIB) \
-	${top_builddir}/lib/base/libbase.la \
-	${top_builddir}/lib/config/libconfig.la \
-	${top_builddir}/lib/remoting/libremoting.la \
-	${top_builddir}/lib/icinga/libicinga.la

components/delegation/delegation-type.conf

@@ -1,21 +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.             *
- ******************************************************************************/
-
-type DelegationComponent {
-}

components/delegation/delegation.vcxproj

@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{17C93245-8C20-4316-9573-1AE41D918C10}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>delegation</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="delegation-type.cpp" />
-    <ClCompile Include="delegationcomponent.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="delegationcomponent.h" />
-    <ClInclude Include="i2-delegation.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="delegation-type.conf">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Preparing config fragment for embedding</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-    </CustomBuild>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

components/delegation/delegation.vcxproj.filters

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Quelldateien">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headerdateien">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="delegationcomponent.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="delegation-type.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="delegationcomponent.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="i2-delegation.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="delegation-type.conf">
-      <Filter>Quelldateien</Filter>
-    </CustomBuild>
-  </ItemGroup>
-</Project>

components/delegation/delegationcomponent.cpp

@@ -1,221 +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 "delegation/delegationcomponent.h"
-#include "remoting/endpointmanager.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include <algorithm>
-#include "base/dynamictype.h"
-#include <boost/foreach.hpp>
-#include <boost/tuple/tuple.hpp>
-
-using namespace icinga;
-
-REGISTER_TYPE(DelegationComponent);
-
-DelegationComponent::DelegationComponent(const Dictionary::Ptr& serializedUpdate)
-	: DynamicObject(serializedUpdate)
-{ }
-
-void DelegationComponent::Start(void)
-{
-	m_DelegationTimer = boost::make_shared<Timer>();
-
-	m_DelegationTimer->SetInterval(30);
-	m_DelegationTimer->OnTimerExpired.connect(boost::bind(&DelegationComponent::DelegationTimerHandler, this));
-	m_DelegationTimer->Start();
-	m_DelegationTimer->Reschedule(Utility::GetTime() + 10);
-}
-
-bool DelegationComponent::IsEndpointChecker(const Endpoint::Ptr& endpoint)
-{
-	return (endpoint->HasSubscription("checker"));
-}
-
-std::set<Endpoint::Ptr> DelegationComponent::GetCheckerCandidates(const Service::Ptr& service) const
-{
-	std::set<Endpoint::Ptr> candidates;
-
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Endpoint")) {
-		Endpoint::Ptr endpoint = dynamic_pointer_cast<Endpoint>(object);
-		String myIdentity = EndpointManager::GetInstance()->GetIdentity();
-
-		/* ignore local-only endpoints (unless this is a local-only instance) */
-		if (endpoint->IsLocal() && !myIdentity.IsEmpty())
-			continue;
-
-		/* ignore disconnected endpoints */
-		if (!endpoint->IsConnected() && endpoint->GetName() != myIdentity)
-			continue;
-
-		/* ignore endpoints that aren't running the checker component */
-		if (!IsEndpointChecker(endpoint))
-			continue;
-
-		/* ignore endpoints that aren't allowed to check this service */
-		if (!service->IsAllowedChecker(endpoint->GetName()))
-			continue;
-
-		candidates.insert(endpoint);
-	}
-
-	return candidates;
-}
-
-void DelegationComponent::DelegationTimerHandler(void)
-{
-	std::map<Endpoint::Ptr, int> histogram;
-
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Endpoint")) {
-		Endpoint::Ptr endpoint = dynamic_pointer_cast<Endpoint>(object);
-
-		histogram[endpoint] = 0;
-	}
-
-	std::vector<Service::Ptr> services;
-
-	/* build "checker -> service count" histogram */
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Service")) {
-		Service::Ptr service = dynamic_pointer_cast<Service>(object);
-
-		if (!service)
-			continue;
-
-		services.push_back(service);
-
-		String checker = service->GetCurrentChecker();
-
-		if (checker.IsEmpty())
-			continue;
-
-		Endpoint::Ptr endpoint = Endpoint::GetByName(checker);
-
-		if (!endpoint)
-			continue;
-
-		histogram[endpoint]++;
-	}
-
-	int delegated = 0;
-
-	/* re-assign services */
-	BOOST_FOREACH(const Service::Ptr& service, services) {
-		String checker = service->GetCurrentChecker();
-
-		Endpoint::Ptr oldEndpoint = Endpoint::GetByName(checker);
-
-		std::set<Endpoint::Ptr> candidates = GetCheckerCandidates(service);
-
-		int avg_services = 0, overflow_tolerance = 0;
-		std::vector<Endpoint::Ptr>::iterator cit;
-
-		if (!candidates.empty()) {
-#ifdef _DEBUG
-			std::ostringstream msgbuf;
-			msgbuf << "Service: " << service->GetName() << ", candidates: " << candidates.size();
-			Log(LogDebug, "delegation", msgbuf.str());
-#endif /* _DEBUG */
-
-			BOOST_FOREACH(const Endpoint::Ptr& candidate, candidates) {
-				avg_services += histogram[candidate];
-			}
-
-			avg_services /= candidates.size();
-			overflow_tolerance = candidates.size() * 2;
-		}
-
-		/* don't re-assign service if the checker is still valid
-		 * and doesn't have too many services */
-
-		if (oldEndpoint && oldEndpoint->IsConnected() &&
-		    candidates.find(oldEndpoint) != candidates.end() &&
-		    histogram[oldEndpoint] <= avg_services + overflow_tolerance)
-			continue;
-
-		/* clear the service's current checker */
-		if (!checker.IsEmpty()) {
-			{
-				ObjectLock olock(service);
-				service->SetCurrentChecker("");
-			}
-
-			if (oldEndpoint)
-				histogram[oldEndpoint]--;
-		}
-
-		/* find a new checker for the service */
-		BOOST_FOREACH(const Endpoint::Ptr& candidate, candidates) {
-			/* does this checker already have too many services */
-			if (histogram[candidate] > avg_services)
-				continue;
-
-			{
-				ObjectLock olock(service);
-				service->SetCurrentChecker(candidate->GetName());
-			}
-
-			histogram[candidate]++;
-
-			/* reschedule the service; this avoids "check floods"
-			 * when a lot of services are re-assigned that haven't
-			 * been checked recently. */
-			service->UpdateNextCheck();
-
-			delegated++;
-
-			break;
-		}
-
-		if (candidates.empty()) {
-			if (service->GetState() != StateUncheckable && service->GetEnableActiveChecks()) {
-				Dictionary::Ptr cr = boost::make_shared<Dictionary>();
-
-				double now = Utility::GetTime();
-				cr->Set("schedule_start", now);
-				cr->Set("schedule_end", now);
-				cr->Set("execution_start", now);
-				cr->Set("execution_end", now);
-
-				cr->Set("state", StateUncheckable);
-				cr->Set("output", "No checker is available for this service.");
-
-				service->ProcessCheckResult(cr);
-
-				Log(LogWarning, "delegation", "Can't delegate service: " + service->GetName());
-			}
-
-			continue;
-		}
-
-		ASSERT(!service->GetCurrentChecker().IsEmpty());
-	}
-
-	Endpoint::Ptr endpoint;
-	int count;
-	BOOST_FOREACH(boost::tie(endpoint, count), histogram) {
-		std::ostringstream msgbuf;
-		msgbuf << "histogram: " << endpoint->GetName() << " - " << count;
-		Log(LogInformation, "delegation", msgbuf.str());
-	}
-
-	std::ostringstream msgbuf;
-	msgbuf << "Updated delegations for " << delegated << " services";
-	Log(LogInformation, "delegation", msgbuf.str());
-}

components/delegation/delegationcomponent.h

@@ -1,55 +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 DELEGATIONCOMPONENT_H
-#define DELEGATIONCOMPONENT_H
-
-#include "icinga/service.h"
-#include "remoting/endpoint.h"
-#include "base/dynamicobject.h"
-#include "base/timer.h"
-
-namespace icinga
-{
-
-/**
- * @ingroup delegation
- */
-class DelegationComponent : public DynamicObject
-{
-public:
-	DECLARE_PTR_TYPEDEFS(DelegationComponent);
-
-	DelegationComponent(const Dictionary::Ptr& serializedUpdate);
-
-	virtual void Start(void);
-
-private:
-	Timer::Ptr m_DelegationTimer;
-
-	void DelegationTimerHandler(void);
-
-	std::set<Endpoint::Ptr> GetCheckerCandidates(const Service::Ptr& service) const;
-
-	static bool IsEndpointChecker(const Endpoint::Ptr& endpoint);
-};
-
-}
-
-#endif /* DELEGATIONCOMPONENT_H */

components/demo/democomponent.cpp

@@ -27,19 +27,12 @@ using namespace icinga;
 
 REGISTER_TYPE(DemoComponent);
 
-DemoComponent::DemoComponent(const Dictionary::Ptr& serializedUpdate)
-	: DynamicObject(serializedUpdate)
-{ }
-
 /**
  * Starts the component.
  */
 void DemoComponent::Start(void)
 {
-	m_Endpoint = Endpoint::MakeEndpoint("demo", false);
-	m_Endpoint->RegisterTopicHandler("demo::HelloWorld",
-	    boost::bind(&DemoComponent::HelloWorldRequestHandler, this, _2,
-	    _3));
+	DynamicObject::Start();
 
 	m_DemoTimer = boost::make_shared<Timer>();
 	m_DemoTimer->SetInterval(5);
@@ -52,7 +45,7 @@ void DemoComponent::Start(void)
  */
 void DemoComponent::Stop(void)
 {
-	m_Endpoint->Unregister();
+	/* Nothing to do here. */
 }
 
 /**
@@ -62,20 +55,5 @@ void DemoComponent::Stop(void)
  */
 void DemoComponent::DemoTimerHandler(void)
 {
-	Log(LogInformation, "demo", "Sending multicast 'hello world' message.");
-
-	RequestMessage request;
-	request.SetMethod("demo::HelloWorld");
-
-	EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint, request);
-}
-
-/**
- * Processes demo::HelloWorld messages.
- */
-void DemoComponent::HelloWorldRequestHandler(const Endpoint::Ptr& sender,
-    const RequestMessage&)
-{
-	Log(LogInformation, "demo", "Got 'hello world' from identity=" +
-	    (sender ? sender->GetName() : "(anonymous)"));
+	Log(LogInformation, "demo", "Hello World!");
 }

components/demo/democomponent.h

@@ -35,17 +35,13 @@ class DemoComponent : public DynamicObject
 public:
 	DECLARE_PTR_TYPEDEFS(DemoComponent);
 
-	DemoComponent(const Dictionary::Ptr& serializedUpdate);
-
 	virtual void Start(void);
 	virtual void Stop(void);
 
 private:
 	Timer::Ptr m_DemoTimer;
-	Endpoint::Ptr m_Endpoint;
 
 	void DemoTimerHandler(void);
-	void HelloWorldRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request);
 };
 
 }

components/ido_mysql/idomysqldbconnection.cpp

@@ -32,17 +32,11 @@ using namespace icinga;
 
 REGISTER_TYPE(IdoMysqlDbConnection);
 
-IdoMysqlDbConnection::IdoMysqlDbConnection(const Dictionary::Ptr& serializedUpdate)
-	: DbConnection(serializedUpdate), m_Connected(false)
+void IdoMysqlDbConnection::Start(void)
 {
-	RegisterAttribute("host", Attribute_Config, &m_Host);
-	RegisterAttribute("port", Attribute_Config, &m_Port);
-	RegisterAttribute("user", Attribute_Config, &m_User);
-	RegisterAttribute("password", Attribute_Config, &m_Password);
-	RegisterAttribute("database", Attribute_Config, &m_Database);
+	DbConnection::Start();
 
-	RegisterAttribute("instance_name", Attribute_Config, &m_InstanceName);
-	RegisterAttribute("instance_description", Attribute_Config, &m_InstanceDescription);
+	m_Connected = false;
 
 	m_TxTimer = boost::make_shared<Timer>();
 	m_TxTimer->SetInterval(5);
@@ -395,7 +389,7 @@ void IdoMysqlDbConnection::ExecuteQuery(const DbQuery& query)
 				return;
 
 			if (!first)
-				qbuf << " AND ";
+				where << " AND ";
 
 			where << key << " = " << value;
 
@@ -492,3 +486,33 @@ void IdoMysqlDbConnection::ExecuteQuery(const DbQuery& query)
 			SetInsertID(query.Object, GetLastInsertID());
 	}
 }
+
+void IdoMysqlDbConnection::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
+{
+	DbConnection::InternalSerialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config) {
+		bag->Set("host", m_Host);
+		bag->Set("port", m_Port);
+		bag->Set("user", m_User);
+		bag->Set("password", m_Password);
+		bag->Set("database", m_Database);
+		bag->Set("instance_name", m_InstanceName);
+		bag->Set("instance_description", m_InstanceDescription);
+	}
+}
+
+void IdoMysqlDbConnection::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
+{
+	DbConnection::InternalDeserialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config) {
+		m_Host = bag->Get("host");
+		m_Port = bag->Get("port");
+		m_User = bag->Get("user");
+		m_Password = bag->Get("password");
+		m_Database = bag->Get("database");
+		m_InstanceName = bag->Get("instance_name");
+		m_InstanceDescription = bag->Get("instance_description");
+	}
+}

components/ido_mysql/idomysqldbconnection.h

@@ -37,27 +37,29 @@ namespace icinga
 class IdoMysqlDbConnection : public DbConnection
 {
 public:
-	typedef shared_ptr<IdoMysqlDbConnection> Ptr;
-	typedef weak_ptr<IdoMysqlDbConnection> WeakPtr;
-
-	IdoMysqlDbConnection(const Dictionary::Ptr& serializedUpdate);
-	virtual void Stop(void);
+	DECLARE_PTR_TYPEDEFS(IdoMysqlDbConnection);
 
 	//virtual void UpdateObject(const DbObject::Ptr& dbobj, DbUpdateType kind);
 
 protected:
+	virtual void Start(void);
+	virtual void Stop(void);
+
+	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
+	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
+
 	virtual void ActivateObject(const DbObject::Ptr& dbobj);
 	virtual void DeactivateObject(const DbObject::Ptr& dbobj);
 	virtual void ExecuteQuery(const DbQuery& query);
 
 private:
-	Attribute<String> m_Host;
-	Attribute<long> m_Port;
-	Attribute<String> m_User;
-	Attribute<String> m_Password;
-	Attribute<String> m_Database;
-	Attribute<String> m_InstanceName;
-	Attribute<String> m_InstanceDescription;
+	String m_Host;
+	Value m_Port;
+	String m_User;
+	String m_Password;
+	String m_Database;
+	String m_InstanceName;
+	String m_InstanceDescription;
 
 	DbReference m_InstanceID;
 

components/livestatus/commandstable.cpp

@@ -50,13 +50,13 @@ String CommandsTable::GetName(void) const
 
 void CommandsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("CheckCommand")) {
+	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects<CheckCommand>()) {
 		addRowFn(object);
 	}
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("EventCommand")) {
+	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects<EventCommand>()) {
 		addRowFn(object);
 	}
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("NotificationCommand")) {
+	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects<NotificationCommand>()) {
 		addRowFn(object);
 	}
 }

components/livestatus/commentstable.cpp

@@ -58,8 +58,7 @@ String CommentsTable::GetName(void) const
 
 void CommentsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Service")) {
-		Service::Ptr service = static_pointer_cast<Service>(object);
+	BOOST_FOREACH(const Service::Ptr& service, DynamicType::GetObjects<Service>()) {
 		Dictionary::Ptr comments = service->GetComments();
 
 		if (!comments)

components/livestatus/component.cpp

@@ -36,20 +36,13 @@ static int l_ClientsConnected = 0;
 static int l_Connections = 0;
 static boost::mutex l_ComponentMutex;
 
-LivestatusComponent::LivestatusComponent(const Dictionary::Ptr& serializedUpdate)
-	: DynamicObject(serializedUpdate)
-{
-	RegisterAttribute("socket_type", Attribute_Config, &m_SocketType);
-	RegisterAttribute("socket_path", Attribute_Config, &m_SocketPath);
-	RegisterAttribute("host", Attribute_Config, &m_Host);
-	RegisterAttribute("port", Attribute_Config, &m_Port);
-}
-
 /**
  * Starts the component.
  */
 void LivestatusComponent::Start(void)
 {
+	DynamicObject::Start();
+
 	if (GetSocketType() == "tcp") {
 		TcpSocket::Ptr socket = boost::make_shared<TcpSocket>();
 		socket->Bind(GetHost(), GetPort(), AF_INET);
@@ -169,3 +162,27 @@ void LivestatusComponent::ClientThreadProc(const Socket::Ptr& client)
 		l_ClientsConnected--;
 	}
 }
+
+void LivestatusComponent::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
+{
+	DynamicObject::InternalSerialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config) {
+		bag->Set("socket_type", m_SocketType);
+		bag->Set("socket_path", m_SocketPath);
+		bag->Set("host", m_Host);
+		bag->Set("port", m_Port);
+	}
+}
+
+void LivestatusComponent::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
+{
+	DynamicObject::InternalDeserialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config) {
+		m_SocketType = bag->Get("socket_type");
+		m_SocketPath = bag->Get("socket_path");
+		m_Host = bag->Get("host");
+		m_Port = bag->Get("port");
+	}
+}

components/livestatus/component.h

@@ -36,10 +36,6 @@ namespace livestatus
 class LivestatusComponent : public DynamicObject
 {
 public:
-	LivestatusComponent(const Dictionary::Ptr& serializedUpdate);
-
-	virtual void Start(void);
-
 	String GetSocketType(void) const;
 	String GetSocketPath(void) const;
 	String GetHost(void) const;
@@ -48,11 +44,17 @@ public:
 	static int GetClientsConnected(void);
 	static int GetConnections(void);
 
+protected:
+	virtual void Start(void);
+
+	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
+	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
+
 private:
-	Attribute<String> m_SocketType;
-	Attribute<String> m_SocketPath;
-	Attribute<String> m_Host;
-	Attribute<String> m_Port;
+	String m_SocketType;
+	String m_SocketPath;
+	String m_Host;
+	String m_Port;
 
 	void ServerThreadProc(const Socket::Ptr& server);
 	void ClientThreadProc(const Socket::Ptr& client);

components/livestatus/contactgroupstable.cpp

@@ -45,8 +45,8 @@ String ContactGroupsTable::GetName(void) const
 
 void ContactGroupsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("UserGroup")) {
-		addRowFn(object);
+	BOOST_FOREACH(const UserGroup::Ptr& ug, DynamicType::GetObjects<UserGroup>()) {
+		addRowFn(ug);
 	}
 }
 

components/livestatus/contactstable.cpp

@@ -63,8 +63,8 @@ String ContactsTable::GetName(void) const
 
 void ContactsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("User")) {
-		addRowFn(object);
+	BOOST_FOREACH(const User::Ptr& user, DynamicType::GetObjects<User>()) {
+		addRowFn(user);
 	}
 }
 

components/livestatus/downtimestable.cpp

@@ -58,8 +58,7 @@ String DowntimesTable::GetName(void) const
 
 void DowntimesTable::FetchRows(const AddRowFunction& addRowFn)
 {
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Service")) {
-		Service::Ptr service = static_pointer_cast<Service>(object);
+	BOOST_FOREACH(const Service::Ptr& service, DynamicType::GetObjects<Service>()) {
 		Dictionary::Ptr downtimes = service->GetDowntimes();
 
 		if (!downtimes)

components/livestatus/hostgroupstable.cpp

@@ -69,8 +69,8 @@ String HostGroupsTable::GetName(void) const
 
 void HostGroupsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("HostGroup")) {
-		addRowFn(object);
+	BOOST_FOREACH(const HostGroup::Ptr& hg, DynamicType::GetObjects<HostGroup>()) {
+		addRowFn(hg);
 	}
 }
 

components/livestatus/hoststable.cpp

@@ -167,8 +167,8 @@ String HostsTable::GetName(void) const
 
 void HostsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Host")) {
-		addRowFn(object);
+	BOOST_FOREACH(const Host::Ptr& host, DynamicType::GetObjects<Host>()) {
+		addRowFn(host);
 	}
 }
 

components/livestatus/servicegroupstable.cpp

@@ -60,8 +60,8 @@ String ServiceGroupsTable::GetName(void) const
 
 void ServiceGroupsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("ServiceGroup")) {
-		addRowFn(object);
+	BOOST_FOREACH(const ServiceGroup::Ptr& sg, DynamicType::GetObjects<ServiceGroup>()) {
+		addRowFn(sg);
 	}
 }
 

components/livestatus/servicestable.cpp

@@ -136,8 +136,8 @@ String ServicesTable::GetName(void) const
 
 void ServicesTable::FetchRows(const AddRowFunction& addRowFn)
 {
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Service")) {
-		addRowFn(object);
+	BOOST_FOREACH(const Service::Ptr& service, DynamicType::GetObjects<Service>()) {
+		addRowFn(service);
 	}
 }
 

components/livestatus/statustable.cpp

@@ -21,6 +21,8 @@
 #include "livestatus/component.h"
 #include "icinga/icingaapplication.h"
 #include "icinga/cib.h"
+#include "icinga/host.h"
+#include "icinga/service.h"
 #include "base/dynamictype.h"
 #include "base/utility.h"
 #include <boost/smart_ptr/make_shared.hpp>
@@ -334,12 +336,12 @@ Value StatusTable::IntervalLengthAccessor(const Value& row)
 
 Value StatusTable::NumHostsAccessor(const Value& row)
 {
-	return static_cast<long>(DynamicType::GetObjects("Host").size());
+	return DynamicType::GetObjects<Host>().size();
 }
 
 Value StatusTable::NumServicesAccessor(const Value& row)
 {
-	return static_cast<long>(DynamicType::GetObjects("Service").size());
+	return DynamicType::GetObjects<Service>().size();
 }
 
 Value StatusTable::ProgramVersionAccessor(const Value& row)

components/livestatus/timeperiodstable.cpp

@@ -50,8 +50,8 @@ String TimePeriodsTable::GetName(void) const
 
 void TimePeriodsTable::FetchRows(const AddRowFunction& addRowFn)
 {
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("TimePeriod")) {
-		addRowFn(object);
+	BOOST_FOREACH(const TimePeriod::Ptr& tp, DynamicType::GetObjects<TimePeriod>()) {
+		addRowFn(tp);
 	}
 }
 

components/notification/notificationcomponent.cpp

@@ -30,19 +30,15 @@ using namespace icinga;
 
 REGISTER_TYPE(NotificationComponent);
 
-NotificationComponent::NotificationComponent(const Dictionary::Ptr& serializedUpdate)
-	: DynamicObject(serializedUpdate)
-{ }
-
 /**
  * Starts the component.
  */
 void NotificationComponent::Start(void)
 {
-	m_Endpoint = Endpoint::MakeEndpoint("notification", false);
-	m_Endpoint->RegisterTopicHandler("icinga::SendNotifications",
-	    boost::bind(&NotificationComponent::SendNotificationsRequestHandler, this, _2,
-	    _3));
+	DynamicObject::Start();
+
+	Service::OnNotificationsRequested.connect(bind(&NotificationComponent::SendNotificationsHandler, this, _1,
+	    _2, _3, _4, _5));
 
 	m_NotificationTimer = boost::make_shared<Timer>();
 	m_NotificationTimer->SetInterval(5);
@@ -50,14 +46,6 @@ void NotificationComponent::Start(void)
 	m_NotificationTimer->Start();
 }
 
-/**
- * Stops the component.
- */
-void NotificationComponent::Stop(void)
-{
-	m_Endpoint->Unregister();
-}
-
 /**
  * Periodically sends notifications.
  *
@@ -67,9 +55,7 @@ void NotificationComponent::NotificationTimerHandler(void)
 {
 	double now = Utility::GetTime();
 
-	BOOST_FOREACH(const DynamicObject::Ptr& object, DynamicType::GetObjects("Notification")) {
-		Notification::Ptr notification = dynamic_pointer_cast<Notification>(object);
-
+	BOOST_FOREACH(const Notification::Ptr& notification, DynamicType::GetObjects<Notification>()) {
 		if (notification->GetNotificationInterval() <= 0)
 			continue;
 
@@ -88,8 +74,6 @@ void NotificationComponent::NotificationTimerHandler(void)
 			notification->SetNextNotification(Utility::GetTime() + notification->GetNotificationInterval());
 		}
 
-		bool send_notification;
-
 		{
 			ObjectLock olock(service);
 
@@ -120,34 +104,8 @@ void NotificationComponent::NotificationTimerHandler(void)
 /**
  * Processes icinga::SendNotifications messages.
  */
-void NotificationComponent::SendNotificationsRequestHandler(const Endpoint::Ptr& sender,
-    const RequestMessage& request)
+void NotificationComponent::SendNotificationsHandler(const Service::Ptr& service, NotificationType type,
+    const Dictionary::Ptr& cr, const String& author, const String& text)
 {
-	MessagePart params;
-	if (!request.GetParams(&params))
-		return;
-
-	String svc;
-	if (!params.Get("service", &svc))
-		return;
-
-	int type;
-	if (!params.Get("type", &type))
-		return;
-
-	Dictionary::Ptr cr;
-	if (!params.Get("check_result", &cr))
-		return;
-
-	Service::Ptr service = Service::GetByName(svc);
-
-	if (!service)
-		return;
-
-	String author;
-	params.Get("author", &author);
-	String text;
-	params.Get("text", &text);
-
 	service->SendNotifications(static_cast<NotificationType>(type), cr, author, text);
 }

components/notification/notificationcomponent.h

@@ -20,7 +20,7 @@
 #ifndef NOTIFICATIONCOMPONENT_H
 #define NOTIFICATIONCOMPONENT_H
 
-#include "remoting/endpoint.h"
+#include "icinga/service.h"
 #include "base/dynamicobject.h"
 #include "base/timer.h"
 
@@ -35,17 +35,14 @@ class NotificationComponent : public DynamicObject
 public:
 	DECLARE_PTR_TYPEDEFS(NotificationComponent);
 
-	NotificationComponent(const Dictionary::Ptr& serializedUpdate);
-
 	virtual void Start(void);
-	virtual void Stop(void);
 
 private:
 	Timer::Ptr m_NotificationTimer;
-	Endpoint::Ptr m_Endpoint;
 
 	void NotificationTimerHandler(void);
-	void SendNotificationsRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request);
+	void SendNotificationsHandler(const Service::Ptr& service, NotificationType type,
+	    const Dictionary::Ptr& cr, const String& author, const String& text);
 };
 
 }

components/replication/.gitignore

@@ -1 +0,0 @@
-replication-type.cpp

components/replication/Makefile.am

@@ -1,37 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-pkglib_LTLIBRARIES = \
-	libreplication.la
-
-EXTRA_DIST = \
-	replication-type.conf
-
-.conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig.c
-	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
-
-libreplication_la_SOURCES = \
-	replicationcomponent.cpp \
-	replicationcomponent.h \
-	replication-type.cpp
-
-libreplication_la_CPPFLAGS = \
-	$(LTDLINCL) \
-	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/lib \
-	-I${top_srcdir}/components
-
-libreplication_la_LDFLAGS = \
-	$(BOOST_LDFLAGS) \
-	-module \
-	-no-undefined \
-	@RELEASE_INFO@ \
-	@VERSION_INFO@
-
-libreplication_la_LIBADD = \
-	$(BOOST_SIGNALS_LIB) \
-	$(BOOST_THREAD_LIB) \
-	$(BOOST_SYSTEM_LIB) \
-	${top_builddir}/lib/base/libbase.la \
-	${top_builddir}/lib/config/libconfig.la \
-	${top_builddir}/lib/remoting/libremoting.la \
-	${top_builddir}/lib/icinga/libicinga.la

components/replication/replication-type.conf

@@ -1,21 +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.             *
- ******************************************************************************/
-
-type ReplicationComponent {
-}

components/replication/replication.filters

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Quelldateien">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headerdateien">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="replicationcomponent.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="i2-replication.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="replicationcomponent.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

components/replication/replication.vcxproj

@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>replication</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)\lib;$(SolutionDir)\components;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="replicationcomponent.h" />
-    <ClInclude Include="i2-replication.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="replication-type.cpp" />
-    <ClCompile Include="replicationcomponent.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="replication-type.conf">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Preparing config fragment for embedding</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Preparing config fragment for embedding</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
-    </CustomBuild>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

components/replication/replication.vcxproj.filters

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="i2-replication.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="replicationcomponent.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Headerdateien">
-      <UniqueIdentifier>{85c17050-f3b5-4dbe-9d86-2c4838ddd7e0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Quelldateien">
-      <UniqueIdentifier>{0caf70c2-14a5-4d97-a2d0-0afbe6028b49}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="replicationcomponent.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="replication-type.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="replication-type.conf">
-      <Filter>Quelldateien</Filter>
-    </CustomBuild>
-  </ItemGroup>
-</Project>

components/replication/replicationcomponent.cpp

@@ -1,268 +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 "replication/replicationcomponent.h"
-#include "icinga/service.h"
-#include "icinga/checkresultmessage.h"
-#include "remoting/endpointmanager.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include <boost/foreach.hpp>
-
-using namespace icinga;
-
-REGISTER_TYPE(ReplicationComponent);
-
-ReplicationComponent::ReplicationComponent(const Dictionary::Ptr& serializedUpdate)
-	: DynamicObject(serializedUpdate)
-{ }
-
-/**
- * Starts the component.
- */
-void ReplicationComponent::Start(void)
-{
-	m_Endpoint = Endpoint::MakeEndpoint("replication", false);
-
-	DynamicObject::OnRegistered.connect(boost::bind(&ReplicationComponent::LocalObjectRegisteredHandler, this, _1));
-	DynamicObject::OnUnregistered.connect(boost::bind(&ReplicationComponent::LocalObjectUnregisteredHandler, this, _1));
-	DynamicObject::OnTransactionClosing.connect(boost::bind(&ReplicationComponent::TransactionClosingHandler, this, _1, _2));
-	DynamicObject::OnFlushObject.connect(boost::bind(&ReplicationComponent::FlushObjectHandler, this, _1, _2));
-
-	Endpoint::OnConnected.connect(boost::bind(&ReplicationComponent::EndpointConnectedHandler, this, _1));
-
-	m_Endpoint->RegisterTopicHandler("config::ObjectUpdate",
-	    boost::bind(&ReplicationComponent::RemoteObjectUpdateHandler, this, _3));
-	m_Endpoint->RegisterTopicHandler("config::ObjectRemoved",
-	    boost::bind(&ReplicationComponent::RemoteObjectRemovedHandler, this, _3));
-
-	/* service status */
-	m_Endpoint->RegisterTopicHandler("checker::CheckResult",
-	    boost::bind(&ReplicationComponent::CheckResultRequestHandler, _3));
-}
-
-/**
- * Stops the component.
- */
-void ReplicationComponent::Stop(void)
-{
-	m_Endpoint->Unregister();
-}
-
-void ReplicationComponent::CheckResultRequestHandler(const RequestMessage& request)
-{
-	CheckResultMessage params;
-	if (!request.GetParams(&params))
-		return;
-
-	String svcname = params.GetService();
-	Service::Ptr service = Service::GetByName(svcname);
-
-	Dictionary::Ptr cr = params.GetCheckResult();
-	if (!cr)
-		return;
-
-	if (cr->Contains("current_checker") && cr->Get("current_checker") == EndpointManager::GetInstance()->GetIdentity())
-		return;
-
-	Service::UpdateStatistics(cr);
-}
-
-void ReplicationComponent::EndpointConnectedHandler(const Endpoint::Ptr& endpoint)
-{
-	/* no need to sync the config with local endpoints */
-	if (endpoint->IsLocalEndpoint())
-		return;
-
-	/* we just assume the other endpoint wants object updates */
-	endpoint->RegisterSubscription("config::ObjectUpdate");
-	endpoint->RegisterSubscription("config::ObjectRemoved");
-
-	DynamicType::Ptr type;
-	BOOST_FOREACH(const DynamicType::Ptr& dt, DynamicType::GetTypes()) {
-		std::set<DynamicObject::Ptr> objects;
-
-		BOOST_FOREACH(const DynamicObject::Ptr& object, dt->GetObjects()) {
-			if (!ShouldReplicateObject(object))
-				continue;
-
-			RequestMessage request = MakeObjectMessage(object, "config::ObjectUpdate", 0, true);
-			EndpointManager::GetInstance()->SendUnicastMessage(m_Endpoint, endpoint, request);
-
-		}
-	}
-}
-
-RequestMessage ReplicationComponent::MakeObjectMessage(const DynamicObject::Ptr& object, const String& method, double sinceTx, bool includeProperties)
-{
-	RequestMessage msg;
-	msg.SetMethod(method);
-
-	MessagePart params;
-	msg.SetParams(params);
-
-	params.Set("name", object->GetName());
-	params.Set("type", object->GetType()->GetName());
-
-	String source = object->GetSource();
-
-	if (source.IsEmpty())
-		source = EndpointManager::GetInstance()->GetIdentity();
-
-	params.Set("source", source);
-
-	if (includeProperties)
-		params.Set("update", object->BuildUpdate(sinceTx, Attribute_Replicated | Attribute_Config));
-
-	return msg;
-}
-
-bool ReplicationComponent::ShouldReplicateObject(const DynamicObject::Ptr& object)
-{
-	return (!object->IsLocal());
-}
-
-void ReplicationComponent::LocalObjectRegisteredHandler(const DynamicObject::Ptr& object)
-{
-	if (!ShouldReplicateObject(object))
-		return;
-
-	EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint,
-	    MakeObjectMessage(object, "config::ObjectUpdate", 0, true));
-}
-
-void ReplicationComponent::LocalObjectUnregisteredHandler(const DynamicObject::Ptr& object)
-{
-	if (!ShouldReplicateObject(object))
-		return;
-
-	EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint,
-	    MakeObjectMessage(object, "config::ObjectRemoved", 0, false));
-}
-
-void ReplicationComponent::TransactionClosingHandler(double tx, const std::set<DynamicObject::WeakPtr>& modifiedObjects)
-{
-	if (modifiedObjects.empty())
-		return;
-
-	std::ostringstream msgbuf;
-	msgbuf << "Sending " << modifiedObjects.size() << " replication updates.";
-	Log(LogInformation, "replication", msgbuf.str());
-
-	BOOST_FOREACH(const DynamicObject::WeakPtr& wobject, modifiedObjects) {
-		DynamicObject::Ptr object = wobject.lock();
-
-		if (!object)
-			continue;
-
-		FlushObjectHandler(tx, object);
-	}
-}
-
-void ReplicationComponent::FlushObjectHandler(double tx, const DynamicObject::Ptr& object)
-{
-	if (!ShouldReplicateObject(object))
-		return;
-
-	/* Don't replicate objects that haven't had any local updates. */
-	if (object->GetLocalTx() < tx)
-		return;
-
-	RequestMessage request = MakeObjectMessage(object, "config::ObjectUpdate", tx, true);
-	EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint, request);
-}
-
-void ReplicationComponent::RemoteObjectUpdateHandler(const RequestMessage& request)
-{
-	MessagePart params;
-	if (!request.GetParams(&params))
-		return;
-
-	String name;
-	if (!params.Get("name", &name))
-		return;
-
-	String type;
-	if (!params.Get("type", &type))
-		return;
-
-	String source;
-	if (!params.Get("source", &source))
-		return;
-
-	Dictionary::Ptr update;
-	if (!params.Get("update", &update))
-		return;
-
-	DynamicType::Ptr dtype = DynamicType::GetByName(type);
-	DynamicObject::Ptr object = dtype->GetObject(name);
-
-	// TODO: sanitize update, disallow __local
-
-	if (!object) {
-		object = dtype->CreateObject(update);
-
-		if (source == EndpointManager::GetInstance()->GetIdentity()) {
-			/* the peer sent us an object that was originally created by us -
-			 * however it was deleted locally so we have to tell the peer to destroy
-			 * its copy of the object. */
-			EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint,
-			    MakeObjectMessage(object, "config::ObjectRemoved", 0, false));
-
-			return;
-		}
-
-		Log(LogDebug, "replication", "Received object from source: " + source);
-
-		object->SetSource(source);
-		object->Register();
-	} else {
-		if (object->IsLocal())
-			BOOST_THROW_EXCEPTION(std::invalid_argument("Replicated remote object is marked as local."));
-
-		// TODO: disallow config updates depending on endpoint config
-
-		object->ApplyUpdate(update, Attribute_All);
-	}
-}
-
-void ReplicationComponent::RemoteObjectRemovedHandler(const RequestMessage& request)
-{
-	MessagePart params;
-	if (!request.GetParams(&params))
-		return;
-
-	String name;
-	if (!params.Get("name", &name))
-		return;
-
-	String type;
-	if (!params.Get("type", &type))
-		return;
-
-	DynamicObject::Ptr object = DynamicObject::GetObject(type, name);
-
-	if (!object)
-		return;
-
-	if (!object->IsLocal()) {
-		object->Unregister();
-	}
-}

components/replication/replicationcomponent.h

@@ -1,65 +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 REPLICATIONCOMPONENT_H
-#define REPLICATIONCOMPONENT_H
-
-#include "base/dynamicobject.h"
-#include "remoting/endpoint.h"
-
-namespace icinga
-{
-
-/**
- * @ingroup replication
- */
-class ReplicationComponent : public DynamicObject
-{
-public:
-	DECLARE_PTR_TYPEDEFS(ReplicationComponent);
-
-	ReplicationComponent(const Dictionary::Ptr& serializedUpdate);
-
-	virtual void Start(void);
-	virtual void Stop(void);
-
-private:
-	Endpoint::Ptr m_Endpoint;
-
-	static void CheckResultRequestHandler(const RequestMessage& request);
-
-	void EndpointConnectedHandler(const Endpoint::Ptr& endpoint);
-
-	void LocalObjectRegisteredHandler(const DynamicObject::Ptr& object);
-	void LocalObjectUnregisteredHandler(const DynamicObject::Ptr& object);
-	void TransactionClosingHandler(double tx, const std::set<DynamicObject::WeakPtr>& modifiedObjects);
-	void FlushObjectHandler(double tx, const DynamicObject::Ptr& object);
-
-	void RemoteObjectUpdateHandler(const RequestMessage& request);
-	void RemoteObjectRemovedHandler(const RequestMessage& request);
-
-	static RequestMessage MakeObjectMessage(const DynamicObject::Ptr& object,
-	    const String& method, double sinceTx, bool includeProperties);
-
-	static bool ShouldReplicateObject(const DynamicObject::Ptr& object);
-};
-
-}
-
-#endif /* REPLICATIONCOMPONENT_H */

configure.ac

@@ -124,12 +124,10 @@ Makefile
 components/Makefile
 components/checker/Makefile
 components/compat/Makefile
-components/delegation/Makefile
 components/demo/Makefile
 components/ido_mysql/Makefile
 components/livestatus/Makefile
 components/notification/Makefile
-components/replication/Makefile
 docs/Doxyfile
 docs/Makefile
 etc/Makefile

contrib/gdb/gdbinit

@@ -6,3 +6,10 @@ sys.path.insert(0, '/home/gbeutner/strawberry/contrib/gdb')
 from icingadbg import register_icinga_printers
 register_icinga_printers()
 end
+
+python
+import sys
+sys.path.insert(0, '/home/gbeutner/gdb_printers/python')
+from libstdcxx.v6.printers import register_libstdcxx_printers
+register_libstdcxx_printers (None)
+end

etc/init.d/icinga2.in

@@ -84,23 +84,6 @@ stop() {
 	echo "Done"
 }
 
-# Reload Icinga 2
-reload() {
-        printf "Reloading Icinga 2: "
-        if [ ! -e $ICINGA2_PID_FILE ]; then
-                echo "The PID file '$ICINGA2_PID_FILE' does not exist."
-                exit 1
-        fi
-        
-	pid=`cat $ICINGA2_PID_FILE`
-	
-        if ! kill -HUP $pid >/dev/null 2>&1; then
-		echo "Failed - Icinga 2 is not running."
-	else
-		echo "Done"
-	fi
-}
-
 # Print status for Icinga 2
 status() {
 	printf "Icinga 2 status: "
@@ -128,11 +111,8 @@ case "$1" in
         stop
         start
         ;;
-  reload)
-        reload
-        ;;
   *)
-        echo $"Usage: $0 {start|stop|restart|reload|status}"
+        echo $"Usage: $0 {start|stop|restart|status}"
         exit 1
 esac
 exit 0

icinga-app/Makefile.am

@@ -27,9 +27,7 @@ icinga2_LDADD = \
 	${top_builddir}/lib/config/libconfig.la \
 	-dlopen ${top_builddir}/lib/icinga/libicinga.la \
 	-dlopen ${top_builddir}/components/checker/libchecker.la \
-	-dlopen ${top_builddir}/components/replication/libreplication.la \
 	-dlopen ${top_builddir}/components/compat/libcompat.la \
-	-dlopen ${top_builddir}/components/delegation/libdelegation.la \
 	-dlopen ${top_builddir}/components/demo/libdemo.la \
 	-dlopen ${top_builddir}/components/livestatus/liblivestatus.la \
 	-dlopen ${top_builddir}/components/notification/libnotification.la

icinga-app/icinga.cpp

@@ -39,18 +39,10 @@ using namespace icinga;
 namespace po = boost::program_options;
 
 static po::variables_map g_AppParams;
-static String g_ConfigUnit;
-
-#ifndef _WIN32
-static bool l_ReloadConfig = false;
-static Timer::Ptr l_ReloadConfigTimer;
-#endif /* _WIN32 */
 
 static bool LoadConfigFiles(bool validateOnly)
 {
-	ConfigCompilerContext context;
-
-	ConfigCompilerContext::SetContext(&context);
+	ConfigCompilerContext::GetInstance()->Reset();
 
 	BOOST_FOREACH(const String& configPath, g_AppParams["config"].as<std::vector<String> >()) {
 		ConfigCompiler::CompileFile(configPath);
@@ -61,11 +53,9 @@ static bool LoadConfigFiles(bool validateOnly)
 		ConfigCompiler::CompileText(name, fragment);
 	}
 
-	ConfigCompilerContext::SetContext(NULL);
-
 	bool hasError = false;
 
-	BOOST_FOREACH(const ConfigCompilerError& error, context.GetErrors()) {
+	BOOST_FOREACH(const ConfigCompilerError& error, ConfigCompilerContext::GetInstance()->GetErrors()) {
 		if (!error.Warning) {
 			hasError = true;
 			break;
@@ -74,13 +64,13 @@ static bool LoadConfigFiles(bool validateOnly)
 
 	/* Don't link or validate if we have already encountered at least one error. */
 	if (!hasError) {
-		context.LinkItems();
-		context.ValidateItems();
+		ConfigItem::LinkItems();
+		ConfigItem::ValidateItems();
 	}
 
 	hasError = false;
 
-	BOOST_FOREACH(const ConfigCompilerError& error, context.GetErrors()) {
+	BOOST_FOREACH(const ConfigCompilerError& error, ConfigCompilerContext::GetInstance()->GetErrors()) {
 		if (error.Warning) {
 			Log(LogWarning, "icinga-app", "Config warning: " + error.Message);
 		} else {
@@ -95,40 +85,14 @@ static bool LoadConfigFiles(bool validateOnly)
 	if (validateOnly)
 		return true;
 
-	context.ActivateItems();
+	ConfigItem::ActivateItems();
 
-	if (!g_ConfigUnit.IsEmpty()) {
-		/* ActivateItems has taken care of replacing all previous items
-		 * with new versions - which are automatically in a different
-		 * compilation unit. This UnloadUnit() call takes care of
-		 * removing all left-over items from the previous config. */
-		ConfigItem::UnloadUnit(g_ConfigUnit);
-	}
-
-	g_ConfigUnit = context.GetUnit();
+	ConfigItem::DiscardItems();
+	ConfigType::DiscardTypes();
 
 	return true;
 }
 
-#ifndef _WIN32
-static void ReloadConfigTimerHandler(void)
-{
-	if (l_ReloadConfig) {
-		Log(LogInformation, "icinga-app", "Received SIGHUP. Reloading config files.");
-		LoadConfigFiles(false);
-
-		l_ReloadConfig = false;
-	}
-}
-
-static void SigHupHandler(int signum)
-{
-	ASSERT(signum == SIGHUP);
-
-	l_ReloadConfig = true;
-}
-#endif /* _WIN32 */
-
 static bool Daemonize(const String& stderrFile)
 {
 #ifndef _WIN32
@@ -343,17 +307,5 @@ int main(int argc, char **argv)
 	if (!app)
 		BOOST_THROW_EXCEPTION(std::runtime_error("Configuration must create an Application object."));
 
-#ifndef _WIN32
-	struct sigaction sa;
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_handler = &SigHupHandler;
-	sigaction(SIGHUP, &sa, NULL);
-
-	l_ReloadConfigTimer = boost::make_shared<Timer>();
-	l_ReloadConfigTimer->SetInterval(1);
-	l_ReloadConfigTimer->OnTimerExpired.connect(boost::bind(&ReloadConfigTimerHandler));
-	l_ReloadConfigTimer->Start();
-#endif /* _WIN32 */
-
 	return app->Run();
 }

itl/Makefile.am

@@ -1,6 +1,5 @@
 icinga2itldir = ${pkgdatadir}/itl
 icinga2itl_DATA = \
-	cluster.conf \
 	command.conf \
 	command-common.conf \
 	constants.conf \

itl/cluster.conf

@@ -1,21 +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.             *
- ******************************************************************************/
-
-library "replication"
-local object ReplicationComponent "replication" {}

itl/standalone.conf

@@ -18,10 +18,7 @@
  ******************************************************************************/
 
 library "checker"
-local object CheckerComponent "checker" {}
-
-library "delegation"
-local object DelegationComponent "delegation" {}
+object CheckerComponent "checker" {}
 
 library "notification"
-local object NotificationComponent "notification" {}
+object NotificationComponent "notification" {}

lib/base/Makefile.am

@@ -9,8 +9,6 @@ libbase_la_SOURCES =  \
 	application.h \
 	array.cpp \
 	array.h \
-	attribute.cpp \
-	attribute.h \
 	bufferedstream.cpp \
 	bufferedstream.h \
 	consolelogger.cpp \

lib/base/application.cpp

@@ -52,11 +52,11 @@ char **Application::m_ArgV;
 /**
  * Constructor for the Application class.
  */
-Application::Application(const Dictionary::Ptr& serializedUpdate)
-	: DynamicObject(serializedUpdate), m_PidFile(NULL)
+void Application::Start(void)
 {
-	if (!IsLocal())
-		BOOST_THROW_EXCEPTION(std::runtime_error("Application objects must be local."));
+	DynamicObject::Start();
+
+	m_PidFile = NULL;
 
 #ifdef _WIN32
 	/* disable GUI-based error messages for LoadLibrary() */
@@ -82,10 +82,8 @@ Application::Application(const Dictionary::Ptr& serializedUpdate)
 /**
  * Destructor for the application class.
  */
-Application::~Application(void)
+void Application::Stop(void)
 {
-	m_Instance = NULL;
-
 	m_ShuttingDown = true;
 
 #ifdef _WIN32
@@ -95,6 +93,11 @@ Application::~Application(void)
 	ClosePidFile();
 }
 
+Application::~Application(void)
+{
+	m_Instance = NULL;
+}
+
 /**
  * Retrieves a pointer to the application singleton object.
  *
@@ -134,7 +137,7 @@ void Application::ShutdownTimerHandler(void)
 		Log(LogInformation, "base", "Shutting down Icinga...");
 		Application::GetInstance()->OnShutdown();
 
-		DynamicObject::DeactivateObjects();
+		DynamicObject::StopObjects();
 		GetTP().Stop();
 		m_ShuttingDown = false;
 	}
@@ -314,12 +317,10 @@ void Application::DisplayBugMessage(void)
  * Signal handler for SIGINT. Prepares the application for cleanly
  * shutting down during the next execution of the event loop.
  *
- * @param signum The signal number.
+ * @param - The signal number.
  */
-void Application::SigIntHandler(int signum)
+void Application::SigIntHandler(int)
 {
-	ASSERT(signum == SIGINT);
-
 	struct sigaction sa;
 	memset(&sa, 0, sizeof(sa));
 	sa.sa_handler = SIG_DFL;
@@ -336,12 +337,10 @@ void Application::SigIntHandler(int signum)
 /**
  * Signal handler for SIGABRT. Helps with debugging ASSERT()s.
  *
- * @param signum The signal number.
+ * @param - The signal number.
  */
-void Application::SigAbrtHandler(int signum)
+void Application::SigAbrtHandler(int)
 {
-	ASSERT(signum == SIGABRT);
-
 #ifndef _WIN32
 	struct sigaction sa;
 	memset(&sa, 0, sizeof(sa));

lib/base/application.h

@@ -37,7 +37,6 @@ class I2_BASE_API Application : public DynamicObject {
 public:
 	DECLARE_PTR_TYPEDEFS(Application);
 
-	explicit Application(const Dictionary::Ptr& serializedUpdate);
 	~Application(void);
 
 	static Application::Ptr GetInstance(void);
@@ -84,6 +83,9 @@ public:
 	static ThreadPool& GetTP(void);
 
 protected:
+	virtual void Start(void);
+	virtual void Stop(void);
+
 	void RunEventLoop(void) const;
 
 	virtual void OnShutdown(void) = 0;

lib/base/attribute.cpp

@@ -1,142 +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 "base/attribute.h"
-#include "base/utility.h"
-
-using namespace icinga;
-
-static boost::mutex l_Mutex;
-
-AttributeBase::AttributeBase(void)
-	: m_Value()
-{ }
-
-void AttributeBase::Set(const Value& value)
-{
-	boost::mutex::scoped_lock lock(l_Mutex);
-	InternalSet(value);
-}
-
-Value AttributeBase::Get(void) const
-{
-	boost::mutex::scoped_lock lock(l_Mutex);
-	return InternalGet();
-}
-
-AttributeBase::operator Value(void) const
-{
-	boost::mutex::scoped_lock lock(l_Mutex);
-	return InternalGet();
-}
-
-bool AttributeBase::IsEmpty(void) const
-{
-	boost::mutex::scoped_lock lock(l_Mutex);
-	return InternalGet().IsEmpty();
-}
-
-/**
- * Note: Caller must hold l_Mutex;
- */
-void AttributeBase::InternalSet(const Value& value)
-{
-	m_Value = value;
-}
-
-/**
- * Note: Caller must hold l_Mutex.
- */
-const Value& AttributeBase::InternalGet(void) const
-{
-	return m_Value;
-}
-
-AttributeHolder::AttributeHolder(AttributeType type, AttributeBase *boundAttribute)
-	: m_Type(type), m_Tx(0)
-{
-	if (boundAttribute) {
-		m_Attribute = boundAttribute;
-		m_OwnsAttribute = false;
-	} else {
-		m_Attribute = new Attribute<Value>();
-		m_OwnsAttribute = true;
-	}
-}
-
-AttributeHolder::AttributeHolder(const AttributeHolder& other)
-{
-	m_Type = other.m_Type;
-	m_Tx = other.m_Tx;
-	m_OwnsAttribute = other.m_OwnsAttribute;
-
-	if (other.m_OwnsAttribute) {
-		m_Attribute = new Attribute<Value>();
-		m_Attribute->Set(other.m_Attribute->Get());
-	} else {
-		m_Attribute = other.m_Attribute;
-	}
-}
-
-AttributeHolder::~AttributeHolder(void)
-{
-	if (m_OwnsAttribute)
-		delete m_Attribute;
-}
-
-void AttributeHolder::Bind(AttributeBase *boundAttribute)
-{
-	ASSERT(m_OwnsAttribute);
-	boundAttribute->Set(m_Attribute->Get());
-	if (m_OwnsAttribute)
-		delete m_Attribute;
-	m_Attribute = boundAttribute;
-	m_OwnsAttribute = false;
-}
-
-void AttributeHolder::SetValue(double tx, const Value& value)
-{
-	m_Tx = tx;
-	m_Attribute->Set(value);
-}
-
-Value AttributeHolder::GetValue(void) const
-{
-	return m_Attribute->Get();
-}
-
-void AttributeHolder::SetType(AttributeType type)
-{
-	m_Type = type;
-}
-
-AttributeType AttributeHolder::GetType(void) const
-{
-	return m_Type;
-}
-
-void AttributeHolder::SetTx(double tx)
-{
-	m_Tx = tx;
-}
-
-double AttributeHolder::GetTx(void) const
-{
-	return m_Tx;
-}

lib/base/attribute.h

@@ -1,137 +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 ATTRIBUTE_H
-#define ATTRIBUTE_H
-
-#include "base/value.h"
-
-namespace icinga
-{
-
-/**
- * The type of an attribute for a DynamicObject.
- *
- * @ingroup base
- */
-enum AttributeType
-{
-	Attribute_Transient = 1,
-
-	/* Unlike transient attributes local attributes are persisted
-	 * in the program state file. */
-	Attribute_Local = 2,
-
-	/* Replicated attributes are sent to other daemons for which
-	 * replication is enabled. */
-	Attribute_Replicated = 4,
-
-	/* Attributes read from the config file are implicitly marked
-	 * as config attributes. */
-	Attribute_Config = 8,
-
-	/* Combination of all attribute types */
-	Attribute_All = Attribute_Transient | Attribute_Local | Attribute_Replicated | Attribute_Config
-};
-
-class I2_BASE_API AttributeBase
-{
-public:
-	AttributeBase(void);
-
-	void Set(const Value& value);
-	Value Get(void) const;
-	operator Value(void) const;
-	bool IsEmpty(void) const;
-
-protected:
-	void InternalSet(const Value& value);
-	const Value& InternalGet(void) const;
-
-private:
-	Value m_Value;
-
-	AttributeBase(const AttributeBase& other);
-	AttributeBase& operator=(const AttributeBase& other);
-};
-
-template<typename T>
-class Attribute : public AttributeBase
-{
-public:
-	void Set(const T& value)
-	{
-		AttributeBase::Set(value);
-	}
-
-	Attribute<T>& operator=(const T& rhs)
-	{
-		Set(rhs);
-		return *this;
-	}
-
-	T Get(void) const
-	{
-		Value value = AttributeBase::Get();
-
-		if (value.IsEmpty())
-			return T();
-
-		return static_cast<T>(value);
-	}
-
-	operator T(void) const
-	{
-		return Get();
-	}
-};
-
-/**
- * An attribute for a DynamicObject.
- *
- * @ingroup base
- */
-class I2_BASE_API AttributeHolder
-{
-public:
-	AttributeHolder(AttributeType type, AttributeBase *boundAttribute = NULL);
-	AttributeHolder(const AttributeHolder& other);
-	~AttributeHolder(void);
-
-	void Bind(AttributeBase *boundAttribute);
-
-	void SetValue(double tx, const Value& value);
-	Value GetValue(void) const;
-
-	void SetType(AttributeType type);
-	AttributeType GetType(void) const;
-
-	void SetTx(double tx);
-	double GetTx(void) const;
-
-private:
-	AttributeType m_Type; /**< The type of the attribute. */
-	double m_Tx; /**< The timestamp of the last value change. */
-	bool m_OwnsAttribute; /**< Whether we own the Data pointer. */
-	AttributeBase *m_Attribute; /**< The current value of the attribute. */
-};
-
-}
-
-#endif /* ATTRIBUTE_H */

lib/base/base.vcxproj

@@ -21,7 +21,6 @@
   <ItemGroup>
     <ClCompile Include="application.cpp" />
     <ClCompile Include="array.cpp" />
-    <ClCompile Include="attribute.cpp" />
     <ClCompile Include="bufferedstream.cpp" />
     <ClCompile Include="consolelogger.cpp" />
     <ClCompile Include="convert.cpp" />
@@ -66,7 +65,6 @@
   <ItemGroup>
     <ClInclude Include="application.h" />
     <ClInclude Include="array.h" />
-    <ClInclude Include="attribute.h" />
     <ClInclude Include="bufferedstream.h" />
     <ClInclude Include="consolelogger.h" />
     <ClInclude Include="convert.h" />
@@ -270,4 +268,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

lib/base/base.vcxproj.filters

@@ -88,9 +88,6 @@
     <ClCompile Include="process-windows.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="attribute.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="stacktrace.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -222,9 +219,6 @@
     <ClInclude Include="objectlock.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="attribute.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="stacktrace.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -285,4 +279,4 @@
       <UniqueIdentifier>{7bbee99c-5763-4063-836c-ddbcc8966ae3}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>

lib/base/consolelogger.cpp

@@ -28,8 +28,9 @@ REGISTER_TYPE(ConsoleLogger);
 /**
  * Constructor for the ConsoleLogger class.
  */
-ConsoleLogger::ConsoleLogger(const Dictionary::Ptr& serializedUpdate)
-	: StreamLogger(serializedUpdate)
+void ConsoleLogger::Start()
 {
+	StreamLogger::Start();
+
 	BindStream(&std::cout, false);
 }

lib/base/consolelogger.h

@@ -36,7 +36,7 @@ class I2_BASE_API ConsoleLogger : public StreamLogger
 public:
 	DECLARE_PTR_TYPEDEFS(ConsoleLogger);
 
-	explicit ConsoleLogger(const Dictionary::Ptr& serializedUpdate);
+	virtual void Start(void);
 };
 
 }

lib/base/dynamicobject.cpp

@@ -30,6 +30,7 @@
 #include "base/scriptfunction.h"
 #include <fstream>
 #include <boost/make_shared.hpp>
+#include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 #include <boost/exception/errinfo_api_function.hpp>
 #include <boost/exception/errinfo_errno.hpp>
@@ -37,288 +38,67 @@
 
 using namespace icinga;
 
-static double l_CurrentTx = 0;
-static std::set<DynamicObject::WeakPtr> l_ModifiedObjects;
-static boost::mutex l_TransactionMutex;
-static boost::once_flag l_TransactionOnce = BOOST_ONCE_INIT;
-static Timer::Ptr l_TransactionTimer;
+boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnStarted;
+boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnStopped;
+boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnStateChanged;
 
-boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnRegistered;
-boost::signals2::signal<void (const DynamicObject::Ptr&)> DynamicObject::OnUnregistered;
-boost::signals2::signal<void (double, const std::set<DynamicObject::WeakPtr>&)> DynamicObject::OnTransactionClosing;
-boost::signals2::signal<void (double, const DynamicObject::Ptr&)> DynamicObject::OnFlushObject;
-boost::signals2::signal<void (const DynamicObject::Ptr&, const std::set<String, string_iless>&)> DynamicObject::OnAttributesChanged;
-
-DynamicObject::DynamicObject(const Dictionary::Ptr& serializedObject)
-	: m_ConfigTx(0), m_LocalTx(0), m_Registered(false)
-{
-	RegisterAttribute("__name", Attribute_Config, &m_Name);
-	RegisterAttribute("__type", Attribute_Config, &m_Type);
-	RegisterAttribute("__local", Attribute_Config, &m_Local);
-	RegisterAttribute("__source", Attribute_Local, &m_Source);
-	RegisterAttribute("__extensions", Attribute_Local, &m_Extensions);
-	RegisterAttribute("methods", Attribute_Config, &m_Methods);
-	RegisterAttribute("custom", Attribute_Config, &m_Custom);
-
-	if (!serializedObject->Contains("configTx"))
-		BOOST_THROW_EXCEPTION(std::invalid_argument("Serialized object must contain a config snapshot."));
-
-	/* apply config state from the config item/remote update;
-	 * The DynamicType::CreateObject function takes care of restoring
-	 * non-config state after the object has been fully constructed */
-	ApplyUpdate(serializedObject, Attribute_Config);
-
-	boost::call_once(l_TransactionOnce, &DynamicObject::Initialize);
-}
+DynamicObject::DynamicObject(void)
+	: m_Active(false)
+{ }
 
 DynamicObject::~DynamicObject(void)
 { }
 
-void DynamicObject::Initialize(void)
+Dictionary::Ptr DynamicObject::Serialize(int attributeTypes) const
 {
-	/* Set up a timer to periodically create a new transaction. */
-	l_TransactionTimer = boost::make_shared<Timer>();
-	l_TransactionTimer->SetInterval(0.5);
-	l_TransactionTimer->OnTimerExpired.connect(boost::bind(&DynamicObject::NewTx));
-	l_TransactionTimer->Start();
-}
+	Dictionary::Ptr update = boost::make_shared<Dictionary>();
 
-Dictionary::Ptr DynamicObject::BuildUpdate(double sinceTx, int attributeTypes) const
-{
+	ASSERT(!OwnsLock());
 	ObjectLock olock(this);
 
-	DynamicObject::AttributeConstIterator it;
+	InternalSerialize(update, attributeTypes);
 
-	Dictionary::Ptr attrs = boost::make_shared<Dictionary>();
-
-	{
-		boost::mutex::scoped_lock lock(m_AttributeMutex);
-
-		for (it = m_Attributes.begin(); it != m_Attributes.end(); ++it) {
-			if (it->second.GetType() == Attribute_Transient)
-				continue;
-
-			if ((it->second.GetType() & attributeTypes) == 0)
-				continue;
-
-			if (it->second.GetTx() == 0)
-				continue;
-
-			if (it->second.GetTx() < sinceTx && !(it->second.GetType() == Attribute_Config && m_ConfigTx >= sinceTx))
-				continue;
-
-			Dictionary::Ptr attr = boost::make_shared<Dictionary>();
-			attr->Set("data", it->second.GetValue());
-			attr->Set("type", it->second.GetType());
-			attr->Set("tx", it->second.GetTx());
-
-			attrs->Set(it->first, attr);
-		}
-	}
-
-	Dictionary::Ptr update = boost::make_shared<Dictionary>();
-	update->Set("attrs", attrs);
-
-	if (m_ConfigTx >= sinceTx && attributeTypes & Attribute_Config)
-		update->Set("configTx", m_ConfigTx);
-	else if (attrs->GetLength() == 0)
-		return Dictionary::Ptr();
+	/* Make sure our own InternalSerialize() method was called. */
+	ASSERT(update->Contains("__marker"));
+	update->Remove("__marker");
 
 	return update;
 }
 
-void DynamicObject::ApplyUpdate(const Dictionary::Ptr& serializedUpdate,
-    int allowedTypes)
-{
-	ObjectLock olock(this);
-
-	Value configTxValue = serializedUpdate->Get("configTx");
-
-	boost::mutex::scoped_lock lock(m_AttributeMutex);
-
-	if ((allowedTypes & Attribute_Config) != 0 && !configTxValue.IsEmpty()) {
-		double configTx = configTxValue;
-
-		if (configTx > m_ConfigTx) {
-			DynamicObject::AttributeIterator at;
-			for (at = m_Attributes.begin(); at != m_Attributes.end(); ++at) {
-				if ((at->second.GetType() & Attribute_Config) == 0)
-					continue;
-
-				at->second.SetValue(0, Empty);
-			}
-		}
-	}
-
-	Dictionary::Ptr attrs = serializedUpdate->Get("attrs");
-
-	{
-		ObjectLock alock(attrs);
-
-		Dictionary::Iterator it;
-		for (it = attrs->Begin(); it != attrs->End(); ++it) {
-			if (!it->second.IsObjectType<Dictionary>())
-				continue;
-
-			Dictionary::Ptr attr = it->second;
-
-			int type = attr->Get("type");
-
-			if ((type & ~allowedTypes) != 0)
-				continue;
-
-			Value data = attr->Get("data");
-			double tx = attr->Get("tx");
-
-			if (type & Attribute_Config)
-				InternalRegisterAttribute(it->first, Attribute_Config);
-
-			if (m_Attributes.find(it->first) == m_Attributes.end())
-				InternalRegisterAttribute(it->first, static_cast<AttributeType>(type));
-
-			InternalSetAttribute(it->first, data, tx, true);
-		}
-	}
-}
-
-void DynamicObject::RegisterAttribute(const String& name,
-    AttributeType type, AttributeBase *boundAttribute)
+void DynamicObject::Deserialize(const Dictionary::Ptr& update, int attributeTypes)
 {
 	ASSERT(!OwnsLock());
 	ObjectLock olock(this);
 
-	boost::mutex::scoped_lock lock(m_AttributeMutex);
-
-	InternalRegisterAttribute(name, type, boundAttribute);
+	InternalDeserialize(update, attributeTypes);
 }
 
-/**
- * Note: Caller must hold m_AttributeMutex.
- */
-void DynamicObject::InternalRegisterAttribute(const String& name,
-    AttributeType type, AttributeBase *boundAttribute)
+void DynamicObject::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
 {
-	ASSERT(OwnsLock());
-
-	AttributeHolder attr(type, boundAttribute);
-
-	std::pair<DynamicObject::AttributeIterator, bool> tt;
-	tt = m_Attributes.insert(std::make_pair(name, attr));
-
-	if (!tt.second) {
-		tt.first->second.SetType(type);
-
-		if (boundAttribute)
-			tt.first->second.Bind(boundAttribute);
-	}
-}
-
-void DynamicObject::Set(const String& name, const Value& data)
-{
-	ASSERT(!OwnsLock());
-	ObjectLock olock(this);
-
-	boost::mutex::scoped_lock lock(m_AttributeMutex);
-
-	InternalSetAttribute(name, data, GetCurrentTx());
-}
-
-void DynamicObject::Touch(const String& name)
-{
-	ASSERT(OwnsLock());
-
-	boost::mutex::scoped_lock lock(m_AttributeMutex);
-
-	AttributeIterator it = m_Attributes.find(name);
-
-	if (it == m_Attributes.end())
-		BOOST_THROW_EXCEPTION(std::runtime_error("Touch() called for unknown attribute: " + name));
-
-	double tx = GetCurrentTx();
-	it->second.SetTx(tx);
-	m_LocalTx = tx;
-
-	m_ModifiedAttributes.insert(name);
-
-	{
-		boost::mutex::scoped_lock lock(l_TransactionMutex);
-		l_ModifiedObjects.insert(GetSelf());
-	}
-}
-
-double DynamicObject::GetLocalTx(void) const
-{
-	boost::mutex::scoped_lock lock(m_AttributeMutex);
-	return m_LocalTx;
-}
-
-Value DynamicObject::Get(const String& name) const
-{
-	ASSERT(!OwnsLock());
-	ObjectLock olock(this);
-
-	boost::mutex::scoped_lock lock(m_AttributeMutex);
-
-	return InternalGetAttribute(name);
-}
-
-/**
- * Note: Caller must hold m_AttributeMutex.
- */
-void DynamicObject::InternalSetAttribute(const String& name, const Value& data,
-    double tx, bool allowEditConfig)
-{
-	ASSERT(OwnsLock());
-
-	DynamicObject::AttributeIterator it;
-	it = m_Attributes.find(name);
-
-	if (it == m_Attributes.end()) {
-		AttributeHolder attr(Attribute_Transient);
-		attr.SetValue(tx, data);
-
-		m_Attributes.insert(std::make_pair(name, attr));
-	} else {
-		if (!allowEditConfig && (it->second.GetType() & Attribute_Config))
-			BOOST_THROW_EXCEPTION(std::runtime_error("Config properties are immutable: '" + name + "'."));
-
-		if (tx > it->second.GetTx()) {
-			it->second.SetValue(tx, data);
-
-			if (it->second.GetType() & Attribute_Config)
-				m_ConfigTx = tx;
-		}
+	if (attributeTypes & Attribute_Config) {
+		bag->Set("__name", m_Name);
+		bag->Set("__type", m_Type);
+		bag->Set("methods", m_Methods);
+		bag->Set("custom", m_Custom);
 	}
 
-	if (IsRegistered()) {
-		/* We can't call GetSelf() in the constructor or destructor.
-		 * The Register() function will take care of adding this
-		 * object to the list of modified objects later on if we can't
-		 * do it here. */
+	bag->Set("extensions", m_Extensions);
 
-		{
-			boost::mutex::scoped_lock lock(l_TransactionMutex);
-			l_ModifiedObjects.insert(GetSelf());
-		}
-	}
-
-	m_ModifiedAttributes.insert(name);
+	/* This attribute is used by Serialize() to check that this
+	 * method was called. */
+	bag->Set("__marker", 1);
 }
 
-/**
- * Note: Caller must hold m_AttributeMutex.
- */
-Value DynamicObject::InternalGetAttribute(const String& name) const
+void DynamicObject::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
 {
-	ASSERT(OwnsLock());
+	if (attributeTypes & Attribute_Config) {
+		m_Name = bag->Get("__name");
+		m_Type = bag->Get("__type");
+		m_Methods = bag->Get("methods");
+		m_Custom = bag->Get("custom");
+	}
 
-	DynamicObject::AttributeConstIterator it;
-	it = m_Attributes.find(name);
-
-	if (it == m_Attributes.end())
-		return Empty;
-
-	return it->second.GetValue();
+	m_Extensions = bag->Get("extensions");
 }
 
 DynamicType::Ptr DynamicObject::GetType(void) const
@@ -331,26 +111,9 @@ String DynamicObject::GetName(void) const
 	return m_Name;
 }
 
-bool DynamicObject::IsLocal(void) const
+bool DynamicObject::IsActive(void) const
 {
-	return m_Local;
-}
-
-bool DynamicObject::IsRegistered(void) const
-{
-	ObjectLock olock(GetType());
-	return m_Registered;
-}
-
-void DynamicObject::SetSource(const String& value)
-{
-	m_Source = value;
-	Touch("__source");
-}
-
-String DynamicObject::GetSource(void) const
-{
-	return m_Source;
+	return m_Active;
 }
 
 void DynamicObject::SetExtension(const String& key, const Object::Ptr& object)
@@ -363,7 +126,6 @@ void DynamicObject::SetExtension(const String& key, const Object::Ptr& object)
 	}
 
 	extensions->Set(key, object);
-	Touch("__extensions");
 }
 
 Object::Ptr DynamicObject::GetExtension(const String& key)
@@ -384,67 +146,34 @@ void DynamicObject::ClearExtension(const String& key)
 		return;
 
 	extensions->Remove(key);
-	Touch("__extensions");
 }
 
 void DynamicObject::Register(void)
 {
 	ASSERT(!OwnsLock());
 
-	/* Add this new object to the list of modified objects.
-	 * We're doing this here because we can't construct
-	 * a while WeakPtr from within the object's constructor. */
-	{
-		boost::mutex::scoped_lock lock(l_TransactionMutex);
-		l_ModifiedObjects.insert(GetSelf());
-	}
-
 	DynamicType::Ptr dtype = GetType();
 	dtype->RegisterObject(GetSelf());
 }
 
-void DynamicObject::OnRegistrationCompleted(void)
-{
-	ASSERT(!OwnsLock());
-
-	Start();
-
-	OnRegistered(GetSelf());
-}
-
-void DynamicObject::OnUnregistrationCompleted(void)
-{
-	ASSERT(!OwnsLock());
-
-	Stop();
-
-	OnUnregistered(GetSelf());
-}
-
 void DynamicObject::Start(void)
 {
 	ASSERT(!OwnsLock());
 
-	/* Nothing to do here. */
+	ASSERT(!m_Active);
+	m_Active = true;
+
+	OnStarted(GetSelf());
 }
 
 void DynamicObject::Stop(void)
 {
 	ASSERT(!OwnsLock());
 
-	/* Nothing to do here. */
-}
+	ASSERT(m_Active);
+	m_Active = false;
 
-void DynamicObject::Unregister(void)
-{
-	ASSERT(!OwnsLock());
-
-	DynamicType::Ptr dtype = GetType();
-
-	if (!dtype)
-		return;
-
-	dtype->UnregisterObject(GetSelf());
+	OnStopped(GetSelf());
 }
 
 Value DynamicObject::InvokeMethod(const String& method,
@@ -470,7 +199,7 @@ Value DynamicObject::InvokeMethod(const String& method,
 	return func->Invoke(arguments);
 }
 
-void DynamicObject::DumpObjects(const String& filename)
+void DynamicObject::DumpObjects(const String& filename, int attributeTypes)
 {
 	Log(LogInformation, "base", "Dumping program state to file '" + filename + "'");
 
@@ -486,22 +215,12 @@ void DynamicObject::DumpObjects(const String& filename)
 
 	BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) {
 		BOOST_FOREACH(const DynamicObject::Ptr& object, type->GetObjects()) {
-			if (object->IsLocal())
-				continue;
-
 			Dictionary::Ptr persistentObject = boost::make_shared<Dictionary>();
 
 			persistentObject->Set("type", type->GetName());
 			persistentObject->Set("name", object->GetName());
 
-			int types = Attribute_Local | Attribute_Replicated;
-
-			/* only persist properties for replicated objects or for objects
-			 * that are marked as persistent */
-			if (!object->GetSource().IsEmpty() /*|| object->IsPersistent()*/)
-				types |= Attribute_Config;
-
-			Dictionary::Ptr update = object->BuildUpdate(0, types);
+			Dictionary::Ptr update = object->Serialize(attributeTypes);
 
 			if (!update)
 				continue;
@@ -531,7 +250,7 @@ void DynamicObject::DumpObjects(const String& filename)
 	}
 }
 
-void DynamicObject::RestoreObjects(const String& filename)
+void DynamicObject::RestoreObjects(const String& filename, int attributeTypes)
 {
 	Log(LogInformation, "base", "Restoring program state from file '" + filename + "'");
 
@@ -550,8 +269,6 @@ void DynamicObject::RestoreObjects(const String& filename)
 		String name = persistentObject->Get("name");
 		Dictionary::Ptr update = persistentObject->Get("update");
 
-		bool hasConfig = update->Contains("configTx");
-
 		DynamicType::Ptr dt = DynamicType::GetByName(type);
 
 		if (!dt)
@@ -559,12 +276,8 @@ void DynamicObject::RestoreObjects(const String& filename)
 
 		DynamicObject::Ptr object = dt->GetObject(name);
 
-		if (hasConfig && !object) {
-			object = dt->DynamicType::CreateObject(update);
-			object->Register();
-		} else if (object) {
-			object->ApplyUpdate(update, Attribute_All);
-		}
+		if (object)
+			object->Deserialize(update, attributeTypes);
 
 		restored++;
 	}
@@ -576,86 +289,22 @@ void DynamicObject::RestoreObjects(const String& filename)
 	Log(LogInformation, "base", msgbuf.str());
 }
 
-void DynamicObject::DeactivateObjects(void)
+void DynamicObject::StopObjects(void)
 {
 	BOOST_FOREACH(const DynamicType::Ptr& dt, DynamicType::GetTypes()) {
 		BOOST_FOREACH(const DynamicObject::Ptr& object, dt->GetObjects()) {
-			object->Unregister();
+			if (object->IsActive())
+				object->Stop();
 		}
 	}
 }
 
-double DynamicObject::GetCurrentTx(void)
-{
-	boost::mutex::scoped_lock lock(l_TransactionMutex);
-
-	if (l_CurrentTx == 0) {
-		/* Set the initial transaction ID. */
-		l_CurrentTx = Utility::GetTime();
-	}
-
-	return l_CurrentTx;
-}
-
-void DynamicObject::Flush(void)
-{
-	OnFlushObject(GetCurrentTx(), GetSelf());
-}
-
-void DynamicObject::NewTx(void)
-{
-	double tx;
-	std::set<DynamicObject::WeakPtr> objects;
-
-	{
-		boost::mutex::scoped_lock lock(l_TransactionMutex);
-
-		tx = l_CurrentTx;
-		l_ModifiedObjects.swap(objects);
-		l_CurrentTx = Utility::GetTime();
-	}
-
-	BOOST_FOREACH(const DynamicObject::WeakPtr& wobject, objects) {
-		DynamicObject::Ptr object = wobject.lock();
-
-		if (!object || !object->IsRegistered())
-			continue;
-
-		std::set<String, string_iless> attrs;
-
-		{
-			ObjectLock olock(object);
-			attrs.swap(object->m_ModifiedAttributes);
-		}
-
-		OnAttributesChanged(object, attrs);
-
-		BOOST_FOREACH(const String& attr, attrs) {
-			object->OnAttributeChanged(attr);
-		}
-	}
-
-	OnTransactionClosing(tx, objects);
-}
-
-void DynamicObject::OnAttributeChanged(const String&)
-{
-	ASSERT(!OwnsLock());
-}
-
 DynamicObject::Ptr DynamicObject::GetObject(const String& type, const String& name)
 {
 	DynamicType::Ptr dtype = DynamicType::GetByName(type);
 	return dtype->GetObject(name);
 }
 
-const DynamicObject::AttributeMap& DynamicObject::GetAttributes(void) const
-{
-	ASSERT(OwnsLock());
-
-	return m_Attributes;
-}
-
 Dictionary::Ptr DynamicObject::GetCustom(void) const
 {
 	return m_Custom;

lib/base/dynamicobject.h

@@ -21,7 +21,6 @@
 #define DYNAMICOBJECT_H
 
 #include "base/i2-base.h"
-#include "base/attribute.h"
 #include "base/object.h"
 #include "base/dictionary.h"
 #include <boost/signals2.hpp>
@@ -33,6 +32,27 @@ namespace icinga
 
 class DynamicType;
 
+/**
+ * The type of an attribute for a DynamicObject.
+ *
+ * @ingroup base
+ */
+enum AttributeType
+{
+	Attribute_Transient = 1,
+
+	/* Unlike transient attributes local attributes are persisted
+	 * in the program state file. */
+	Attribute_Local = 2,
+
+	/* Attributes read from the config file are implicitly marked
+	 * as config attributes. */
+	Attribute_Config = 4,
+
+	/* Combination of all attribute types */
+	Attribute_All = Attribute_Transient | Attribute_Local | Attribute_Config
+};
+
 /**
  * A dynamic object that can be instantiated from the configuration file
  * and that supports attribute replication to remote application instances.
@@ -44,106 +64,77 @@ class I2_BASE_API DynamicObject : public Object
 public:
 	DECLARE_PTR_TYPEDEFS(DynamicObject);
 
-	typedef std::map<String, AttributeHolder, string_iless> AttributeMap;
-	typedef AttributeMap::iterator AttributeIterator;
-	typedef AttributeMap::const_iterator AttributeConstIterator;
-
 	~DynamicObject(void);
 
-	static void Initialize(void);
+	Dictionary::Ptr Serialize(int attributeTypes) const;
+	void Deserialize(const Dictionary::Ptr& update, int attributeTypes);
 
-	Dictionary::Ptr BuildUpdate(double sinceTx, int attributeTypes) const;
-	void ApplyUpdate(const Dictionary::Ptr& serializedUpdate, int allowedTypes);
-
-	void RegisterAttribute(const String& name, AttributeType type, AttributeBase *boundAttribute = NULL);
-
-	void Set(const String& name, const Value& data);
-	void Touch(const String& name);
-	Value Get(const String& name) const;
-
-	void BindAttribute(const String& name, Value *boundValue);
-
-	void ClearAttributesByType(AttributeType type);
-
-	static boost::signals2::signal<void (const DynamicObject::Ptr&)> OnRegistered;
-	static boost::signals2::signal<void (const DynamicObject::Ptr&)> OnUnregistered;
-	static boost::signals2::signal<void (double, const std::set<DynamicObject::WeakPtr>&)> OnTransactionClosing;
-	static boost::signals2::signal<void (double, const DynamicObject::Ptr&)> OnFlushObject;
-	static boost::signals2::signal<void (const DynamicObject::Ptr&, const std::set<String, string_iless>&)> OnAttributesChanged;
+	static boost::signals2::signal<void (const DynamicObject::Ptr&)> OnStarted;
+	static boost::signals2::signal<void (const DynamicObject::Ptr&)> OnStopped;
+	static boost::signals2::signal<void (const DynamicObject::Ptr&)> OnStateChanged;
 
 	Value InvokeMethod(const String& method, const std::vector<Value>& arguments);
 
 	shared_ptr<DynamicType> GetType(void) const;
 	String GetName(void) const;
 
-	bool IsLocal(void) const;
-	bool IsRegistered(void) const;
-
-	void SetSource(const String& value);
-	String GetSource(void) const;
+	bool IsActive(void) const;
 
 	void SetExtension(const String& key, const Object::Ptr& object);
 	Object::Ptr GetExtension(const String& key);
 	void ClearExtension(const String& key);
 
-	void Flush(void);
-
 	void Register(void);
-	void Unregister(void);
+
+	void Activate(void);
+	void Deactivate(void);
 
 	virtual void Start(void);
 	virtual void Stop(void);
 
-	double GetLocalTx(void) const;
+	template<typename T>
+	static shared_ptr<T> GetObject(const String& name)
+	{
+		DynamicObject::Ptr object = GetObject(T::GetTypeName(), name);
 
-	const AttributeMap& GetAttributes(void) const;
+		return dynamic_pointer_cast<T>(object);
+	}
 
-	static DynamicObject::Ptr GetObject(const String& type, const String& name);
-
-	static void DumpObjects(const String& filename);
-	static void RestoreObjects(const String& filename);
-	static void DeactivateObjects(void);
-
-	static double GetCurrentTx(void);
+	static void DumpObjects(const String& filename, int attributeTypes = Attribute_Local);
+	static void RestoreObjects(const String& filename, int attributeTypes = Attribute_Local);
+	static void StopObjects(void);
 
 	Dictionary::Ptr GetCustom(void) const;
 
 protected:
-	explicit DynamicObject(const Dictionary::Ptr& serializedObject);
+	explicit DynamicObject(void);
 
-	virtual void OnRegistrationCompleted(void);
-	virtual void OnUnregistrationCompleted(void);
-
-	virtual void OnAttributeChanged(const String& name);
+	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
+	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
 
 private:
-	void InternalSetAttribute(const String& name, const Value& data, double tx, bool allowEditConfig = false);
-	Value InternalGetAttribute(const String& name) const;
-	void InternalRegisterAttribute(const String& name, AttributeType type, AttributeBase *boundAttribute = NULL);
+	String m_Name;
+	String m_Type;
+	Dictionary::Ptr m_Extensions;
+	Dictionary::Ptr m_Methods;
+	Dictionary::Ptr m_Custom;
 
-	mutable boost::mutex m_AttributeMutex;
-	AttributeMap m_Attributes;
-	std::set<String, string_iless> m_ModifiedAttributes;
-	double m_ConfigTx;
-	double m_LocalTx;
+	bool m_Active;
 
-	Attribute<String> m_Name;
-	Attribute<String> m_Type;
-	Attribute<bool> m_Local;
-	Attribute<String> m_Source;
-	Attribute<Dictionary::Ptr> m_Extensions;
-	Attribute<Dictionary::Ptr> m_Methods;
-	Attribute<Dictionary::Ptr> m_Custom;
-
-	bool m_Registered;	/**< protected by the type mutex */
-
-	static double m_CurrentTx;
-
-	static void NewTx(void);
-
-	friend class DynamicType; /* for OnRegistrationCompleted. */
+	static DynamicObject::Ptr GetObject(const String& type, const String& name);
 };
 
+#define DECLARE_TYPENAME(klass)						\
+	inline static String GetTypeName(void)				\
+	{								\
+		return #klass;						\
+	}								\
+									\
+	inline static shared_ptr<klass> GetByName(const String& name)	\
+	{								\
+		return DynamicObject::GetObject<klass>(name);		\
+	}
+
 }
 
 #endif /* DYNAMICOBJECT_H */

lib/base/dynamictype.cpp

@@ -48,29 +48,29 @@ DynamicType::TypeMap& DynamicType::InternalGetTypeMap(void)
 	return typemap;
 }
 
-DynamicType::TypeSet& DynamicType::InternalGetTypeSet(void)
+DynamicType::TypeVector& DynamicType::InternalGetTypeVector(void)
 {
-	static DynamicType::TypeSet typeset;
-	return typeset;
+	static DynamicType::TypeVector typevector;
+	return typevector;
 }
 
-DynamicType::TypeSet DynamicType::GetTypes(void)
+DynamicType::TypeVector DynamicType::GetTypes(void)
 {
 	boost::mutex::scoped_lock lock(GetStaticMutex());
-	return InternalGetTypeSet(); /* Making a copy of the set here. */
+	return InternalGetTypeVector(); /* Making a copy of the vector here. */
 }
 
-std::set<DynamicObject::Ptr> DynamicType::GetObjects(const String& type)
+std::vector<DynamicObject::Ptr> DynamicType::GetObjects(const String& type)
 {
 	DynamicType::Ptr dt = GetByName(type);
 	return dt->GetObjects();
 }
 
-std::set<DynamicObject::Ptr> DynamicType::GetObjects(void) const
+std::vector<DynamicObject::Ptr> DynamicType::GetObjects(void) const
 {
 	ObjectLock olock(this);
 
-	return m_ObjectSet; /* Making a copy of the set here. */
+	return m_ObjectVector; /* Making a copy of the vector here. */
 }
 
 String DynamicType::GetName(void) const
@@ -95,26 +95,8 @@ void DynamicType::RegisterObject(const DynamicObject::Ptr& object)
 		}
 
 		m_ObjectMap[name] = object;
-		m_ObjectSet.insert(object);
-
-		object->m_Registered = true;
+		m_ObjectVector.push_back(object);
 	}
-
-	object->OnRegistrationCompleted();
-}
-
-void DynamicType::UnregisterObject(const DynamicObject::Ptr& object)
-{
-	{
-		ObjectLock olock(this);
-
-		m_ObjectMap.erase(object->GetName());
-		m_ObjectSet.erase(object);
-
-		object->m_Registered = false;
-	}
-
-	object->OnUnregistrationCompleted();
 }
 
 DynamicObject::Ptr DynamicType::GetObject(const String& name) const
@@ -140,7 +122,7 @@ void DynamicType::RegisterType(const DynamicType::Ptr& type)
 		    type->GetName() + "': Objects of this type already exist."));
 
 	InternalGetTypeMap()[type->GetName()] = type;
-	InternalGetTypeSet().insert(type);
+	InternalGetTypeVector().push_back(type);
 }
 
 DynamicObject::Ptr DynamicType::CreateObject(const Dictionary::Ptr& serializedUpdate)
@@ -154,10 +136,9 @@ DynamicObject::Ptr DynamicType::CreateObject(const Dictionary::Ptr& serializedUp
 		factory = m_ObjectFactory;
 	}
 
-	DynamicObject::Ptr object = factory(serializedUpdate);
+	DynamicObject::Ptr object = factory();
 
-	/* apply the object's non-config attributes */
-	object->ApplyUpdate(serializedUpdate, Attribute_All & ~Attribute_Config);
+	object->Deserialize(serializedUpdate, Attribute_All);
 
 	return object;
 }

lib/base/dynamictype.h

@@ -23,6 +23,7 @@
 #include "base/i2-base.h"
 #include "base/registry.h"
 #include "base/dynamicobject.h"
+#include "base/utility.h"
 #include <map>
 #include <set>
 #include <boost/function.hpp>
@@ -36,7 +37,7 @@ class I2_BASE_API DynamicType : public Object
 public:
 	DECLARE_PTR_TYPEDEFS(DynamicType);
 
-	typedef boost::function<DynamicObject::Ptr (const Dictionary::Ptr&)> ObjectFactory;
+	typedef boost::function<DynamicObject::Ptr (void)> ObjectFactory;
 
 	DynamicType(const String& name, const ObjectFactory& factory);
 
@@ -50,29 +51,44 @@ public:
 	DynamicObject::Ptr GetObject(const String& name) const;
 
 	void RegisterObject(const DynamicObject::Ptr& object);
-	void UnregisterObject(const DynamicObject::Ptr& object);
 
-	static std::set<DynamicType::Ptr> GetTypes(void);
-	std::set<DynamicObject::Ptr> GetObjects(void) const;
+	static std::vector<DynamicType::Ptr> GetTypes(void);
+	std::vector<DynamicObject::Ptr> GetObjects(void) const;
 
-	static std::set<DynamicObject::Ptr> GetObjects(const String& type);
+	template<typename T>
+	static std::vector<shared_ptr<T> > GetObjects(void)
+	{
+		std::vector<shared_ptr<T> > objects;
+
+		BOOST_FOREACH(const DynamicObject::Ptr& object, GetObjects(T::GetTypeName())) {
+			shared_ptr<T> tobject = dynamic_pointer_cast<T>(object);
+
+			ASSERT(tobject);
+
+			objects.push_back(tobject);
+		}
+
+		return objects;
+	}
 
 private:
 	String m_Name;
 	ObjectFactory m_ObjectFactory;
 
 	typedef std::map<String, DynamicObject::Ptr, string_iless> ObjectMap;
-	typedef std::set<DynamicObject::Ptr> ObjectSet;
+	typedef std::vector<DynamicObject::Ptr> ObjectVector;
 
 	ObjectMap m_ObjectMap;
-	ObjectSet m_ObjectSet;
+	ObjectVector m_ObjectVector;
 
 	typedef std::map<String, DynamicType::Ptr, string_iless> TypeMap;
-	typedef std::set<DynamicType::Ptr> TypeSet;
+	typedef std::vector<DynamicType::Ptr> TypeVector;
 
 	static TypeMap& InternalGetTypeMap(void);
-	static TypeSet& InternalGetTypeSet(void);
+	static TypeVector& InternalGetTypeVector(void);
 	static boost::mutex& GetStaticMutex(void);
+
+	static std::vector<DynamicObject::Ptr> GetObjects(const String& type);
 };
 
 /**
@@ -104,9 +120,9 @@ public:
  * @ingroup base
  */
 template<typename T>
-shared_ptr<T> DynamicObjectFactory(const Dictionary::Ptr& serializedUpdate)
+shared_ptr<T> DynamicObjectFactory(void)
 {
-	return boost::make_shared<T>(serializedUpdate);
+	return boost::make_shared<T>();
 }
 
 #define REGISTER_TYPE_ALIAS(type, alias) \

lib/base/filelogger.cpp

@@ -28,10 +28,9 @@ REGISTER_TYPE(FileLogger);
 /**
  * Constructor for the FileLogger class.
  */
-FileLogger::FileLogger(const Dictionary::Ptr& serializedUpdate)
-	: StreamLogger(serializedUpdate)
+void FileLogger::Start()
 {
-	RegisterAttribute("path", Attribute_Config, &m_Path);
+	StreamLogger::Start();
 
 	std::ofstream *stream = new std::ofstream();
 
@@ -48,4 +47,19 @@ FileLogger::FileLogger(const Dictionary::Ptr& serializedUpdate)
 	}
 
 	BindStream(stream, true);
-}
+}
+
+void FileLogger::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
+{
+	StreamLogger::InternalSerialize(bag, attributeTypes);
+
+	bag->Set("path", m_Path);
+}
+
+void FileLogger::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
+{
+	StreamLogger::InternalDeserialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config)
+		m_Path = bag->Get("path");
+}

lib/base/filelogger.h

@@ -36,10 +36,14 @@ class I2_BASE_API FileLogger : public StreamLogger
 public:
 	DECLARE_PTR_TYPEDEFS(FileLogger);
 
-	explicit FileLogger(const Dictionary::Ptr& serializedUpdate);
+	virtual void Start(void);
+
+protected:
+	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
+	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
 
 private:
-	Attribute<String> m_Path;
+	String m_Path;
 };
 
 }

lib/base/logger.cpp

@@ -34,20 +34,11 @@ boost::mutex Logger::m_Mutex;
 
 /**
  * Constructor for the Logger class.
- *
- * @param serializedUpdate A serialized dictionary containing attributes.
  */
-Logger::Logger(const Dictionary::Ptr& serializedUpdate)
-	: DynamicObject(serializedUpdate)
-{
-	RegisterAttribute("severity", Attribute_Config, &m_Severity);
-
-	if (!IsLocal())
-		BOOST_THROW_EXCEPTION(std::runtime_error("Logger objects must be local."));
-}
-
 void Logger::Start(void)
 {
+	DynamicObject::Start();
+
 	boost::mutex::scoped_lock(m_Mutex);
 	m_Loggers.insert(GetSelf());
 }
@@ -161,12 +152,17 @@ LogSeverity Logger::StringToSeverity(const String& severity)
 		BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid severity: " + severity));
 }
 
-///**
-// * Retrieves the configuration object that belongs to this logger.
-// *
-// * @returns The configuration object.
-// */
-//DynamicObject::Ptr ILogger::GetConfig(void) const
-//{
-//	return m_Config.lock();
-//}
+void Logger::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
+{
+	DynamicObject::InternalSerialize(bag, attributeTypes);
+
+	bag->Set("severity", m_Severity);
+}
+
+void Logger::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
+{
+	DynamicObject::InternalDeserialize(bag, attributeTypes);
+
+	if (attributeTypes & Attribute_Config)
+		m_Severity = bag->Get("severity");
+}

lib/base/logger.h

@@ -50,8 +50,6 @@ class I2_BASE_API Logger : public DynamicObject
 public:
 	DECLARE_PTR_TYPEDEFS(Logger);
 
-	explicit Logger(const Dictionary::Ptr& serializedUpdate);
-
 	static String SeverityToString(LogSeverity severity);
 	static LogSeverity StringToSeverity(const String& severity);
 
@@ -71,8 +69,11 @@ protected:
 	virtual void Start(void);
 	virtual void Stop(void);
 
+	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
+	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
+
 private:
-	Attribute<String> m_Severity;
+	String m_Severity;
 
 	LogSeverity m_MinSeverity;
 

lib/base/registry.h

@@ -26,6 +26,8 @@
 #include <map>
 #include <boost/thread/mutex.hpp>
 #include <boost/signals2.hpp>
+#include <boost/foreach.hpp>
+#include <boost/tuple/tuple.hpp>
 
 namespace icinga
 {
@@ -78,6 +80,26 @@ public:
 			OnUnregistered(name);
 	}
 
+	void Clear(void)
+	{
+		typename Registry<T>::ItemMap items;
+
+		{
+			boost::mutex::scoped_lock lock(m_Mutex);
+			items = m_Items;
+		}
+
+		String name;
+		BOOST_FOREACH(boost::tie(name, boost::tuples::ignore), items) {
+			OnUnregistered(name);
+		}
+
+		{
+			boost::mutex::scoped_lock lock(m_Mutex);
+			m_Items.clear();
+		}
+	}
+
 	T GetItem(const String& name) const
 	{
 		boost::mutex::scoped_lock lock(m_Mutex);

lib/base/script.cpp

@@ -28,20 +28,10 @@ using namespace icinga;
 
 REGISTER_TYPE(Script);
 
-/**
- * Constructor for the Script class.
- *
- * @param serializedUpdate A serialized dictionary containing attributes.
- */
-Script::Script(const Dictionary::Ptr& serializedUpdate)
-	: DynamicObject(serializedUpdate)
-{
-	RegisterAttribute("language", Attribute_Config, &m_Language);
-	RegisterAttribute("code", Attribute_Config, &m_Code);
-}
-
 void Script::Start(void)
 {
+	DynamicObject::Start();
+
 	ASSERT(OwnsLock());
 
 	SpawnInterpreter();
@@ -61,14 +51,6 @@ String Script::GetCode(void) const
 	return m_Code;
 }
 
-void Script::OnAttributeUpdate(const String& name)
-{
-	ASSERT(!OwnsLock());
-
-	if (name == "language" || name == "code")
-		SpawnInterpreter();
-}
-
 void Script::SpawnInterpreter(void)
 {
 	Log(LogInformation, "base", "Reloading script '" + GetName() + "'");
@@ -76,3 +58,20 @@ void Script::SpawnInterpreter(void)
 	ScriptLanguage::Ptr language = ScriptLanguage::GetByName(GetLanguage());
 	m_Interpreter = language->CreateInterpreter(GetSelf());
 }
+
+void Script::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
+{
+	DynamicObject::InternalSerialize(bag, attributeTypes);
+
+	bag->Set("language", m_Language);
+	bag->Set("code", m_Code);
+}
+
+void Script::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
+{
+	DynamicObject::InternalDeserialize(bag, attributeTypes);
+
+	m_Language = bag->Get("language");
+	m_Code = bag->Get("code");
+
+}

lib/base/script.h

@@ -38,19 +38,18 @@ class I2_BASE_API Script : public DynamicObject
 public:
 	DECLARE_PTR_TYPEDEFS(Script);
 
-	Script(const Dictionary::Ptr& serializedUpdate);
-
 	virtual void Start(void);
 
 	String GetLanguage(void) const;
 	String GetCode(void) const;
 
 protected:
-	virtual void OnAttributeUpdate(const String& name);
+	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
+	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
 
 private:
-	Attribute<String> m_Language;
-	Attribute<String> m_Code;
+	String m_Language;
+	String m_Code;
 
 	shared_ptr<ScriptInterpreter> m_Interpreter;
 

lib/base/scriptfunctionwrapper.h

@@ -34,7 +34,7 @@ Value ScriptFunctionWrapperVV(void (*function)(void), const std::vector<Value>&
 boost::function<Value (const std::vector<Value>& arguments)> I2_BASE_API WrapScriptFunction(void (*function)(void));
 
 template<typename TR>
-Value ScriptFunctionWrapperR(TR (*function)(void), const std::vector<Value>& arguments)
+Value ScriptFunctionWrapperR(TR (*function)(void), const std::vector<Value>&)
 {
 	return function();
 }

lib/base/streamlogger.cpp

@@ -31,9 +31,14 @@ boost::mutex StreamLogger::m_Mutex;
 /**
  * Constructor for the StreamLogger class.
  */
-StreamLogger::StreamLogger(const Dictionary::Ptr& serializedUpdate)
-	: Logger(serializedUpdate), m_Stream(NULL), m_OwnsStream(false), m_Tty(false)
-{ }
+void StreamLogger::Start(void)
+{
+	Logger::Start();
+
+	m_Stream = NULL;
+	m_OwnsStream = false;
+	m_Tty = false;
+}
 
 /**
  * Destructor for the StreamLogger class.

lib/base/streamlogger.h

@@ -37,7 +37,7 @@ class I2_BASE_API StreamLogger : public Logger
 public:
 	DECLARE_PTR_TYPEDEFS(StreamLogger);
 
-	StreamLogger(const Dictionary::Ptr& serializedUpdate);
+	virtual void Start(void);
 	~StreamLogger(void);
 
 	void BindStream(std::ostream *stream, bool ownsStream);

lib/base/sysloglogger.cpp

@@ -25,13 +25,6 @@ using namespace icinga;
 
 REGISTER_TYPE(SyslogLogger);
 
-/**
- * Constructor for the SyslogLogger class.
- */
-SyslogLogger::SyslogLogger(const Dictionary::Ptr& serializedUpdate)
-	: Logger(serializedUpdate)
-{ }
-
 /**
  * Processes a log entry and outputs it to syslog.
  *

lib/base/sysloglogger.h

@@ -37,8 +37,6 @@ class I2_BASE_API SyslogLogger : public Logger
 public:
 	DECLARE_PTR_TYPEDEFS(SyslogLogger);
 
-	explicit SyslogLogger(const Dictionary::Ptr& serializedUpdate);
-
 protected:
 	virtual void ProcessLogEntry(const LogEntry& entry);
 };

lib/base/threadpool.cpp

@@ -30,8 +30,8 @@
 using namespace icinga;
 
 ThreadPool::ThreadPool(void)
-	: m_Stopped(false), m_ThreadDeaths(0), m_WaitTime(0),
-	  m_ServiceTime(0), m_TaskCount(0)
+	: m_ThreadDeaths(0), m_WaitTime(0), m_ServiceTime(0),
+	  m_TaskCount(0), m_Stopped(false)
 {
 	for (int i = 0; i < 2; i++)
 		SpawnWorker();
@@ -71,7 +71,7 @@ void ThreadPool::Join(void)
 
 	do {
 		alive = 0;
-		for (int i = 0; i < sizeof(m_ThreadStats) / sizeof(m_ThreadStats[0]); i++) {
+		for (size_t i = 0; i < sizeof(m_ThreadStats) / sizeof(m_ThreadStats[0]); i++) {
 			if (m_ThreadStats[i].State != ThreadDead) {
 				alive++;
 				KillWorker();
@@ -223,7 +223,7 @@ void ThreadPool::ManagerThreadProc(void)
 	Utility::SetThreadName(idbuf.str());
 
 	for (;;) {
-		int pending, alive;
+		size_t pending, alive;
 		double avg_latency, max_latency;
 		double utilization = 0;
 
@@ -239,7 +239,7 @@ void ThreadPool::ManagerThreadProc(void)
 
 			alive = 0;
 
-			for (int i = 0; i < sizeof(m_ThreadStats) / sizeof(m_ThreadStats[0]); i++) {
+			for (size_t i = 0; i < sizeof(m_ThreadStats) / sizeof(m_ThreadStats[0]); i++) {
 				if (m_ThreadStats[i].State != ThreadDead) {
 					alive++;
 					utilization += m_ThreadStats[i].Utilization * 100;
@@ -294,7 +294,7 @@ void ThreadPool::ManagerThreadProc(void)
  */
 void ThreadPool::SpawnWorker(void)
 {
-	for (int i = 0; i < sizeof(m_ThreadStats) / sizeof(m_ThreadStats[0]); i++) {
+	for (size_t i = 0; i < sizeof(m_ThreadStats) / sizeof(m_ThreadStats[0]); i++) {
 		if (m_ThreadStats[i].State == ThreadDead) {
 			Log(LogDebug, "debug", "Spawning worker thread.");
 
@@ -331,7 +331,7 @@ void ThreadPool::StatsThreadProc(void)
 		if (m_Stopped)
 			break;
 
-		for (int i = 0; i < sizeof(m_ThreadStats) / sizeof(m_ThreadStats[0]); i++)
+		for (size_t i = 0; i < sizeof(m_ThreadStats) / sizeof(m_ThreadStats[0]); i++)
 			UpdateThreadUtilization(i);
 	}
 }

lib/base/utility.cpp

@@ -454,7 +454,7 @@ String Utility::FormatDateTime(const char *format, double ts)
 String Utility::EscapeShellCmd(const String& s)
 {
 	String result;
-	int prev_quote = String::NPos;
+	size_t prev_quote = String::NPos;
 	int index = -1;
 
 	BOOST_FOREACH(char ch, s) {

lib/config/base-type.conf

@@ -18,9 +18,6 @@
  ******************************************************************************/
 
 type DynamicObject {
-	%require "__local",
-	%attribute number "__local",
-
 	%require "__name",
 	%attribute string "__name",
 

lib/config/config_lexer.cc

@@ -370,8 +370,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 60
-#define YY_END_OF_BUFFER 61
+#define YY_NUM_RULES 59
+#define YY_END_OF_BUFFER 60
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -379,29 +379,29 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[199] =
+static yyconst flex_int16_t yy_accept[195] =
     {   0,
-        0,    0,    0,    0,    0,    0,    0,    0,   61,   59,
-       21,   21,    1,   59,   59,   59,   59,   59,   53,   59,
-       54,   59,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   59,   18,   19,   12,    3,    2,   60,
-       15,   15,    0,    0,    0,   57,   55,   53,   56,   16,
-       20,   58,    0,   50,   51,   52,    0,   45,   48,   46,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,   47,   47,   47,   47,    0,
-       17,   12,   11,    4,    5,    9,   10,    6,    8,    7,
-        0,    0,    0,    0,   20,   53,   49,   47,   28,   47,
+        0,    0,    0,    0,    0,    0,    0,    0,   60,   58,
+       21,   21,    1,   58,   58,   58,   58,   58,   52,   58,
+       53,   58,   46,   46,   46,   46,   46,   46,   46,   46,
+       46,   46,   46,   58,   18,   19,   12,    3,    2,   59,
+       15,   15,    0,    0,    0,   56,   54,   52,   55,   16,
+       20,   57,    0,   49,   50,   51,    0,   44,   47,   45,
+       46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
+       46,   46,   46,   46,   46,   46,   46,   46,    0,   17,
+       12,   11,    4,    5,    9,   10,    6,    8,    7,    0,
+        0,    0,    0,   20,   52,   48,   46,   28,   46,   46,
 
-       47,   47,   47,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   44,   47,   47,   47,   47,   13,    4,    5,
-       14,    0,    0,    0,   47,   47,   47,   47,   47,   47,
-       47,   47,   29,   40,   47,   47,   47,   47,   47,   47,
-       42,   22,    4,    0,    0,    0,   47,   24,   47,   43,
-       47,   47,   47,   34,   47,   47,   47,   47,   47,   47,
-        0,    0,    0,   47,   47,   47,   47,   47,   25,   35,
-       47,   27,   26,   47,    0,    0,    0,   47,   47,   37,
-       47,   38,   41,   47,    0,   31,    0,   33,   47,   39,
-       36,    0,    0,   47,   32,   30,   23,    0
+       46,   46,   46,   46,   46,   46,   46,   46,   46,   46,
+       43,   46,   46,   46,   46,   13,    4,    5,   14,    0,
+        0,    0,   46,   46,   46,   46,   46,   46,   46,   29,
+       39,   46,   46,   46,   46,   46,   46,   41,   22,    4,
+        0,    0,    0,   46,   24,   46,   42,   46,   46,   46,
+       46,   46,   46,   46,   46,   46,    0,    0,    0,   46,
+       46,   46,   46,   46,   25,   34,   46,   27,   26,   46,
+        0,    0,    0,   46,   46,   36,   46,   37,   40,   46,
+        0,   31,    0,   33,   46,   38,   35,    0,    0,   46,
+       32,   30,   23,    0
 
     } ;
 
@@ -446,61 +446,61 @@ static yyconst flex_int32_t yy_meta[43] =
         1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[207] =
+static yyconst flex_int16_t yy_base[203] =
     {   0,
-        0,    0,  247,  246,   40,   42,  209,  208,  249,  254,
-      254,  254,  254,   28,  233,  232,   37,   44,   44,   48,
-      254,  230,    0,   37,  218,  225,  212,   34,   46,  222,
-      222,   48,   52,  199,  254,  229,    0,  254,  254,   82,
-      254,  196,  200,  213,  216,  254,  254,   79,  254,  254,
-        0,  254,   65,  254,  198,  254,  217,  216,  254,  254,
-        0,  195,  190,  194,  207,  198,   52,  206,  204,  194,
-       52,  195,  187,  202,  183,  184,  188,  179,  183,  174,
-      254,    0,  254,   84,   86,  254,  254,  254,  254,  254,
-      172,  176,  178,  182,    0,   88,  254,  173,    0,  190,
+        0,    0,  243,  242,   40,   42,  205,  204,  245,  250,
+      250,  250,  250,   28,  229,  228,   37,   44,   44,   48,
+      250,  226,    0,   37,  214,  221,  208,  211,   46,  217,
+      217,   48,   38,  194,  250,  224,    0,  250,  250,   75,
+      250,  191,  195,  208,  211,  250,  250,   79,  250,  250,
+        0,  250,   64,  250,  193,  250,  212,  211,  250,  250,
+        0,  190,  185,  189,  202,  193,   56,  201,  190,   63,
+      191,  183,  198,  179,  180,  184,  175,  179,  170,  250,
+        0,  250,   85,   89,  250,  250,  250,  250,  250,  168,
+      172,  174,  178,    0,   91,  250,  169,    0,  186,  167,
 
-      171,  171,  177,  182,  169,  184,  179,  172,  180,  176,
-      161,  168,    0,  169,  162,  171,  170,  254,   92,   96,
-      254,  157,  153,  163,  154,  148,  160,  163,  147,  149,
-      164,  153,    0,    0,  158,  159,  152,  159,  146,  147,
-        0,    0,   99,  148,  147,  151,  153,    0,  139,    0,
-      148,  142,  133,    0,  132,  129,  146,  129,  138,  143,
-      141,  125,  140,  137,  126,  133,  118,  114,    0,    0,
-      124,    0,    0,  113,  105,  119,   86,   85,  102,    0,
-       84,    0,    0,   93,   75,  254,   69,    0,   54,    0,
-        0,   63,   48,   39,  254,  254,    0,  254,  124,  128,
+      167,  173,  178,  165,  176,  169,  177,  173,  158,  165,
+        0,  166,  159,  168,  167,  250,   96,  102,  250,  154,
+      150,  160,  151,  145,  157,  160,  144,  146,  161,    0,
+        0,  156,  157,  150,  157,  144,  145,    0,    0,  107,
+      146,  145,  149,  151,    0,  137,    0,  146,  140,  131,
+      130,  127,  144,  127,  136,  141,  139,  123,  138,  135,
+      122,  123,  108,   86,    0,    0,   96,    0,    0,   87,
+       85,   99,   83,   79,   92,    0,   68,    0,    0,   75,
+       57,  250,   57,    0,   48,    0,    0,   58,   44,   26,
+      250,  250,    0,  250,  127,  131,  135,  139,   47,  143,
 
-      132,  136,   47,  140,  144,  148
+      147,  151
     } ;
 
-static yyconst flex_int16_t yy_def[207] =
+static yyconst flex_int16_t yy_def[203] =
     {   0,
-      198,    1,  199,  199,  200,  200,  201,  201,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  202,
-      198,  198,  203,  203,  203,  203,  203,  203,  203,  203,
-      203,  203,  203,  198,  198,  198,  204,  198,  198,  205,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      206,  198,  198,  198,  198,  198,  202,  202,  198,  198,
-      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
-      203,  203,  203,  203,  203,  203,  203,  203,  203,  198,
-      198,  204,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  206,  198,  198,  203,  203,  203,
+      194,    1,  195,  195,  196,  196,  197,  197,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  198,
+      194,  194,  199,  199,  199,  199,  199,  199,  199,  199,
+      199,  199,  199,  194,  194,  194,  200,  194,  194,  201,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      202,  194,  194,  194,  194,  194,  198,  198,  194,  194,
+      199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+      199,  199,  199,  199,  199,  199,  199,  199,  194,  194,
+      200,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  202,  194,  194,  199,  199,  199,  199,
 
-      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
-      203,  203,  203,  203,  203,  203,  203,  198,  198,  198,
-      198,  198,  198,  198,  203,  203,  203,  203,  203,  203,
-      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
-      203,  203,  198,  198,  198,  198,  203,  203,  203,  203,
-      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
-      198,  198,  198,  203,  203,  203,  203,  203,  203,  203,
-      203,  203,  203,  203,  198,  198,  198,  203,  203,  203,
-      203,  203,  203,  203,  198,  198,  198,  203,  203,  203,
-      203,  198,  198,  203,  198,  198,  203,    0,  198,  198,
+      199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+      199,  199,  199,  199,  199,  194,  194,  194,  194,  194,
+      194,  194,  199,  199,  199,  199,  199,  199,  199,  199,
+      199,  199,  199,  199,  199,  199,  199,  199,  199,  194,
+      194,  194,  194,  199,  199,  199,  199,  199,  199,  199,
+      199,  199,  199,  199,  199,  199,  194,  194,  194,  199,
+      199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
+      194,  194,  194,  199,  199,  199,  199,  199,  199,  199,
+      194,  194,  194,  199,  199,  199,  199,  194,  194,  199,
+      194,  194,  199,    0,  194,  194,  194,  194,  194,  194,
 
-      198,  198,  198,  198,  198,  198
+      194,  194
     } ;
 
-static yyconst flex_int16_t yy_nxt[297] =
+static yyconst flex_int16_t yy_nxt[293] =
     {   0,
        10,   11,   12,   13,   14,   15,   16,   17,   10,   18,
        19,   19,   10,   20,   21,   22,   23,   10,   24,   23,
@@ -508,79 +508,79 @@ static yyconst flex_int16_t yy_nxt[297] =
        29,   30,   31,   23,   23,   32,   33,   23,   23,   23,
        34,   10,   38,   39,   38,   39,   43,   48,   48,   50,
        61,   49,   53,   51,   48,   48,   62,   40,   52,   40,
-       68,   58,   44,   59,   70,   69,   45,   63,   74,   54,
-       75,   64,  103,   55,   77,   96,   96,  104,  197,   56,
-      108,  109,  196,   71,   76,  195,   78,   53,  194,   48,
-       48,   79,   84,   85,  119,  120,  120,  120,   96,   96,
+       76,   58,   44,   59,   69,  193,   45,   63,   73,   54,
+       74,   64,   77,   55,   95,   95,  102,   78,  192,   56,
+      191,  103,  190,   70,   75,   83,   84,   53,  189,   48,
+       48,  106,  107,  188,   85,  117,  118,  187,   86,  118,
 
-      193,   86,  143,  120,   54,   87,  120,  120,   55,  120,
-      120,  192,   88,   54,   56,  191,   89,   55,   90,  190,
-      189,  188,  187,   56,   35,   35,   35,   35,   37,   37,
-       37,   37,   41,   41,   41,   41,   57,   57,   57,   57,
-       82,  186,  185,   82,   83,   83,   83,   83,   95,  184,
-       95,   95,  183,  182,  181,  180,  179,  178,  177,  176,
-      175,  174,  173,  172,  171,  170,  169,  168,  167,  166,
-      165,  164,  163,  162,  161,  160,  159,  158,  157,  156,
-      155,  154,  153,  152,  151,  150,  149,  148,  147,  146,
-      145,  144,  142,  141,  140,  139,  138,  137,  136,  135,
+      118,   95,   95,  186,   54,   87,  140,  118,   55,   88,
+      185,   89,  118,  118,   56,  184,   54,  118,  118,  183,
+       55,  182,  181,  180,  179,  178,   56,   35,   35,   35,
+       35,   37,   37,   37,   37,   41,   41,   41,   41,   57,
+       57,   57,   57,   81,  177,  176,   81,   82,   82,   82,
+       82,   94,  175,   94,   94,  174,  173,  172,  171,  170,
+      169,  168,  167,  166,  165,  164,  163,  162,  161,  160,
+      159,  158,  157,  156,  155,  154,  153,  152,  151,  150,
+      149,  148,  147,  146,  145,  144,  143,  142,  141,  139,
+      138,  137,  136,  135,  134,  133,  132,  131,  130,  129,
 
-      134,  133,  132,  131,  130,  129,  128,  127,  126,  125,
-      124,  123,  122,  121,  118,  117,  116,  115,  114,  113,
-      112,  111,  110,  107,  106,  105,  102,  101,  100,   99,
-       98,   59,   59,   97,   94,   93,   92,   91,   81,   80,
-       73,   72,   67,   66,   65,   60,   47,   46,  198,   42,
-       42,   36,   36,    9,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198
+      128,  127,  126,  125,  124,  123,  122,  121,  120,  119,
+      116,  115,  114,  113,  112,  111,  110,  109,  108,  105,
+      104,  101,  100,   99,   98,   97,   59,   59,   96,   93,
+       92,   91,   90,   80,   79,   72,   71,   68,   67,   66,
+       65,   60,   47,   46,  194,   42,   42,   36,   36,    9,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194
 
     } ;
 
-static yyconst flex_int16_t yy_chk[297] =
+static yyconst flex_int16_t yy_chk[293] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    5,    5,    6,    6,   14,   17,   17,   18,
-      203,   17,   19,   18,   19,   19,   24,    5,   18,    6,
-       28,   20,   14,   20,   29,   28,   14,   24,   32,   19,
-       32,   24,   67,   19,   33,   53,   53,   67,  194,   19,
-       71,   71,  193,   29,   32,  192,   33,   48,  189,   48,
-       48,   33,   40,   40,   84,   84,   85,   85,   96,   96,
+      199,   17,   19,   18,   19,   19,   24,    5,   18,    6,
+       33,   20,   14,   20,   29,  190,   14,   24,   32,   19,
+       32,   24,   33,   19,   53,   53,   67,   33,  189,   19,
+      188,   67,  185,   29,   32,   40,   40,   48,  183,   48,
+       48,   70,   70,  181,   40,   83,   83,  180,   40,   84,
 
-      187,   40,  119,  119,   48,   40,  120,  120,   48,  143,
-      143,  185,   40,   96,   48,  184,   40,   96,   40,  181,
-      179,  178,  177,   96,  199,  199,  199,  199,  200,  200,
-      200,  200,  201,  201,  201,  201,  202,  202,  202,  202,
-      204,  176,  175,  204,  205,  205,  205,  205,  206,  174,
-      206,  206,  171,  168,  167,  166,  165,  164,  163,  162,
-      161,  160,  159,  158,  157,  156,  155,  153,  152,  151,
-      149,  147,  146,  145,  144,  140,  139,  138,  137,  136,
-      135,  132,  131,  130,  129,  128,  127,  126,  125,  124,
-      123,  122,  117,  116,  115,  114,  112,  111,  110,  109,
+       84,   95,   95,  177,   48,   40,  117,  117,   48,   40,
+      175,   40,  118,  118,   48,  174,   95,  140,  140,  173,
+       95,  172,  171,  170,  167,  164,   95,  195,  195,  195,
+      195,  196,  196,  196,  196,  197,  197,  197,  197,  198,
+      198,  198,  198,  200,  163,  162,  200,  201,  201,  201,
+      201,  202,  161,  202,  202,  160,  159,  158,  157,  156,
+      155,  154,  153,  152,  151,  150,  149,  148,  146,  144,
+      143,  142,  141,  137,  136,  135,  134,  133,  132,  129,
+      128,  127,  126,  125,  124,  123,  122,  121,  120,  115,
+      114,  113,  112,  110,  109,  108,  107,  106,  105,  104,
 
-      108,  107,  106,  105,  104,  103,  102,  101,  100,   98,
-       94,   93,   92,   91,   80,   79,   78,   77,   76,   75,
-       74,   73,   72,   70,   69,   68,   66,   65,   64,   63,
-       62,   58,   57,   55,   45,   44,   43,   42,   36,   34,
-       31,   30,   27,   26,   25,   22,   16,   15,    9,    8,
-        7,    4,    3,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198,  198,  198,  198,  198,
-      198,  198,  198,  198,  198,  198
+      103,  102,  101,  100,   99,   97,   93,   92,   91,   90,
+       79,   78,   77,   76,   75,   74,   73,   72,   71,   69,
+       68,   66,   65,   64,   63,   62,   58,   57,   55,   45,
+       44,   43,   42,   36,   34,   31,   30,   28,   27,   26,
+       25,   22,   16,   15,    9,    8,    7,    4,    3,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194
 
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[61] =
+static yyconst flex_int32_t yy_rule_can_match_eol[60] =
     {   0,
 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 
     0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0,     };
+    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+        };
 
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
@@ -998,13 +998,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 199 )
+				if ( yy_current_state >= 195 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 198 );
+		while ( yy_current_state != 194 );
 		yy_cp = yyg->yy_last_accepting_cpos;
 		yy_current_state = yyg->yy_last_accepting_state;
 
@@ -1061,7 +1061,7 @@ YY_RULE_SETUP
 {
 	std::ostringstream msgbuf;
 	msgbuf << "Unterminated string found: " << *yylloc;
-	ConfigCompilerContext::GetContext()->AddError(false, msgbuf.str());
+	ConfigCompilerContext::GetInstance()->AddError(false, msgbuf.str());
 	BEGIN(INITIAL);
 				}
 	YY_BREAK
@@ -1078,7 +1078,7 @@ YY_RULE_SETUP
 		/* error, constant is out-of-bounds */
 		std::ostringstream msgbuf;
 		msgbuf << "Constant is out-of-bounds: " << yytext << " " << *yylloc;
-		ConfigCompilerContext::GetContext()->AddError(false, msgbuf.str());
+		ConfigCompilerContext::GetInstance()->AddError(false, msgbuf.str());
 	}
 
 	lb_append_char(&string_buf, result);
@@ -1093,7 +1093,7 @@ YY_RULE_SETUP
 	 */
 	std::ostringstream msgbuf;
 	msgbuf << "Bad escape sequence found: " << yytext << " " << *yylloc;
-	ConfigCompilerContext::GetContext()->AddError(false, msgbuf.str());
+	ConfigCompilerContext::GetInstance()->AddError(false, msgbuf.str());
 				}
 	YY_BREAK
 case 6:
@@ -1261,93 +1261,93 @@ return T_ABSTRACT;
 case 34:
 YY_RULE_SETUP
 #line 202 "config_lexer.ll"
-return T_LOCAL;
+return T_OBJECT;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
 #line 203 "config_lexer.ll"
-return T_OBJECT;
+return T_TEMPLATE;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
 #line 204 "config_lexer.ll"
-return T_TEMPLATE;
+return T_INCLUDE;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
 #line 205 "config_lexer.ll"
-return T_INCLUDE;
+return T_LIBRARY;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
 #line 206 "config_lexer.ll"
-return T_LIBRARY;
+return T_INHERITS;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
 #line 207 "config_lexer.ll"
-return T_INHERITS;
+return T_NULL;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
 #line 208 "config_lexer.ll"
-return T_NULL;
+return T_PARTIAL;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 209 "config_lexer.ll"
-return T_PARTIAL;
+{ yylval->num = 1; return T_NUMBER; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 210 "config_lexer.ll"
-{ yylval->num = 1; return T_NUMBER; }
+{ yylval->num = 0; return T_NUMBER; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 211 "config_lexer.ll"
-{ yylval->num = 0; return T_NUMBER; }
+return T_SET;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 212 "config_lexer.ll"
-return T_SET;
+return T_SHIFT_LEFT;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 213 "config_lexer.ll"
-return T_SHIFT_LEFT;
+return T_SHIFT_RIGHT;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 214 "config_lexer.ll"
-return T_SHIFT_RIGHT;
-	YY_BREAK
-case 47:
-YY_RULE_SETUP
-#line 215 "config_lexer.ll"
 { yylval->text = strdup(yytext); return T_IDENTIFIER; }
 	YY_BREAK
+case 47:
+/* rule 47 can match eol */
+YY_RULE_SETUP
+#line 215 "config_lexer.ll"
+{ yytext[yyleng-1] = '\0'; yylval->text = strdup(yytext + 1); return T_STRING_ANGLE; }
+	YY_BREAK
 case 48:
-/* rule 48 can match eol */
 YY_RULE_SETUP
 #line 216 "config_lexer.ll"
-{ yytext[yyleng-1] = '\0'; yylval->text = strdup(yytext + 1); return T_STRING_ANGLE; }
+{ yylval->num = strtod(yytext, NULL) / 1000; return T_NUMBER; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 217 "config_lexer.ll"
-{ yylval->num = strtod(yytext, NULL) / 1000; return T_NUMBER; }
+{ yylval->num = strtod(yytext, NULL) * 60 * 60; return T_NUMBER; }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 218 "config_lexer.ll"
-{ yylval->num = strtod(yytext, NULL) * 60 * 60; return T_NUMBER; }
+{ yylval->num = strtod(yytext, NULL) * 60; return T_NUMBER; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 219 "config_lexer.ll"
-{ yylval->num = strtod(yytext, NULL) * 60; return T_NUMBER; }
+{ yylval->num = strtod(yytext, NULL); return T_NUMBER; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
@@ -1357,45 +1357,40 @@ YY_RULE_SETUP
 case 53:
 YY_RULE_SETUP
 #line 221 "config_lexer.ll"
-{ yylval->num = strtod(yytext, NULL); return T_NUMBER; }
+{ yylval->op = OperatorSet; return T_EQUAL; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 222 "config_lexer.ll"
-{ yylval->op = OperatorSet; return T_EQUAL; }
+{ yylval->op = OperatorPlus; return T_PLUS_EQUAL; }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 223 "config_lexer.ll"
-{ yylval->op = OperatorPlus; return T_PLUS_EQUAL; }
+{ yylval->op = OperatorMinus; return T_MINUS_EQUAL; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 224 "config_lexer.ll"
-{ yylval->op = OperatorMinus; return T_MINUS_EQUAL; }
+{ yylval->op = OperatorMultiply; return T_MULTIPLY_EQUAL; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 225 "config_lexer.ll"
-{ yylval->op = OperatorMultiply; return T_MULTIPLY_EQUAL; }
-	YY_BREAK
-case 58:
-YY_RULE_SETUP
-#line 226 "config_lexer.ll"
 { yylval->op = OperatorDivide; return T_DIVIDE_EQUAL; }
 	YY_BREAK
 
-case 59:
+case 58:
 YY_RULE_SETUP
-#line 229 "config_lexer.ll"
+#line 228 "config_lexer.ll"
 return yytext[0];
 	YY_BREAK
-case 60:
+case 59:
 YY_RULE_SETUP
-#line 231 "config_lexer.ll"
+#line 230 "config_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 1399 "../../../lib/config/config_lexer.cc"
+#line 1394 "../../../lib/config/config_lexer.cc"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(C_COMMENT):
 case YY_STATE_EOF(STRING):
@@ -1693,7 +1688,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 199 )
+			if ( yy_current_state >= 195 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1722,11 +1717,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 199 )
+		if ( yy_current_state >= 195 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 198);
+	yy_is_jam = (yy_current_state == 194);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2585,7 +2580,7 @@ void yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 231 "config_lexer.ll"
+#line 230 "config_lexer.ll"
 
 
 

lib/config/config_lexer.ll

@@ -116,7 +116,7 @@ static char *lb_steal(lex_buf *lb)
 <STRING>\n			{
 	std::ostringstream msgbuf;
 	msgbuf << "Unterminated string found: " << *yylloc;
-	ConfigCompilerContext::GetContext()->AddError(false, msgbuf.str());
+	ConfigCompilerContext::GetInstance()->AddError(false, msgbuf.str());
 	BEGIN(INITIAL);
 				}
 
@@ -130,7 +130,7 @@ static char *lb_steal(lex_buf *lb)
 		/* error, constant is out-of-bounds */
 		std::ostringstream msgbuf;
 		msgbuf << "Constant is out-of-bounds: " << yytext << " " << *yylloc;
-		ConfigCompilerContext::GetContext()->AddError(false, msgbuf.str());
+		ConfigCompilerContext::GetInstance()->AddError(false, msgbuf.str());
 	}
 
 	lb_append_char(&string_buf, result);
@@ -142,7 +142,7 @@ static char *lb_steal(lex_buf *lb)
 	 */
 	std::ostringstream msgbuf;
 	msgbuf << "Bad escape sequence found: " << yytext << " " << *yylloc;
-	ConfigCompilerContext::GetContext()->AddError(false, msgbuf.str());
+	ConfigCompilerContext::GetInstance()->AddError(false, msgbuf.str());
 				}
 
 <STRING>\\n			{ lb_append_char(&string_buf, '\n'); }
@@ -199,7 +199,6 @@ name				{ yylval->type = TypeName; return T_TYPE_NAME; }
 %require			{ return T_REQUIRE; }
 %attribute			{ return T_ATTRIBUTE; }
 abstract			return T_ABSTRACT;
-local				return T_LOCAL;
 object				return T_OBJECT;
 template			return T_TEMPLATE;
 include				return T_INCLUDE;

lib/config/config_parser.h

@@ -113,13 +113,12 @@ using namespace icinga;
      T_ATTRIBUTE = 280,
      T_TYPE = 281,
      T_ABSTRACT = 282,
-     T_LOCAL = 283,
-     T_OBJECT = 284,
-     T_TEMPLATE = 285,
-     T_INCLUDE = 286,
-     T_LIBRARY = 287,
-     T_INHERITS = 288,
-     T_PARTIAL = 289
+     T_OBJECT = 283,
+     T_TEMPLATE = 284,
+     T_INCLUDE = 285,
+     T_LIBRARY = 286,
+     T_INHERITS = 287,
+     T_PARTIAL = 288
    };
 #endif
 /* Tokens.  */
@@ -148,13 +147,12 @@ using namespace icinga;
 #define T_ATTRIBUTE 280
 #define T_TYPE 281
 #define T_ABSTRACT 282
-#define T_LOCAL 283
-#define T_OBJECT 284
-#define T_TEMPLATE 285
-#define T_INCLUDE 286
-#define T_LIBRARY 287
-#define T_INHERITS 288
-#define T_PARTIAL 289
+#define T_OBJECT 283
+#define T_TEMPLATE 284
+#define T_INCLUDE 285
+#define T_LIBRARY 286
+#define T_INHERITS 287
+#define T_PARTIAL 288
 
 
 
@@ -179,7 +177,7 @@ typedef union YYSTYPE
 
 
 /* Line 2068 of yacc.c  */
-#line 183 "../../../lib/config/config_parser.h"
+#line 181 "../../../lib/config/config_parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

lib/config/config_parser.yy

@@ -88,7 +88,6 @@ using namespace icinga;
 %token T_ATTRIBUTE "%attribute (T_ATTRIBUTE)"
 %token T_TYPE "type (T_TYPE)"
 %token T_ABSTRACT "abstract (T_ABSTRACT)"
-%token T_LOCAL "local (T_LOCAL)"
 %token T_OBJECT "object (T_OBJECT)"
 %token T_TEMPLATE "template (T_TEMPLATE)"
 %token T_INCLUDE "include (T_INCLUDE)"
@@ -125,26 +124,23 @@ void yyerror(YYLTYPE *locp, ConfigCompiler *, const char *err)
 {
 	std::ostringstream message;
 	message << *locp << ": " << err;
-	ConfigCompilerContext::GetContext()->AddError(false, message.str());
+	ConfigCompilerContext::GetInstance()->AddError(false, message.str());
 }
 
 int yyparse(ConfigCompiler *context);
 
 static std::stack<Array::Ptr> m_Arrays;
 static bool m_Abstract;
-static bool m_Local;
 
 static std::stack<TypeRuleList::Ptr> m_RuleLists;
 static ConfigType::Ptr m_Type;
 
 void ConfigCompiler::Compile(void)
 {
-	ASSERT(ConfigCompilerContext::GetContext() != NULL);
-
 	try {
 		yyparse(this);
 	} catch (const std::exception& ex) {
-		ConfigCompilerContext::GetContext()->AddError(false, boost::diagnostic_information(ex));
+		ConfigCompilerContext::GetInstance()->AddError(false, boost::diagnostic_information(ex));
 	}
 }
 
@@ -196,14 +192,14 @@ type: partial_specifier T_TYPE identifier
 		String name = String($3);
 		free($3);
 
-		m_Type = ConfigCompilerContext::GetContext()->GetType(name);
+		m_Type = ConfigType::GetByName(name);
 
 		if (!m_Type) {
 			if ($1)
 				BOOST_THROW_EXCEPTION(std::invalid_argument("Partial type definition for unknown type '" + name + "'"));
 
 			m_Type = boost::make_shared<ConfigType>(name, yylloc);
-			ConfigCompilerContext::GetContext()->AddType(m_Type);
+			m_Type->Register();
 		}
 	}
 	type_inherits_specifier typerulelist
@@ -307,7 +303,6 @@ type: T_TYPE_DICTIONARY
 object:
 	{
 		m_Abstract = false;
-		m_Local = false;
 	}
 object_declaration identifier T_STRING object_inherits_specifier expressionlist
 	{
@@ -327,8 +322,6 @@ object_declaration identifier T_STRING object_inherits_specifier expressionlist
 		item->SetName($4);
 		free($4);
 
-		item->SetUnit(ConfigCompilerContext::GetContext()->GetUnit());
-
 		if ($5) {
 			BOOST_FOREACH(const String& parent, *$5) {
 				item->AddParent(parent);
@@ -342,10 +335,9 @@ object_declaration identifier T_STRING object_inherits_specifier expressionlist
 			item->AddExpressionList(exprl);
 		}
 
-		item->SetLocal(m_Local);
 		item->SetAbstract(m_Abstract);
 
-		ConfigCompilerContext::GetContext()->AddItem(item->Compile());
+		item->Compile()->Register();
 		item.reset();
 	}
 	;
@@ -364,10 +356,6 @@ attribute: T_ABSTRACT
 	{
 		m_Abstract = true;
 	}
-	| T_LOCAL
-	{
-		m_Local = true;
-	}
 	;
 
 object_inherits_list:

lib/config/configcompilercontext.cpp

@@ -20,61 +20,11 @@
 #include "config/configcompilercontext.h"
 #include "base/utility.h"
 #include "base/logger_fwd.h"
+#include "base/singleton.h"
 #include <boost/foreach.hpp>
 
-using std::ifstream;
-
 using namespace icinga;
 
-ConfigCompilerContext *ConfigCompilerContext::m_Context = NULL;
-
-ConfigCompilerContext::ConfigCompilerContext(void)
-	: m_Unit(Utility::NewUniqueID()), m_Flags(0)
-{ }
-
-void ConfigCompilerContext::AddItem(const ConfigItem::Ptr& item)
-{
-	Log(LogDebug, "config", "Adding item to compiler context: type=" +
-	    item->GetType() + "; name=" + item->GetName());
-
-	m_Items.push_back(item);
-	m_ItemsMap[std::make_pair(item->GetType(), item->GetName())] = item;
-}
-
-ConfigItem::Ptr ConfigCompilerContext::GetItem(const String& type, const String& name) const
-{
-	std::map<std::pair<String, String>, ConfigItem::Ptr, pair_string_iless>::const_iterator it;
-
-	it = m_ItemsMap.find(std::make_pair(type, name));
-
-	if (it == m_ItemsMap.end())
-		return ConfigItem::Ptr();
-
-	return it->second;
-}
-
-std::vector<ConfigItem::Ptr> ConfigCompilerContext::GetItems(void) const
-{
-	return m_Items;
-}
-
-void ConfigCompilerContext::AddType(const ConfigType::Ptr& type)
-{
-	m_Types[type->GetName()] = type;
-}
-
-ConfigType::Ptr ConfigCompilerContext::GetType(const String& name) const
-{
-	std::map<String, ConfigType::Ptr, string_iless>::const_iterator it;
-
-	it = m_Types.find(name);
-
-	if (it == m_Types.end())
-		return ConfigType::Ptr();
-
-	return it->second;
-}
-
 void ConfigCompilerContext::AddError(bool warning, const String& message)
 {
 	m_Errors.push_back(ConfigCompilerError(warning, message));
@@ -85,81 +35,12 @@ std::vector<ConfigCompilerError> ConfigCompilerContext::GetErrors(void) const
 	return m_Errors;
 }
 
-void ConfigCompilerContext::SetFlags(int flags)
+void ConfigCompilerContext::Reset(void)
 {
-	m_Flags = flags;
+	m_Errors.clear();
 }
 
-int ConfigCompilerContext::GetFlags(void) const
+ConfigCompilerContext *ConfigCompilerContext::GetInstance(void)
 {
-	return m_Flags;
-}
-
-void ConfigCompilerContext::SetContext(ConfigCompilerContext *context)
-{
-	ASSERT(m_Context == NULL || context == NULL);
-
-	m_Context = context;
-}
-
-ConfigCompilerContext *ConfigCompilerContext::GetContext(void)
-{
-	return m_Context;
-}
-
-String ConfigCompilerContext::GetUnit(void) const
-{
-	return m_Unit;
-}
-
-void ConfigCompilerContext::LinkItems(void)
-{
-	SetContext(this);
-
-	Log(LogInformation, "config", "Linking config items...");
-
-	BOOST_FOREACH(const ConfigItem::Ptr& item, m_Items) {
-		item->Link();
-	}
-
-	SetContext(NULL);
-}
-
-void ConfigCompilerContext::ValidateItems(void)
-{
-	SetContext(this);
-
-	Log(LogInformation, "config", "Validating config items...");
-
-	BOOST_FOREACH(const ConfigItem::Ptr& item, m_Items) {
-		ConfigType::Ptr ctype;
-
-		{
-			ctype = GetType(item->GetType());
-
-			if (!ctype) {
-				AddError(true, "No validation type found for object '" + item->GetName() + "' of type '" + item->GetType() + "'");
-
-				continue;
-			}
-		}
-
-		ctype->ValidateItem(item);
-	}
-
-	SetContext(NULL);
-}
-
-void ConfigCompilerContext::ActivateItems(void)
-{
-	ASSERT(m_Context == NULL);
-
-	Log(LogInformation, "config", "Activating config items in compilation unit '" + m_Unit + "'");
-	BOOST_FOREACH(const ConfigItem::Ptr& item, m_Items) {
-		item->Register();
-	}
-
-	BOOST_FOREACH(const ConfigItem::Ptr& item, m_Items) {
-		item->Commit();
-	}
-}
+	return Singleton<ConfigCompilerContext>::GetInstance();
+}

lib/config/configcompilercontext.h

@@ -27,15 +27,6 @@
 namespace icinga
 {
 
-/**
- * @ingroup config
- */
-enum ConfigCompilerFlag
-{
-        CompilerStrict = 1, /**< Treat warnings as errors. */
-        CompilerLinkExisting = 2 /**< Link objects to existing config items. */
-};
-
 struct I2_CONFIG_API ConfigCompilerError
 {
 	bool Warning;
@@ -52,43 +43,15 @@ struct I2_CONFIG_API ConfigCompilerError
 class I2_CONFIG_API ConfigCompilerContext
 {
 public:
-	ConfigCompilerContext(void);
-
-	void AddItem(const ConfigItem::Ptr& item);
-	ConfigItem::Ptr GetItem(const String& type, const String& name) const;
-	std::vector<ConfigItem::Ptr> GetItems(void) const;
-
-	void AddType(const ConfigType::Ptr& type);
-	ConfigType::Ptr GetType(const String& name) const;
-
 	void AddError(bool warning, const String& message);
 	std::vector<ConfigCompilerError> GetErrors(void) const;
 
-	void SetFlags(int flags);
-	int GetFlags(void) const;
+	void Reset(void);
 
-	String GetUnit(void) const;
-
-	void LinkItems(void);
-	void ValidateItems(void);
-	void ActivateItems(void);
-
-	static void SetContext(ConfigCompilerContext *context);
-	static ConfigCompilerContext *GetContext(void);
+	static ConfigCompilerContext *GetInstance(void);
 
 private:
-	String m_Unit;
-
-        int m_Flags;
-
-	std::vector<ConfigItem::Ptr> m_Items;
-        std::map<std::pair<String, String>, ConfigItem::Ptr, pair_string_iless> m_ItemsMap;
-
-        std::map<String, shared_ptr<ConfigType>, string_iless> m_Types;
-
         std::vector<ConfigCompilerError> m_Errors;
-
-	static ConfigCompilerContext *m_Context;
 };
 
 }

lib/config/configitem.cpp

@@ -32,8 +32,6 @@ using namespace icinga;
 
 boost::mutex ConfigItem::m_Mutex;
 ConfigItem::ItemMap ConfigItem::m_Items;
-boost::signals2::signal<void (const ConfigItem::Ptr&)> ConfigItem::OnCommitted;
-boost::signals2::signal<void (const ConfigItem::Ptr&)> ConfigItem::OnRemoved;
 
 /**
  * Constructor for the ConfigItem class.
@@ -47,9 +45,9 @@ boost::signals2::signal<void (const ConfigItem::Ptr&)> ConfigItem::OnRemoved;
  * @param debuginfo Debug information.
  */
 ConfigItem::ConfigItem(const String& type, const String& name,
-    const String& unit, bool abstract, const ExpressionList::Ptr& exprl,
+    bool abstract, const ExpressionList::Ptr& exprl,
     const std::vector<String>& parents, const DebugInfo& debuginfo)
-	: m_Type(type), m_Name(name), m_Unit(unit), m_Abstract(abstract),
+	: m_Type(type), m_Name(name), m_Abstract(abstract),
 	  m_ExpressionList(exprl), m_ParentNames(parents), m_DebugInfo(debuginfo)
 {
 }
@@ -74,16 +72,6 @@ String ConfigItem::GetName(void) const
 	return m_Name;
 }
 
-/**
- * Retrieves the name of the compilation unit this item belongs to.
- *
- * @returns The unit name.
- */
-String ConfigItem::GetUnit(void) const
-{
-	return m_Unit;
-}
-
 /**
  * Checks whether the item is abstract.
  *
@@ -114,36 +102,14 @@ ExpressionList::Ptr ConfigItem::GetExpressionList(void) const
 	return m_ExpressionList;
 }
 
-/**
- * Retrieves the list of parents for the configuration item.
- *
- * @returns The list of parents.
- */
-std::vector<ConfigItem::Ptr> ConfigItem::GetParents(void) const
-{
-	return m_Parents;
-}
-
 void ConfigItem::Link(void)
 {
 	ObjectLock olock(this);
 
 	m_LinkedExpressionList = boost::make_shared<ExpressionList>();
 
-	m_Parents.clear();
-
 	BOOST_FOREACH(const String& name, m_ParentNames) {
-		ConfigItem::Ptr parent;
-
-		ConfigCompilerContext *context = ConfigCompilerContext::GetContext();
-
-		if (context)
-			parent = context->GetItem(m_Type, name);
-
-		/* ignore already active objects while we're in the compiler
-		 * context and linking to existing items is disabled. */
-		if (!parent && (!context || (context->GetFlags() & CompilerLinkExisting)))
-			parent = ConfigItem::GetObject(m_Type, name);
+		ConfigItem::Ptr parent = ConfigItem::GetObject(m_Type, name);
 
 		if (!parent) {
 			std::ostringstream message;
@@ -156,8 +122,6 @@ void ConfigItem::Link(void)
 
 		ExpressionList::Ptr pexprl = parent->GetLinkedExpressionList();
 		m_LinkedExpressionList->AddExpression(Expression("", OperatorExecute, pexprl, m_DebugInfo));
-
-		m_Parents.push_back(parent);
 	}
 
 	m_LinkedExpressionList->AddExpression(Expression("", OperatorExecute, m_ExpressionList, m_DebugInfo));
@@ -190,61 +154,16 @@ DynamicObject::Ptr ConfigItem::Commit(void)
 	if (!dtype)
 		BOOST_THROW_EXCEPTION(std::runtime_error("Type '" + GetType() + "' does not exist."));
 
-	/* Try to find an existing item with the same type and name. */
-	std::pair<String, String> ikey = std::make_pair(GetType(), GetName());
-	ConfigItem::Ptr oldItem;
+	if (m_DynamicObject.lock() || dtype->GetObject(m_Name))
+	    BOOST_THROW_EXCEPTION(std::runtime_error("An object with type '" + GetType() + "' and name '" + GetName() + "' already exists."));
 
-	{
-		boost::mutex::scoped_lock lock(m_Mutex);
-
-		ItemMap::iterator it = m_Items.find(ikey);
-
-		if (it != m_Items.end())
-			oldItem = it->second;
-	}
-
-	std::set<ConfigItem::WeakPtr> children;
-
-	if (oldItem) {
-		ObjectLock olock(oldItem);
-
-		/* Unregister the old item from its parents. */
-		oldItem->UnregisterFromParents();
-
-		/* Steal the old item's children. */
-		children = oldItem->m_ChildObjects;
-	}
-
-	{
-		ObjectLock olock(this);
-		m_ChildObjects = children;
-	}
-
-	ConfigItem::Ptr self = GetSelf();
-
-	{
-		boost::mutex::scoped_lock lock(m_Mutex);
-
-		/* Register this item. */
-		m_Items[ikey] = self;
-	}
-
-	DynamicObject::Ptr dobj = m_DynamicObject.lock();
-
-	if (!dobj)
-		dobj = dtype->GetObject(m_Name);
-
-	/* Register this item with its parents. */
-	BOOST_FOREACH(const ConfigItem::Ptr& parent, m_Parents) {
-		parent->m_ChildObjects.insert(self);
-	}
+	if (IsAbstract())
+		return DynamicObject::Ptr();
 
 	/* Create a fake update in the format that
-	 * DynamicObject::ApplyUpdate expects. */
+	 * DynamicObject::Deserialize expects. */
 	Dictionary::Ptr attrs = boost::make_shared<Dictionary>();
 
-	double tx = DynamicObject::GetCurrentTx();
-
 	Link();
 
 	Dictionary::Ptr properties = boost::make_shared<Dictionary>();
@@ -256,60 +175,14 @@ DynamicObject::Ptr ConfigItem::Commit(void)
 		String key;
 		Value data;
 		BOOST_FOREACH(boost::tie(key, data), properties) {
-			Dictionary::Ptr attr = boost::make_shared<Dictionary>();
-			attr->Set("data", data);
-			attr->Set("type", Attribute_Config);
-			attr->Set("tx", tx);
-			attr->Seal();
-
-			attrs->Set(key, attr);
+			attrs->Set(key, data);
 		}
 	}
 
 	attrs->Seal();
 
-	Dictionary::Ptr update = boost::make_shared<Dictionary>();
-	update->Set("attrs", attrs);
-	update->Set("configTx", DynamicObject::GetCurrentTx());
-	update->Seal();
-
-	/* Update or create the object and apply the configuration settings. */
-	bool was_null = false;
-
-	if (!dobj) {
-		if (!IsAbstract())
-			dobj = dtype->CreateObject(update);
-
-		was_null = true;
-	}
-
-	if (!was_null)
-		dobj->ApplyUpdate(update, Attribute_Config);
-
-	{
-		ObjectLock olock(this);
-
-		m_DynamicObject = dobj;
-	}
-
-	if (dobj) {
-		if (IsAbstract())
-			dobj->Unregister();
-		else
-			dobj->Register();
-	}
-
-	/* notify our children of the update */
-	BOOST_FOREACH(const ConfigItem::WeakPtr wchild, children) {
-		const ConfigItem::Ptr& child = wchild.lock();
-
-		if (!child)
-			continue;
-
-		child->OnParentCommitted();
-	}
-
-	OnCommitted(self);
+	DynamicObject::Ptr dobj = dtype->CreateObject(attrs);
+	dobj->Register();
 
 	return dobj;
 }
@@ -328,57 +201,6 @@ void ConfigItem::Register(void)
 	}
 }
 
-/**
- * Unregisters the configuration item.
- */
-void ConfigItem::Unregister(void)
-{
-	ASSERT(!OwnsLock());
-
-	DynamicObject::Ptr dobj = m_DynamicObject.lock();
-
-	if (dobj)
-		dobj->Unregister();
-
-	{
-		ObjectLock olock(this);
-
-		ConfigItem::ItemMap::iterator it;
-		it = m_Items.find(std::make_pair(m_Type, m_Name));
-
-		if (it != m_Items.end())
-			m_Items.erase(it);
-
-		UnregisterFromParents();
-	}
-
-	OnRemoved(GetSelf());
-}
-
-void ConfigItem::UnregisterFromParents(void)
-{
-	ASSERT(OwnsLock());
-
-	BOOST_FOREACH(const ConfigItem::Ptr& parent, m_Parents) {
-		parent->m_ChildObjects.erase(GetSelf());
-	}
-}
-
-/*
- * Notifies an item that one of its parents has been committed.
- */
-void ConfigItem::OnParentCommitted(void)
-{
-	ASSERT(!OwnsLock());
-
-	ConfigItem::Ptr self = GetSelf();
-
-	if (GetObject(m_Type, m_Name) != self)
-		return;
-
-	Commit();
-}
-
 /**
  * Retrieves the DynamicObject that belongs to the configuration item.
  *
@@ -412,58 +234,57 @@ ConfigItem::Ptr ConfigItem::GetObject(const String& type, const String& name)
 	return ConfigItem::Ptr();
 }
 
-/**
- * Dumps the config item to the specified stream using Icinga's config item
- * syntax.
- *
- * @param fp The stream.
- */
-void ConfigItem::Dump(std::ostream& fp) const
+void ConfigItem::LinkItems(void)
 {
-	ObjectLock olock(this);
+	Log(LogInformation, "config", "Linking config items...");
 
-	fp << "object \"" << m_Type << "\" \"" << m_Name << "\"";
-
-	if (m_Parents.size() > 0) {
-		fp << " inherits";
-
-		bool first = true;
-		BOOST_FOREACH(const String& name, m_ParentNames) {
-			if (!first)
-				fp << ",";
-			else
-				first = false;
-
-			fp << " \"" << name << "\"";
-		}
+	ConfigItem::Ptr item;
+	BOOST_FOREACH(boost::tie(boost::tuples::ignore, item), m_Items) {
+		item->Link();
 	}
-
-	fp << " {" << "\n";
-	m_ExpressionList->Dump(fp, 1);
-	fp << "}" << "\n";
 }
 
-void ConfigItem::UnloadUnit(const String& unit)
+void ConfigItem::ValidateItems(void)
 {
-	std::vector<ConfigItem::Ptr> obsoleteItems;
+	Log(LogInformation, "config", "Validating config items...");
 
-	{
-		boost::mutex::scoped_lock lock(m_Mutex);
+	ConfigItem::Ptr item;
+	BOOST_FOREACH(boost::tie(boost::tuples::ignore, item), m_Items) {
+		ConfigType::Ptr ctype = ConfigType::GetByName(item->GetType());
 
-		Log(LogInformation, "config", "Unloading config items from compilation unit '" + unit + "'");
+		if (!ctype) {
+			ConfigCompilerContext::GetInstance()->AddError(true, "No validation type found for object '" + item->GetName() + "' of type '" + item->GetType() + "'");
 
-		ConfigItem::Ptr item;
-		BOOST_FOREACH(boost::tie(boost::tuples::ignore, item), m_Items) {
-			ObjectLock olock(item);
-
-			if (item->m_Unit != unit)
-				continue;
-
-			obsoleteItems.push_back(item);
+			continue;
 		}
-	}
 
-	BOOST_FOREACH(const ConfigItem::Ptr& item, obsoleteItems) {
-		item->Unregister();
+		ctype->ValidateItem(item);
 	}
 }
+
+void ConfigItem::ActivateItems(void)
+{
+	Log(LogInformation, "config", "Activating config items");
+
+	std::vector<DynamicObject::Ptr> objects;
+
+	ConfigItem::Ptr item;
+	BOOST_FOREACH(boost::tie(boost::tuples::ignore, item), m_Items) {
+		DynamicObject::Ptr object = item->Commit();
+
+		if (object)
+			objects.push_back(object);
+	}
+
+	BOOST_FOREACH(const DynamicObject::Ptr& object, objects) {
+		Log(LogDebug, "config", "Activating object '" + object->GetName() + "' of type '" + object->GetType()->GetName() + "'");
+		object->Start();
+
+		ASSERT(object->IsActive());
+	}
+}
+
+void ConfigItem::DiscardItems(void)
+{
+	m_Items.clear();
+}

lib/config/configitem.h

@@ -37,13 +37,12 @@ class I2_CONFIG_API ConfigItem : public Object {
 public:
 	DECLARE_PTR_TYPEDEFS(ConfigItem);
 
-	ConfigItem(const String& type, const String& name, const String& unit,
-	    bool abstract, const ExpressionList::Ptr& exprl, const std::vector<String>& parents,
+	ConfigItem(const String& type, const String& name, bool abstract,
+	    const ExpressionList::Ptr& exprl, const std::vector<String>& parents,
 	    const DebugInfo& debuginfo);
 
 	String GetType(void) const;
 	String GetName(void) const;
-	String GetUnit(void) const;
 	bool IsAbstract(void) const;
 
 	std::vector<ConfigItem::Ptr> GetParents(void) const;
@@ -55,9 +54,6 @@ public:
 
 	DynamicObject::Ptr Commit(void);
 	void Register(void);
-	void Unregister(void);
-
-	void Dump(std::ostream& fp) const;
 
 	DynamicObject::Ptr GetDynamicObject(void) const;
 
@@ -66,35 +62,27 @@ public:
 	static ConfigItem::Ptr GetObject(const String& type,
 	    const String& name);
 
-	static void UnloadUnit(const String& unit);
-
-	static boost::signals2::signal<void (const ConfigItem::Ptr&)> OnCommitted;
-	static boost::signals2::signal<void (const ConfigItem::Ptr&)> OnRemoved;
+	static void LinkItems(void);
+	static void ValidateItems(void);
+	static void ActivateItems(void);
+	static void DiscardItems(void);
 
 private:
 	ExpressionList::Ptr GetExpressionList(void) const;
 
-	void UnregisterFromParents(void);
-
-	void OnParentCommitted(void);
-
 	String m_Type; /**< The object type. */
 	String m_Name; /**< The name. */
-	String m_Unit; /**< The compilation unit. */
 	bool m_Abstract; /**< Whether this is a template. */
 
 	ExpressionList::Ptr m_ExpressionList;
 	std::vector<String> m_ParentNames; /**< The names of parent configuration
 				       items. */
-	std::vector<ConfigItem::Ptr> m_Parents;
 	DebugInfo m_DebugInfo; /**< Debug information. */
 
 	ExpressionList::Ptr m_LinkedExpressionList;
 
 	DynamicObject::WeakPtr m_DynamicObject; /**< The instantiated version
                                                  * of this configuration item */
-	std::set<ConfigItem::WeakPtr> m_ChildObjects; /**< Instantiated items
-                                                     * that inherit from this item */
 
 	static boost::mutex m_Mutex;
 

lib/config/configitembuilder.cpp

@@ -27,8 +27,7 @@
 using namespace icinga;
 
 ConfigItemBuilder::ConfigItemBuilder(void)
-	: m_Local(false), m_Abstract(false),
-	  m_ExpressionList(boost::make_shared<ExpressionList>())
+	: m_Abstract(false), m_ExpressionList(boost::make_shared<ExpressionList>())
 {
 	m_DebugInfo.FirstLine = 0;
 	m_DebugInfo.FirstColumn = 0;
@@ -37,8 +36,7 @@ ConfigItemBuilder::ConfigItemBuilder(void)
 }
 
 ConfigItemBuilder::ConfigItemBuilder(const DebugInfo& debugInfo)
-	: m_Local(false), m_Abstract(false),
-	  m_ExpressionList(boost::make_shared<ExpressionList>())
+	: m_Abstract(false), m_ExpressionList(boost::make_shared<ExpressionList>())
 {
 	m_DebugInfo = debugInfo;
 }
@@ -53,16 +51,6 @@ void ConfigItemBuilder::SetName(const String& name)
 	m_Name = name;
 }
 
-void ConfigItemBuilder::SetUnit(const String& unit)
-{
-	m_Unit = unit;
-}
-
-void ConfigItemBuilder::SetLocal(bool local)
-{
-	m_Local = local;
-}
-
 void ConfigItemBuilder::SetAbstract(bool abstract)
 {
 	m_Abstract = abstract;
@@ -126,9 +114,6 @@ ConfigItem::Ptr ConfigItemBuilder::Compile(void)
 	Expression nameExpr("__name", OperatorSet, m_Name, m_DebugInfo);
 	exprl->AddExpression(nameExpr);
 
-	Expression localExpr("__local", OperatorSet, m_Local, m_DebugInfo);
-	exprl->AddExpression(localExpr);
-
-	return boost::make_shared<ConfigItem>(m_Type, m_Name, m_Unit, m_Abstract, exprl, m_Parents,
-	    m_DebugInfo);
+	return boost::make_shared<ConfigItem>(m_Type, m_Name, m_Abstract, exprl,
+	    m_Parents, m_DebugInfo);
 }

lib/config/configitembuilder.h

@@ -45,8 +45,6 @@ public:
 
 	void SetType(const String& type);
 	void SetName(const String& name);
-	void SetUnit(const String& unit);
-	void SetLocal(bool local);
 	void SetAbstract(bool abstract);
 
 	void AddParent(const String& parent);
@@ -61,8 +59,6 @@ public:
 private:
 	String m_Type; /**< The object type. */
 	String m_Name; /**< The name. */
-	String m_Unit; /**< The compilation unit. */
-	bool m_Local; /**< Whether the item is local. */
 	bool m_Abstract; /**< Whether the item is abstract. */
 	std::vector<String> m_Parents; /**< The names of parent configuration
 				       items. */

lib/config/configtype.cpp

@@ -62,9 +62,9 @@ void ConfigType::AddParentRules(std::vector<TypeRuleList::Ptr>& ruleLists, const
 	ConfigType::Ptr parent;
 	if (item->m_Parent.IsEmpty()) {
 		if (item->GetName() != "DynamicObject")
-			parent = ConfigCompilerContext::GetContext()->GetType("DynamicObject");
+			parent = ConfigType::GetByName("DynamicObject");
 	} else {
-		parent = ConfigCompilerContext::GetContext()->GetType(item->m_Parent);
+		parent = ConfigType::GetByName(item->m_Parent);
 	}
 
 	if (parent) {
@@ -121,7 +121,7 @@ void ConfigType::ValidateDictionary(const Dictionary::Ptr& dictionary,
 			Value value = dictionary->Get(require);
 
 			if (value.IsEmpty()) {
-				ConfigCompilerContext::GetContext()->AddError(false,
+				ConfigCompilerContext::GetInstance()->AddError(false,
 				    "Required attribute is missing: " + LocationToString(locations));
 			}
 
@@ -175,14 +175,14 @@ void ConfigType::ValidateDictionary(const Dictionary::Ptr& dictionary,
 		}
 
 		if (overallResult == ValidationUnknownField)
-			ConfigCompilerContext::GetContext()->AddError(true, "Unknown attribute: " + LocationToString(locations));
+			ConfigCompilerContext::GetInstance()->AddError(true, "Unknown attribute: " + LocationToString(locations));
 		else if (overallResult == ValidationInvalidType) {
 			String message = "Invalid value for attribute: " + LocationToString(locations);
 
 			if (!hint.IsEmpty())
 				message += ": " + hint;
 
-			ConfigCompilerContext::GetContext()->AddError(false, message);
+			ConfigCompilerContext::GetInstance()->AddError(false, message);
 		}
 
 		if (!subRuleLists.empty() && value.IsObjectType<Dictionary>())
@@ -204,7 +204,7 @@ void ConfigType::ValidateArray(const Array::Ptr& array,
 			locations.push_back("Attribute '" + require + "'");
 
 			if (array->GetLength() < index) {
-				ConfigCompilerContext::GetContext()->AddError(false,
+				ConfigCompilerContext::GetInstance()->AddError(false,
 				    "Required array index is missing: " + LocationToString(locations));
 			}
 
@@ -261,14 +261,14 @@ void ConfigType::ValidateArray(const Array::Ptr& array,
 		}
 
 		if (overallResult == ValidationUnknownField)
-			ConfigCompilerContext::GetContext()->AddError(true, "Unknown attribute: " + LocationToString(locations));
+			ConfigCompilerContext::GetInstance()->AddError(true, "Unknown attribute: " + LocationToString(locations));
 		else if (overallResult == ValidationInvalidType) {
 			String message = "Invalid value for array index: " + LocationToString(locations);
 
 			if (!hint.IsEmpty())
 				message += ": " + hint;
 
-			ConfigCompilerContext::GetContext()->AddError(false, message);
+			ConfigCompilerContext::GetInstance()->AddError(false, message);
 		}
 
 		if (!subRuleLists.empty() && value.IsObjectType<Dictionary>())
@@ -279,3 +279,23 @@ void ConfigType::ValidateArray(const Array::Ptr& array,
 		locations.pop_back();
 	}
 }
+
+void ConfigType::Register(void)
+{
+	Registry<ConfigType::Ptr>::GetInstance()->Register(GetName(), GetSelf());
+}
+
+ConfigType::Ptr ConfigType::GetByName(const String& name)
+{
+	return Registry<ConfigType::Ptr>::GetInstance()->GetItem(name);
+}
+
+Registry<ConfigType::Ptr>::ItemMap ConfigType::GetTypes(void)
+{
+	return Registry<ConfigType::Ptr>::GetInstance()->GetItems();
+}
+
+void ConfigType::DiscardTypes(void)
+{
+	Registry<ConfigType::Ptr>::GetInstance()->Clear();
+}

lib/config/configtype.h

@@ -25,6 +25,7 @@
 #include "config/typerulelist.h"
 #include "config/configitem.h"
 #include "base/array.h"
+#include "base/registry.h"
 
 namespace icinga
 {
@@ -51,6 +52,11 @@ public:
 
 	void ValidateItem(const ConfigItem::Ptr& object);
 
+	void Register(void);
+	static ConfigType::Ptr GetByName(const String& name);
+	static Registry<ConfigType::Ptr>::ItemMap GetTypes(void);
+	static void DiscardTypes(void);
+
 private:
 	String m_Name; /**< The type name. */
 	String m_Parent; /**< The parent type. */

lib/config/expression.cpp

@@ -132,87 +132,6 @@ void Expression::Execute(const Dictionary::Ptr& dictionary) const
 	dictionary->Set(m_Key, newValue);
 }
 
-void Expression::DumpValue(std::ostream& fp, int indent, const Value& value, bool inlineDict)
-{
-	ExpressionList::Ptr valueExprl;
-	Dictionary::Ptr valueDict;
-	if (value.IsObjectType<ExpressionList>()) {
-		if (!inlineDict)
-			fp << "{ " << "\n";
-
-		static_cast<ExpressionList::Ptr>(value)->Dump(fp, indent);
-
-		if (!inlineDict) {
-			for (int i = 0; i < indent - 1; i++)
-				fp << "\t";
-
-			fp << "}";
-		}
-
-		return;
-	}
-
-	if (value.IsObjectType<Dictionary>()) {
-		if (!inlineDict)
-			fp << "{ " << "\n";
-
-		String k;
-		Value v;
-		BOOST_FOREACH(boost::tie(k, v), static_cast<Dictionary::Ptr>(value)) {
-			for (int i = 0; i < indent; i++)
-				fp << "\t";
-
-			fp << "\"" << k << "\" = ";
-			DumpValue(fp, indent, v);
-			fp << "," << "\n";
-
-			fp << "}";
-		}
-
-		if (!inlineDict)
-			fp << "}";
-
-		return;
-	}
-
-	if (value.IsScalar()) {
-		fp << "\"" << static_cast<String>(value) << "\"";
-		return;
-	}
-
-	BOOST_THROW_EXCEPTION(std::runtime_error("Encountered unknown type while dumping value."));
-}
-
-void Expression::Dump(std::ostream& fp, int indent) const
-{
-	if (m_Operator == OperatorExecute) {
-		DumpValue(fp, indent, m_Value, true);
-		return;
-	}
-
-	for (int i = 0; i < indent; i++)
-		fp << "\t";
-
-	fp << "\"" << m_Key << "\" ";
-
-	switch (m_Operator) {
-		case OperatorSet:
-			fp << "=";
-			break;
-		case OperatorPlus:
-			fp << "+=";
-			break;
-		default:
-			BOOST_THROW_EXCEPTION(std::runtime_error("Not yet implemented."));
-	}
-
-	fp << " ";
-
-	DumpValue(fp, indent + 1, m_Value);
-
-	fp << ", " << "\n";
-}
-
 void Expression::ExtractPath(const std::vector<String>& path, const ExpressionList::Ptr& result) const
 {
 	ASSERT(!path.empty());

lib/config/expression.h

@@ -59,7 +59,6 @@ public:
 	    const DebugInfo& debuginfo);
 
 	void Execute(const Dictionary::Ptr& dictionary) const;
-	void Dump(std::ostream& fp, int indent = 0) const;
 
 	void ExtractPath(const std::vector<String>& path, const shared_ptr<ExpressionList>& result) const;
 	void ExtractFiltered(const std::set<String, string_iless>& keys, const shared_ptr<ExpressionList>& result) const;
@@ -69,8 +68,6 @@ private:
 	ExpressionOperator m_Operator;
 	Value m_Value;
 	DebugInfo m_DebugInfo;
-
-	static void DumpValue(std::ostream& fp, int indent, const Value& value, bool inlineDict = false);
 };
 
 }

lib/config/expressionlist.cpp

@@ -55,19 +55,6 @@ void ExpressionList::Execute(const Dictionary::Ptr& dictionary) const
 	}
 }
 
-/**
- * Dumps the expression list to the specified stream.
- *
- * @param fp The stream.
- * @param indent The indentation level.
- */
-void ExpressionList::Dump(std::ostream& fp, int indent) const
-{
-	BOOST_FOREACH(const Expression& expression, m_Expressions) {
-		expression.Dump(fp, indent);
-	}
-}
-
 void ExpressionList::ExtractPath(const std::vector<String>& path, const ExpressionList::Ptr& result) const
 {
 	BOOST_FOREACH(const Expression& expression, m_Expressions) {

lib/config/expressionlist.h

@@ -41,7 +41,6 @@ public:
 	void AddExpression(const Expression& expression);
 
 	void Execute(const Dictionary::Ptr& dictionary) const;
-	void Dump(std::ostream& fp, int indent) const;
 
 	size_t GetLength(void) const;
 

lib/config/typerule.cpp

@@ -45,7 +45,6 @@ bool TypeRule::MatchName(const String& name) const
 
 bool TypeRule::MatchValue(const Value& value, String *hint) const
 {
-	ConfigCompilerContext *context;
 	ConfigItem::Ptr item;
 
 	if (value.IsEmpty())
@@ -79,13 +78,7 @@ bool TypeRule::MatchValue(const Value& value, String *hint) const
 			if (!value.IsScalar())
 				return false;
 
-			context = ConfigCompilerContext::GetContext();
-
-			if (context)
-				item = context->GetItem(m_NameType, value);
-
-			if (!item && (!context || (context->GetFlags() & CompilerLinkExisting)))
-				item = ConfigItem::GetObject(m_NameType, value);
+			item = ConfigItem::GetObject(m_NameType, value);
 
 			if (!item) {
 				*hint = "Object '" + value + "' of type '" + m_NameType + "' does not exist.";

lib/icinga/Makefile.am

@@ -15,22 +15,16 @@ libicinga_la_SOURCES =  \
 	api.h \
 	checkcommand.cpp \
 	checkcommand.h \
-	checkresultmessage.cpp \
-	checkresultmessage.h \
 	cib.cpp \
 	cib.h \
 	command.cpp \
 	command.h \
 	compatutility.cpp \
 	compatutility.h \
-	downtimemessage.cpp \
-	downtimemessage.h \
 	eventcommand.cpp \
 	eventcommand.h \
 	externalcommandprocessor.cpp \
 	externalcommandprocessor.h \
-	flappingmessage.cpp \
-	flappingmessage.h \
 	host.cpp \
 	hostgroup.cpp \
 	hostgroup.h \
@@ -49,10 +43,6 @@ libicinga_la_SOURCES =  \
 	notification.h \
 	notificationcommand.cpp \
 	notificationcommand.h \
-	notificationmessage.cpp \
-	notificationmessage.h \
-	notificationrequestmessage.cpp \
-	notificationrequestmessage.h \
 	nullchecktask.cpp \
 	nullchecktask.h \
 	nulleventtask.cpp \

lib/icinga/checkcommand.cpp

@@ -24,22 +24,6 @@ using namespace icinga;
 
 REGISTER_TYPE(CheckCommand);
 
-/**
- * Constructor for the CheckCommand class.
- *
- * @param serializedUpdate A serialized dictionary containing attributes.
- */
-CheckCommand::CheckCommand(const Dictionary::Ptr& serializedUpdate)
-	: Command(serializedUpdate)
-{ }
-
-CheckCommand::Ptr CheckCommand::GetByName(const String& name)
-{
-	DynamicObject::Ptr configObject = DynamicObject::GetObject("CheckCommand", name);
-
-	return dynamic_pointer_cast<CheckCommand>(configObject);
-}
-
 Dictionary::Ptr CheckCommand::Execute(const Service::Ptr& service)
 {
 	std::vector<Value> arguments;

lib/icinga/checkcommand.h

@@ -35,10 +35,7 @@ class I2_ICINGA_API CheckCommand : public Command
 {
 public:
 	DECLARE_PTR_TYPEDEFS(CheckCommand);
-
-	explicit CheckCommand(const Dictionary::Ptr& serializedUpdate);
-
-	static CheckCommand::Ptr GetByName(const String& name);
+	DECLARE_TYPENAME(CheckCommand);
 
 	virtual Dictionary::Ptr Execute(const Service::Ptr& service);
 };