diff --git a/components/Makefile.am b/components/Makefile.am index 4564ae736..9a9308a8c 100644 --- a/components/Makefile.am +++ b/components/Makefile.am @@ -6,6 +6,6 @@ SUBDIRS = \ cluster \ compat \ demo \ - ido_mysql \ + db_ido_mysql \ livestatus \ notification diff --git a/components/ido_mysql/.gitignore b/components/db_ido_mysql/.gitignore similarity index 100% rename from components/ido_mysql/.gitignore rename to components/db_ido_mysql/.gitignore diff --git a/components/ido_mysql/Makefile.am b/components/db_ido_mysql/Makefile.am similarity index 100% rename from components/ido_mysql/Makefile.am rename to components/db_ido_mysql/Makefile.am diff --git a/components/ido_mysql/ido_mysql-type.conf b/components/db_ido_mysql/ido_mysql-type.conf similarity index 100% rename from components/ido_mysql/ido_mysql-type.conf rename to components/db_ido_mysql/ido_mysql-type.conf diff --git a/components/ido_mysql/ido_mysql.vcxproj b/components/db_ido_mysql/ido_mysql.vcxproj similarity index 100% rename from components/ido_mysql/ido_mysql.vcxproj rename to components/db_ido_mysql/ido_mysql.vcxproj diff --git a/components/ido_mysql/ido_mysql.vcxproj.filters b/components/db_ido_mysql/ido_mysql.vcxproj.filters similarity index 100% rename from components/ido_mysql/ido_mysql.vcxproj.filters rename to components/db_ido_mysql/ido_mysql.vcxproj.filters diff --git a/components/ido_mysql/idomysqldbconnection.cpp b/components/db_ido_mysql/idomysqldbconnection.cpp similarity index 100% rename from components/ido_mysql/idomysqldbconnection.cpp rename to components/db_ido_mysql/idomysqldbconnection.cpp diff --git a/components/ido_mysql/idomysqldbconnection.h b/components/db_ido_mysql/idomysqldbconnection.h similarity index 100% rename from components/ido_mysql/idomysqldbconnection.h rename to components/db_ido_mysql/idomysqldbconnection.h diff --git a/configure.ac b/configure.ac index c7d303e24..0db616624 100644 --- a/configure.ac +++ b/configure.ac @@ -133,7 +133,7 @@ components/checker/Makefile components/cluster/Makefile components/compat/Makefile components/demo/Makefile -components/ido_mysql/Makefile +components/db_ido_mysql/Makefile components/livestatus/Makefile components/notification/Makefile docs/Doxyfile @@ -147,7 +147,7 @@ lib/Makefile lib/base/Makefile lib/config/Makefile lib/icinga/Makefile -lib/ido/Makefile +lib/db_ido/Makefile lib/python/Makefile test/Makefile third-party/Makefile diff --git a/lib/Makefile.am b/lib/Makefile.am index d8e8945f6..2cd7496bb 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,5 +5,5 @@ SUBDIRS = \ base \ config \ icinga \ - ido \ + db_ido \ python diff --git a/lib/ido/.gitignore b/lib/db_ido/.gitignore similarity index 100% rename from lib/ido/.gitignore rename to lib/db_ido/.gitignore diff --git a/lib/ido/Makefile.am b/lib/db_ido/Makefile.am similarity index 100% rename from lib/ido/Makefile.am rename to lib/db_ido/Makefile.am diff --git a/lib/ido/commanddbobject.cpp b/lib/db_ido/commanddbobject.cpp similarity index 100% rename from lib/ido/commanddbobject.cpp rename to lib/db_ido/commanddbobject.cpp diff --git a/lib/ido/commanddbobject.h b/lib/db_ido/commanddbobject.h similarity index 100% rename from lib/ido/commanddbobject.h rename to lib/db_ido/commanddbobject.h diff --git a/lib/ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp similarity index 100% rename from lib/ido/dbconnection.cpp rename to lib/db_ido/dbconnection.cpp diff --git a/lib/ido/dbconnection.h b/lib/db_ido/dbconnection.h similarity index 100% rename from lib/ido/dbconnection.h rename to lib/db_ido/dbconnection.h diff --git a/lib/ido/dbobject.cpp b/lib/db_ido/dbobject.cpp similarity index 100% rename from lib/ido/dbobject.cpp rename to lib/db_ido/dbobject.cpp diff --git a/lib/ido/dbobject.h b/lib/db_ido/dbobject.h similarity index 100% rename from lib/ido/dbobject.h rename to lib/db_ido/dbobject.h diff --git a/lib/ido/dbquery.cpp b/lib/db_ido/dbquery.cpp similarity index 100% rename from lib/ido/dbquery.cpp rename to lib/db_ido/dbquery.cpp diff --git a/lib/ido/dbquery.h b/lib/db_ido/dbquery.h similarity index 100% rename from lib/ido/dbquery.h rename to lib/db_ido/dbquery.h diff --git a/lib/ido/dbreference.cpp b/lib/db_ido/dbreference.cpp similarity index 100% rename from lib/ido/dbreference.cpp rename to lib/db_ido/dbreference.cpp diff --git a/lib/ido/dbreference.h b/lib/db_ido/dbreference.h similarity index 100% rename from lib/ido/dbreference.h rename to lib/db_ido/dbreference.h diff --git a/lib/ido/dbtype.cpp b/lib/db_ido/dbtype.cpp similarity index 100% rename from lib/ido/dbtype.cpp rename to lib/db_ido/dbtype.cpp diff --git a/lib/ido/dbtype.h b/lib/db_ido/dbtype.h similarity index 100% rename from lib/ido/dbtype.h rename to lib/db_ido/dbtype.h diff --git a/lib/ido/dbvalue.cpp b/lib/db_ido/dbvalue.cpp similarity index 100% rename from lib/ido/dbvalue.cpp rename to lib/db_ido/dbvalue.cpp diff --git a/lib/ido/dbvalue.h b/lib/db_ido/dbvalue.h similarity index 100% rename from lib/ido/dbvalue.h rename to lib/db_ido/dbvalue.h diff --git a/lib/ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp similarity index 100% rename from lib/ido/hostdbobject.cpp rename to lib/db_ido/hostdbobject.cpp diff --git a/lib/ido/hostdbobject.h b/lib/db_ido/hostdbobject.h similarity index 100% rename from lib/ido/hostdbobject.h rename to lib/db_ido/hostdbobject.h diff --git a/lib/ido/hostgroupdbobject.cpp b/lib/db_ido/hostgroupdbobject.cpp similarity index 100% rename from lib/ido/hostgroupdbobject.cpp rename to lib/db_ido/hostgroupdbobject.cpp diff --git a/lib/ido/hostgroupdbobject.h b/lib/db_ido/hostgroupdbobject.h similarity index 100% rename from lib/ido/hostgroupdbobject.h rename to lib/db_ido/hostgroupdbobject.h diff --git a/lib/ido/ido-type.conf b/lib/db_ido/ido-type.conf similarity index 100% rename from lib/ido/ido-type.conf rename to lib/db_ido/ido-type.conf diff --git a/lib/ido/ido.vcxproj b/lib/db_ido/ido.vcxproj similarity index 100% rename from lib/ido/ido.vcxproj rename to lib/db_ido/ido.vcxproj diff --git a/lib/ido/ido.vcxproj.filters b/lib/db_ido/ido.vcxproj.filters similarity index 100% rename from lib/ido/ido.vcxproj.filters rename to lib/db_ido/ido.vcxproj.filters diff --git a/lib/ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp similarity index 100% rename from lib/ido/servicedbobject.cpp rename to lib/db_ido/servicedbobject.cpp diff --git a/lib/ido/servicedbobject.h b/lib/db_ido/servicedbobject.h similarity index 100% rename from lib/ido/servicedbobject.h rename to lib/db_ido/servicedbobject.h diff --git a/lib/ido/servicegroupdbobject.cpp b/lib/db_ido/servicegroupdbobject.cpp similarity index 100% rename from lib/ido/servicegroupdbobject.cpp rename to lib/db_ido/servicegroupdbobject.cpp diff --git a/lib/ido/servicegroupdbobject.h b/lib/db_ido/servicegroupdbobject.h similarity index 100% rename from lib/ido/servicegroupdbobject.h rename to lib/db_ido/servicegroupdbobject.h diff --git a/lib/ido/timeperioddbobject.cpp b/lib/db_ido/timeperioddbobject.cpp similarity index 100% rename from lib/ido/timeperioddbobject.cpp rename to lib/db_ido/timeperioddbobject.cpp diff --git a/lib/ido/timeperioddbobject.h b/lib/db_ido/timeperioddbobject.h similarity index 100% rename from lib/ido/timeperioddbobject.h rename to lib/db_ido/timeperioddbobject.h diff --git a/lib/ido/userdbobject.cpp b/lib/db_ido/userdbobject.cpp similarity index 100% rename from lib/ido/userdbobject.cpp rename to lib/db_ido/userdbobject.cpp diff --git a/lib/ido/userdbobject.h b/lib/db_ido/userdbobject.h similarity index 100% rename from lib/ido/userdbobject.h rename to lib/db_ido/userdbobject.h diff --git a/lib/ido/usergroupdbobject.cpp b/lib/db_ido/usergroupdbobject.cpp similarity index 100% rename from lib/ido/usergroupdbobject.cpp rename to lib/db_ido/usergroupdbobject.cpp diff --git a/lib/ido/usergroupdbobject.h b/lib/db_ido/usergroupdbobject.h similarity index 100% rename from lib/ido/usergroupdbobject.h rename to lib/db_ido/usergroupdbobject.h