[icinga-checkins] icinga.org: icingaweb2/master: Rename Icinga\Module\Setup\Form to Icinga\Module\Setup\Forms

git at icinga.org git at icinga.org
Fri Nov 14 11:38:20 CET 2014


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

Author: Johannes Meyer <johannes.meyer at netways.de>
Date:   Fri Nov 14 11:01:16 2014 +0100

Rename Icinga\Module\Setup\Form to Icinga\Module\Setup\Forms

refs #7553

---

 .../library/Monitoring/MonitoringWizard.php        |    2 +-
 .../setup/application/forms/AdminAccountPage.php   |    2 +-
 .../setup/application/forms/AuthBackendPage.php    |    2 +-
 .../setup/application/forms/AuthenticationPage.php |    2 +-
 .../application/forms/DatabaseCreationPage.php     |    2 +-
 modules/setup/application/forms/DbResourcePage.php |    2 +-
 .../setup/application/forms/GeneralConfigPage.php  |    2 +-
 .../application/forms/LdapDiscoveryConfirmPage.php |    2 +-
 .../setup/application/forms/LdapDiscoveryPage.php  |    2 +-
 .../setup/application/forms/LdapResourcePage.php   |    2 +-
 modules/setup/application/forms/ModulePage.php     |    2 +-
 .../setup/application/forms/PreferencesPage.php    |    2 +-
 .../setup/application/forms/RequirementsPage.php   |    2 +-
 modules/setup/application/forms/SummaryPage.php    |    2 +-
 modules/setup/application/forms/WelcomePage.php    |    2 +-
 modules/setup/library/Setup/WebWizard.php          |   28 ++++++++++----------
 16 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 6ccd4b2..1baac17 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -12,7 +12,7 @@ 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\Setup\Form\SummaryPage;
+use Icinga\Module\Setup\Forms\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/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index dee5011..f338d94 100644
--- 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\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Exception;
 use LogicException;
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 8cfd889..0c58906 100644
--- 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\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Application\Config;
 use Icinga\Web\Form;
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index c1d9fa3..4b0f9be 100644
--- 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\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
 use Icinga\Application\Platform;
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index 4b5bdca..ec4a77e 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use PDOException;
 use Icinga\Web\Form;
diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index ef29ba0..4a65353 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use PDOException;
 use Icinga\Web\Form;
diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php
index 84d4e9c..309c178 100644
--- 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\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
 use Icinga\Forms\Config\General\LoggingConfigForm;
diff --git a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
index f50cf18..a192fac 100644
--- a/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryConfirmPage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Application\Config;
 use Icinga\Web\Form;
diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index 289176c..ec41842 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
 use Icinga\Forms\LdapDiscoveryForm;
diff --git a/modules/setup/application/forms/LdapResourcePage.php b/modules/setup/application/forms/LdapResourcePage.php
index c02846f..49bed69 100644
--- 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\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
 use Icinga\Forms\Config\Resource\LdapResourceForm;
diff --git a/modules/setup/application/forms/ModulePage.php b/modules/setup/application/forms/ModulePage.php
index e1e951b..06d3cf6 100644
--- 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\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use InvalidArgumentException;
 use Icinga\Application\Icinga;
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
index 0916d93..9a6f314 100644
--- 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\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
 use Icinga\Application\Platform;
diff --git a/modules/setup/application/forms/RequirementsPage.php b/modules/setup/application/forms/RequirementsPage.php
index 076c2eb..ec44054 100644
--- a/modules/setup/application/forms/RequirementsPage.php
+++ b/modules/setup/application/forms/RequirementsPage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
 use Icinga\Module\Setup\Requirements;
diff --git a/modules/setup/application/forms/SummaryPage.php b/modules/setup/application/forms/SummaryPage.php
index 103a7aa..14ad93c 100644
--- 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\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Web\Form;
 
diff --git a/modules/setup/application/forms/WelcomePage.php b/modules/setup/application/forms/WelcomePage.php
index 8f32280..5da6076 100644
--- a/modules/setup/application/forms/WelcomePage.php
+++ b/modules/setup/application/forms/WelcomePage.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Setup\Form;
+namespace Icinga\Module\Setup\Forms;
 
 use Icinga\Application\Icinga;
 use Icinga\Web\Form;
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 469f25e..46dd762 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -10,20 +10,20 @@ use Icinga\Web\Wizard;
 use Icinga\Web\Request;
 use Icinga\Application\Config;
 use Icinga\Application\Platform;
-use Icinga\Module\Setup\Form\ModulePage;
-use Icinga\Module\Setup\Form\WelcomePage;
-use Icinga\Module\Setup\Form\SummaryPage;
-use Icinga\Module\Setup\Form\DbResourcePage;
-use Icinga\Module\Setup\Form\PreferencesPage;
-use Icinga\Module\Setup\Form\AuthBackendPage;
-use Icinga\Module\Setup\Form\AdminAccountPage;
-use Icinga\Module\Setup\Form\LdapDiscoveryPage;
-use Icinga\Module\Setup\Form\LdapDiscoveryConfirmPage;
-use Icinga\Module\Setup\Form\LdapResourcePage;
-use Icinga\Module\Setup\Form\RequirementsPage;
-use Icinga\Module\Setup\Form\GeneralConfigPage;
-use Icinga\Module\Setup\Form\AuthenticationPage;
-use Icinga\Module\Setup\Form\DatabaseCreationPage;
+use Icinga\Module\Setup\Forms\ModulePage;
+use Icinga\Module\Setup\Forms\WelcomePage;
+use Icinga\Module\Setup\Forms\SummaryPage;
+use Icinga\Module\Setup\Forms\DbResourcePage;
+use Icinga\Module\Setup\Forms\PreferencesPage;
+use Icinga\Module\Setup\Forms\AuthBackendPage;
+use Icinga\Module\Setup\Forms\AdminAccountPage;
+use Icinga\Module\Setup\Forms\LdapDiscoveryPage;
+use Icinga\Module\Setup\Forms\LdapDiscoveryConfirmPage;
+use Icinga\Module\Setup\Forms\LdapResourcePage;
+use Icinga\Module\Setup\Forms\RequirementsPage;
+use Icinga\Module\Setup\Forms\GeneralConfigPage;
+use Icinga\Module\Setup\Forms\AuthenticationPage;
+use Icinga\Module\Setup\Forms\DatabaseCreationPage;
 use Icinga\Module\Setup\Steps\DatabaseStep;
 use Icinga\Module\Setup\Steps\GeneralConfigStep;
 use Icinga\Module\Setup\Steps\ResourceStep;



More information about the icinga-checkins mailing list