Adjust namespace declarations

refs #7163
Icinga · Nov 10, 2014 · 21ed823 · 21ed823
1 parent 8f21201
commit 21ed823
Show file tree

Hide file tree

Showing 36 changed files with 77 additions and 82 deletions.
diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
@@ -18,7 +18,7 @@
 use Icinga\Web\Menu;
 use Icinga\Web\Widget;
 use Icinga\Web\Widget\Dashboard\Pane;
-use Icinga\Web\Setup\SetupWizard;
+use Icinga\Module\Setup\SetupWizard;
 use Icinga\Util\File;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Exception\IcingaException;

diff --git a/modules/monitoring/library/Monitoring/Installation/BackendStep.php b/modules/monitoring/library/Monitoring/Installation/BackendStep.php
@@ -6,7 +6,7 @@
 
 use Exception;
 use Zend_Config;
-use Icinga\Web\Setup\Step;
+use Icinga\Module\Setup\Step;
 use Icinga\Application\Config;
 use Icinga\File\Ini\IniWriter;
 

diff --git a/modules/monitoring/library/Monitoring/Installation/InstanceStep.php b/modules/monitoring/library/Monitoring/Installation/InstanceStep.php
@@ -6,7 +6,7 @@
 
 use Exception;
 use Zend_Config;
-use Icinga\Web\Setup\Step;
+use Icinga\Module\Setup\Step;
 use Icinga\Application\Config;
 use Icinga\File\Ini\IniWriter;
 

diff --git a/modules/monitoring/library/Monitoring/Installation/SecurityStep.php b/modules/monitoring/library/Monitoring/Installation/SecurityStep.php
@@ -6,7 +6,7 @@
 
 use Exception;
 use Zend_Config;
-use Icinga\Web\Setup\Step;
+use Icinga\Module\Setup\Step;
 use Icinga\Application\Config;
 use Icinga\File\Ini\IniWriter;
 

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -7,15 +7,15 @@
 use Icinga\Web\Form;
 use Icinga\Web\Wizard;
 use Icinga\Web\Request;
-use Icinga\Web\Setup\Setup;
-use Icinga\Web\Setup\MakeDirStep;
-use Icinga\Web\Setup\EnableModuleStep;
-use Icinga\Web\Setup\SetupWizard;
-use Icinga\Web\Setup\Requirements;
+use Icinga\Module\Setup\Setup;
+use Icinga\Module\Setup\SetupWizard;
+use Icinga\Module\Setup\Requirements;
+use Icinga\Module\Setup\Utils\MakeDirStep;
+use Icinga\Module\Setup\Utils\EnableModuleStep;
 use Icinga\Module\Monitoring\Installation\BackendStep;
 use Icinga\Module\Monitoring\Installation\InstanceStep;
 use Icinga\Module\Monitoring\Installation\SecurityStep;
-use Icinga\Form\Setup\SummaryPage;
+use Icinga\Module\Setup\Form\SummaryPage;
 use Icinga\Module\Monitoring\Form\Setup\WelcomePage;
 use Icinga\Module\Monitoring\Form\Setup\BackendPage;
 use Icinga\Module\Monitoring\Form\Setup\InstancePage;

diff --git a/modules/setup/application/clicommands/SetupCommand.php b/modules/setup/application/clicommands/SetupCommand.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Clicommands;
+namespace Icinga\Module\Setup\Clicommands;
 
 use Icinga\Cli\Command;
 

diff --git a/modules/setup/application/controllers/SetupController.php b/modules/setup/application/controllers/SetupController.php
@@ -2,8 +2,8 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Icinga\Application\WebWizard;
 use Icinga\Web\Controller\ActionController;
