[icinga-checkins] icinga.org: icingaweb2-module-director/master: Hooks: remove last traces of Web\Hook

git at icinga.org git at icinga.org
Wed Feb 17 11:50:09 CET 2016


Module: icingaweb2-module-director
Branch: master
Commit: c6cd99f9db96457186482f9359dbf1f935ee83d1
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=c6cd99f9db96457186482f9359dbf1f935ee83d1

Author: Thomas Gelf <thomas at gelf.net>
Date:   Wed Feb 17 11:49:56 2016 +0100

Hooks: remove last traces of Web\Hook

---

 application/forms/DirectorDatafieldForm.php    |    2 +-
 application/forms/ImportRowModifierForm.php    |    1 -
 application/forms/SyncPropertyForm.php         |    6 +++---
 application/forms/SyncRuleForm.php             |    1 -
 application/tables/ImportsourceHookTable.php   |    2 +-
 library/Director/IcingaConfig/IcingaConfig.php |    4 ++--
 library/Director/Import/Import.php             |    4 ++--
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/application/forms/DirectorDatafieldForm.php b/application/forms/DirectorDatafieldForm.php
index f420a5a..dc8f002 100644
--- a/application/forms/DirectorDatafieldForm.php
+++ b/application/forms/DirectorDatafieldForm.php
@@ -4,7 +4,7 @@ namespace Icinga\Module\Director\Forms;
 
 use Icinga\Exception\ConfigurationError;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
-use Icinga\Web\Hook;
+use Icinga\Application\Hook;
 use Exception;
 
 class DirectorDatafieldForm extends DirectorObjectForm
diff --git a/application/forms/ImportRowModifierForm.php b/application/forms/ImportRowModifierForm.php
index e69a1b2..a078611 100644
--- a/application/forms/ImportRowModifierForm.php
+++ b/application/forms/ImportRowModifierForm.php
@@ -3,7 +3,6 @@
 namespace Icinga\Module\Director\Forms;
 
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
-use Icinga\Web\Hook;
 
 class ImportRowModifierForm extends DirectorObjectForm
 {
diff --git a/application/forms/SyncPropertyForm.php b/application/forms/SyncPropertyForm.php
index df0ddbd..473b620 100644
--- a/application/forms/SyncPropertyForm.php
+++ b/application/forms/SyncPropertyForm.php
@@ -2,13 +2,13 @@
 
 namespace Icinga\Module\Director\Forms;
 
-use Icinga\Module\Director\Web\Form\DirectorObjectForm;
+use Exception;
 use Icinga\Exception\InvalidPropertyException;
+use Icinga\Module\Director\Hook\ImportSourceHook;
 use Icinga\Module\Director\Objects\SyncRule;
 use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\Objects\ImportSource;
-use Icinga\Module\Director\Web\Hook\ImportSourceHook;
-use Exception;
+use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 
 class SyncPropertyForm extends DirectorObjectForm
 {
diff --git a/application/forms/SyncRuleForm.php b/application/forms/SyncRuleForm.php
index 10e1549..a036f54 100644
--- a/application/forms/SyncRuleForm.php
+++ b/application/forms/SyncRuleForm.php
@@ -3,7 +3,6 @@
 namespace Icinga\Module\Director\Forms;
 
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
-use Icinga\Web\Hook;
 
 class SyncRuleForm extends DirectorObjectForm
 {
diff --git a/application/tables/ImportsourceHookTable.php b/application/tables/ImportsourceHookTable.php
index f03f7b6..d8f3d2d 100644
--- a/application/tables/ImportsourceHookTable.php
+++ b/application/tables/ImportsourceHookTable.php
@@ -4,8 +4,8 @@ namespace Icinga\Module\Director\Tables;
 
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Data\Paginatable;
+use Icinga\Module\Director\Hook\ImportSourceHook;
 use Icinga\Module\Director\Objects\ImportSource;
-use Icinga\Module\Director\Web\Hook\ImportSourceHook;
 use Icinga\Module\Director\Web\Table\QuickTable;
 
 class ImportsourceHookTable extends QuickTable
diff --git a/library/Director/IcingaConfig/IcingaConfig.php b/library/Director/IcingaConfig/IcingaConfig.php
index 131724b..aca1b9c 100644
--- a/library/Director/IcingaConfig/IcingaConfig.php
+++ b/library/Director/IcingaConfig/IcingaConfig.php
@@ -2,14 +2,14 @@
 
 namespace Icinga\Module\Director\IcingaConfig;
 
+use Icinga\Application\Benchmark;
+use Icinga\Application\Hook;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Module\Director\Db;
 use Icinga\Module\Director\Util;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Objects\IcingaZone;
 use Icinga\Module\Director\Objects\IcingaEndpoint;
-use Icinga\Application\Benchmark;
-use Icinga\Web\Hook;
 use Exception;
 
 class IcingaConfig
diff --git a/library/Director/Import/Import.php b/library/Director/Import/Import.php
index a728beb..471f323 100644
--- a/library/Director/Import/Import.php
+++ b/library/Director/Import/Import.php
@@ -2,10 +2,10 @@
 
 namespace Icinga\Module\Director\Import;
 
+use Icinga\Exception\IcingaException;
+use Icinga\Module\Director\Hook\ImportSourceHook;
 use Icinga\Module\Director\Objects\ImportSource;
 use Icinga\Module\Director\Util;
-use Icinga\Module\Director\Web\Hook\ImportSourceHook;
-use Icinga\Exception\IcingaException;
 use stdClass;
 
 class Import



More information about the icinga-checkins mailing list