[icinga-checkins] icinga.org: icingaweb2/feature/setup-wizard-7163: Do not use Installer anywhere. ²

git at icinga.org git at icinga.org
Mon Nov 10 17:49:49 CET 2014


Module: icingaweb2
Branch: feature/setup-wizard-7163
Commit: 6b2f434f320ba8b18d3b5e0a1552e6e8eaf050ed
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=6b2f434f320ba8b18d3b5e0a1552e6e8eaf050ed

Author: Johannes Meyer <johannes.meyer at netways.de>
Date:   Mon Nov 10 16:53:28 2014 +0100

Do not use Installer anywhere. ²

"It's setup."

refs #7163

---

 .../library/Monitoring/{Installation => }/BackendStep.php           |    2 +-
 .../library/Monitoring/{Installation => }/InstanceStep.php          |    2 +-
 modules/monitoring/library/Monitoring/MonitoringWizard.php          |    3 ---
 .../library/Monitoring/{Installation => }/SecurityStep.php          |    2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Installation/BackendStep.php b/modules/monitoring/library/Monitoring/BackendStep.php
similarity index 99%
rename from modules/monitoring/library/Monitoring/Installation/BackendStep.php
rename to modules/monitoring/library/Monitoring/BackendStep.php
index 3dd373a..6bebc22 100644
--- a/modules/monitoring/library/Monitoring/Installation/BackendStep.php
+++ b/modules/monitoring/library/Monitoring/BackendStep.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Monitoring\Installation;
+namespace Icinga\Module\Monitoring;
 
 use Exception;
 use Zend_Config;
diff --git a/modules/monitoring/library/Monitoring/Installation/InstanceStep.php b/modules/monitoring/library/Monitoring/InstanceStep.php
similarity index 98%
rename from modules/monitoring/library/Monitoring/Installation/InstanceStep.php
rename to modules/monitoring/library/Monitoring/InstanceStep.php
index e96b8ad..03f0d67 100644
--- a/modules/monitoring/library/Monitoring/Installation/InstanceStep.php
+++ b/modules/monitoring/library/Monitoring/InstanceStep.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Monitoring\Installation;
+namespace Icinga\Module\Monitoring;
 
 use Exception;
 use Zend_Config;
diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 9c6e708..5201b37 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -12,9 +12,6 @@ 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\Module\Setup\Form\SummaryPage;
 use Icinga\Module\Monitoring\Form\Setup\WelcomePage;
 use Icinga\Module\Monitoring\Form\Setup\BackendPage;
diff --git a/modules/monitoring/library/Monitoring/Installation/SecurityStep.php b/modules/monitoring/library/Monitoring/SecurityStep.php
similarity index 98%
rename from modules/monitoring/library/Monitoring/Installation/SecurityStep.php
rename to modules/monitoring/library/Monitoring/SecurityStep.php
index f584c3e..98c398a 100644
--- a/modules/monitoring/library/Monitoring/Installation/SecurityStep.php
+++ b/modules/monitoring/library/Monitoring/SecurityStep.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Monitoring\Installation;
+namespace Icinga\Module\Monitoring;
 
 use Exception;
 use Zend_Config;



More information about the icinga-checkins mailing list