+use Icinga\Module\Setup\WebWizard;
 
 class SetupController extends ActionController
 {

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use Exception;
 use Zend_Config;

diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use Zend_Config;
 use Icinga\Web\Form;

diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use Icinga\Web\Form;
 use Icinga\Application\Platform;

diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -2,12 +2,12 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use PDOException;
 use Icinga\Web\Form;
 use Icinga\Web\Form\Element\Note;
-use Icinga\Web\Setup\DbTool;
+use Icinga\Module\Setup\Utils\DbTool;
 
 /**
  * Wizard page to define a database user that is able to create databases and tables

diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
@@ -2,13 +2,13 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use PDOException;
 use Icinga\Web\Form;
-use Icinga\Web\Setup\DbTool;
 use Icinga\Web\Form\Element\Note;
 use Icinga\Form\Config\Resource\DbResourceForm;
+use Icinga\Module\Setup\Utils\DbTool;
 
 /**
  * Wizard page to define connection details for a database resource

diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use Icinga\Web\Form;
 use Icinga\Web\Form\Element\Note;

diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
@@ -2,14 +2,10 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
-use Icinga\Protocol\Dns;
 use Icinga\Web\Form;
 use Icinga\Web\Form\Element\Note;
-use Icinga\Form\LdapDiscoveryForm;
-use Icinga\Form\Config\Resource\LdapResourceForm;
-use Icinga\Web\Request;
 
 /**
  * Wizard page to define the connection details for a LDAP resource

diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -2,14 +2,11 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
-use Icinga\Protocol\Dns;
 use Icinga\Web\Form;
 use Icinga\Web\Form\Element\Note;
 use Icinga\Form\LdapDiscoveryForm;
-use Icinga\Form\Config\Resource\LdapResourceForm;
-use Icinga\Web\Request;
 
 /**
  * Wizard page to define the connection details for a LDAP resource

diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use Icinga\Web\Form;
 use Icinga\Web\Form\Element\Note;

diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use InvalidArgumentException;
 use Icinga\Application\Icinga;

diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use Icinga\Web\Form;
 use Icinga\Application\Platform;

diff --git a/modules/setup/application/forms/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php
@@ -2,10 +2,10 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use Icinga\Web\Form;
-use Icinga\Web\Setup\Requirements;
+use Icinga\Module\Setup\Requirements;
 
 /**
  * Wizard page to list setup requirements

diff --git a/modules/setup/application/forms/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use Icinga\Web\Form;
 

diff --git a/modules/setup/application/forms/WelcomePage.php b/modules/setup/application/forms/WelcomePage.php
@@ -2,11 +2,11 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Form\Setup;
+namespace Icinga\Module\Setup\Form;
 
 use Icinga\Application\Icinga;
 use Icinga\Web\Form;
-use Icinga\Web\Form\Validator\TokenValidator;
+use Icinga\Module\Setup\Web\Form\Validator\TokenValidator;
 
 /**
  * Wizard page to authenticate and welcome the user

diff --git a/modules/setup/application/views/scripts/form/setup-requirements.phtml b/modules/setup/application/views/scripts/form/setup-requirements.phtml
@@ -1,7 +1,7 @@
 <?php
 
 use Icinga\Web\Wizard;
-use Icinga\Web\Setup\Requirements;
+use Icinga\Module\Setup\Requirements;
 
 $requirements = $form->getRequirements();
 

diff --git a/modules/setup/library/Setup/Exception/SetupException.php b/modules/setup/library/Setup/Exception/SetupException.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Exception;
+namespace Icinga\Module\Setup\Exception;
 
 /**
  * Class SetupException

diff --git a/modules/setup/library/Setup/Requirements.php b/modules/setup/library/Setup/Requirements.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Web\Setup;
+namespace Icinga\Module\Setup;
 
 use ArrayIterator;
 use IteratorAggregate;

diff --git a/modules/setup/library/Setup/Setup.php b/modules/setup/library/Setup/Setup.php
@@ -2,11 +2,11 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Web\Setup;
+namespace Icinga\Module\Setup;
 
 use ArrayIterator;
 use IteratorAggregate;
-use Icinga\Exception\SetupException;
+use Icinga\Module\Setup\Exception\SetupException;
 
 /**
  * Container for multiple configuration steps

diff --git a/modules/setup/library/Setup/SetupWizard.php b/modules/setup/library/Setup/SetupWizard.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Web\Setup;
+namespace Icinga\Module\Setup;
 
 /**
  * Interface for wizards providing a setup and requirements

diff --git a/modules/setup/library/Setup/Step.php b/modules/setup/library/Setup/Step.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Web\Setup;
+namespace Icinga\Module\Setup;
 
 /**
  * Class to implement functionality for a single setup step

diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -2,15 +2,15 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Installation;
+namespace Icinga\Module\Setup\Steps;
 
 use Exception;
 use Zend_Config;
-use Icinga\Web\Setup\Step;
 use Icinga\Application\Config;
 use Icinga\File\Ini\IniWriter;
 use Icinga\Data\ResourceFactory;
 use Icinga\Authentication\Backend\DbUserBackend;
+use Icinga\Module\Setup\Step;
 
 class AuthenticationStep extends Step
 {

diff --git a/modules/setup/library/Setup/Steps/DatabaseStep.php b/modules/setup/library/Setup/Steps/DatabaseStep.php
@@ -2,14 +2,14 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Installation;
+namespace Icinga\Module\Setup\Steps;
 
 use Exception;
 use PDOException;
-use Icinga\Web\Setup\Step;
-use Icinga\Web\Setup\DbTool;
 use Icinga\Application\Icinga;
-use Icinga\Exception\SetupException;
+use Icinga\Module\Setup\Step;
+use Icinga\Module\Setup\Utils\DbTool;
+use Icinga\Module\Setup\Exception\SetupException;
 
 class DatabaseStep extends Step
 {

diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -2,14 +2,14 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Installation;
+namespace Icinga\Module\Setup\Steps;
 
 use Exception;
 use Zend_Config;
 use Icinga\Application\Logger;
-use Icinga\Web\Setup\Step;
 use Icinga\Application\Config;
 use Icinga\File\Ini\IniWriter;
+use Icinga\Module\Setup\Step;
 
 class GeneralConfigStep extends Step
 {

diff --git a/modules/setup/library/Setup/Steps/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php
@@ -2,13 +2,13 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Installation;
+namespace Icinga\Module\Setup\Steps;
 
 use Exception;
 use Zend_Config;
-use Icinga\Web\Setup\Step;
 use Icinga\Application\Config;
 use Icinga\File\Ini\IniWriter;
+use Icinga\Module\Setup\Step;
 
 class ResourceStep extends Step
 {

diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Web\Setup;
+namespace Icinga\Module\Setup\Utils;
 
 use PDO;
 use PDOException;

diff --git a/modules/setup/library/Setup/Utils/EnableModuleStep.php b/modules/setup/library/Setup/Utils/EnableModuleStep.php
@@ -2,10 +2,11 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Web\Setup;
+namespace Icinga\Module\Setup\Utils;
 
 use Exception;
 use Icinga\Application\Icinga;
+use Icinga\Module\Setup\Step;
 
 class EnableModuleStep extends Step
 {