Rename namespace Monitoring to Icingæ\Module\Monitoring

refs #4586

modules/monitoring/application/controllers/CommandController.php

@@ -28,7 +28,6 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 use \Icinga\Application\Icinga;
-use \Monitoring\Backend;
 use \Icinga\Application\Config;
 use \Icinga\Application\Logger;
 use \Icinga\Web\Form;
@@ -36,15 +35,16 @@ use \Icinga\Web\Controller\ActionController;
 use \Icinga\Protocol\Commandpipe\CommandPipe;
 use \Icinga\Exception\ConfigurationError;
 use \Icinga\Exception\MissingParameterException;
-use \Monitoring\Form\Command\AcknowledgeForm;
+use \Icinga\Module\Monitoring\Backend;
-use \Monitoring\Form\Command\CommentForm;
+use \Icinga\Module\Monitoring\Form\Command\AcknowledgeForm;
-use \Monitoring\Form\Command\CommandForm;
+use \Icinga\Module\Monitoring\Form\Command\CommentForm;
-use \Monitoring\Form\Command\CommandWithIdentifierForm;
+use \Icinga\Module\Monitoring\Form\Command\CommandForm;
-use \Monitoring\Form\Command\CustomNotificationForm;
+use \Icinga\Module\Monitoring\Form\Command\CommandWithIdentifierForm;
-use \Monitoring\Form\Command\DelayNotificationForm;
+use \Icinga\Module\Monitoring\Form\Command\CustomNotificationForm;
-use \Monitoring\Form\Command\RescheduleNextCheckForm;
+use \Icinga\Module\Monitoring\Form\Command\DelayNotificationForm;
-use \Monitoring\Form\Command\ScheduleDowntimeForm;
+use \Icinga\Module\Monitoring\Form\Command\RescheduleNextCheckForm;
-use \Monitoring\Form\Command\SubmitPassiveCheckResultForm;
+use \Icinga\Module\Monitoring\Form\Command\ScheduleDowntimeForm;
+use \Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm;
 
 /**
  * Class Monitoring_CommandController

modules/monitoring/application/controllers/ListController.php

@@ -27,7 +27,6 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-
 use \Icinga\Application\Benchmark;
 use \Icinga\Data\Db\Query;
 use \Icinga\File\Csv;
@@ -37,7 +36,7 @@ use \Icinga\Web\Widget\Tabextension\BasketAction;
 use \Icinga\Web\Widget\Tabextension\DashboardAction;
 use \Icinga\Web\Widget\Tabextension\OutputFormat;
 use \Icinga\Web\Widget\Tabs;
-use \Monitoring\Backend;
+use \Icinga\Module\Monitoring\Backend;
 
 class Monitoring_ListController extends ActionController
 {

modules/monitoring/application/controllers/ShowController.php

@@ -27,13 +27,12 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use Monitoring\Backend;
+use \Icinga\Module\Monitoring\Backend;
 use Icinga\Web\Controller\ActionController;
 use Icinga\Web\Hook;
-use Monitoring\Object\Host;
+use \Icinga\Module\Monitoring\Object\Host;
-use Monitoring\Object\Service;
+use \Icinga\Module\Monitoring\Object\Service;
 use Icinga\Application\Benchmark;
-
 use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Widget\Tabextension\BasketAction;

modules/monitoring/application/forms/Command/AcknowledgeForm.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Icinga\Web\Form\Element\DateTimePicker;
 use \Icinga\Protocol\Commandpipe\Acknowledgement;

modules/monitoring/application/forms/Command/CommandForm.php

@@ -26,7 +26,7 @@
 */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Zend_Config;
 use \Icinga\Web\Form;

modules/monitoring/application/forms/Command/CommandWithIdentifierForm.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Zend_Form_Element_Hidden;
 

modules/monitoring/application/forms/Command/CommentForm.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Icinga\Protocol\Commandpipe\Comment;
 

modules/monitoring/application/forms/Command/CustomNotificationForm.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Icinga\Protocol\Commandpipe\CustomNotification;
 

modules/monitoring/application/forms/Command/DelayNotificationForm.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 /**
  * Form for the delay notification command

modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Zend_Form_Element_Checkbox;
 use \Icinga\Web\Form\Element\DateTimePicker;

modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Zend_Form_Element_Text;
 use \Zend_Validate_GreaterThan;

modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use \Icinga\Exception\ProgrammingError;
 

modules/monitoring/application/forms/Command/WithChildrenCommandForm.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Form\Command;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 /**
  * Base class for command forms which allow to propagate the command to child objects too

modules/monitoring/application/views/helpers/MonitoringCommands.php

@@ -23,7 +23,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-use \Monitoring\Command\Meta;
+use \Icinga\Module\Monitoring\Command\Meta;
 
 /**
  * Class MonitoringCommands

modules/monitoring/application/views/helpers/Perfdata.php

@@ -1,6 +1,6 @@
 <?php
 
-use Monitoring\Plugin\PerfdataSet;
+use \Icinga\Module\Monitoring\Plugin\PerfdataSet;
 
 class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
 {

modules/monitoring/bin/action/list.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-use Monitoring\Backend;
+use \Icinga\Module\Monitoring\Backend;
 use Icinga\Util\Format;
 
 $backend = Backend::getInstance($params->shift('backend'));

modules/monitoring/library/Monitoring/Backend.php

@@ -26,12 +26,11 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring;
+namespace Icinga\Module\Monitoring;
 
 use \Exception;
 use \Icinga\Application\Config as IcingaConfig;
 use \Icinga\Authentication\Manager as AuthManager;
-use \Monitoring\Backend\AbstractBackend;
 
 /**
  * Container for monitoring backends
@@ -140,7 +139,7 @@ class Backend
             $config = self::$backendConfigs[$name];
             $type = $config->type;
             $type[0] = strtoupper($type[0]);
-            $class = '\\Monitoring\\Backend\\' . $type;
+            $class = '\\Icinga\\Module\\Monitoring\\Backend\\' . $type;
             self::$instances[$name] = new $class($config);
         }
         return self::$instances[$name];

modules/monitoring/library/Monitoring/Backend/AbstractBackend.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend;
+namespace Icinga\Module\Monitoring\Backend;
 
 use Icinga\Data\DatasourceInterface;
 use Icinga\Exception\ProgrammingError;
@@ -68,7 +68,7 @@ class AbstractBackend implements DatasourceInterface
 
     protected function tableToClassName($virtual_table)
     {
-        return 'Monitoring\\View\\'
+        return '\\Icinga\\Module\\Monitoring\\View\\'
              // . $this->getName()
              // . '\\'
              . ucfirst($virtual_table)

modules/monitoring/library/Monitoring/Backend/Ido.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend;
+namespace Icinga\Module\Monitoring\Backend;
 
 use Icinga\Data\Db\Connection;
 

modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 use Icinga\Data\Db\Query;
 use Icinga\Application\Benchmark;

modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class CommentQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class ContactQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class ContactgroupQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class CustomvarQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php

@@ -23,7 +23,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 
 /**

modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 use Icinga\Exception\ProgrammingError;
 

modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class HostgroupQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class HoststatusQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php

@@ -23,7 +23,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 /**
  * Notification query

modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class ServicegroupQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class ServicestatusQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php

@@ -3,7 +3,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Ido\Query;
+namespace Icinga\Module\Monitoring\Backend\Ido\Query;
 
 class StatusQuery extends AbstractQuery
 {

modules/monitoring/library/Monitoring/Backend/Livestatus.php

@@ -5,7 +5,7 @@
  *
  * @package Monitoring
  */
-namespace Monitoring\Backend;
+namespace Icinga\Module\Monitoring\Backend;
 
 use Icinga\Protocol\Livestatus\Connection;
 

modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Icinga\Monitoring\Backend\Livestatus\Query;
+namespace \Icinga\Module\Monitoring\Backend\Livestatus\Query;
 
 use Icinga\Data\AbstractQuery;
 

modules/monitoring/library/Monitoring/Backend/Statusdat.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend;
+namespace Icinga\Module\Monitoring\Backend;
 
 
 use Icinga\Protocol\Statusdat as StatusdatProtocol;

modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Filter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Backend\Statusdat\Criteria;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Criteria;
 
 /**
  * Constants for filter definitions.

modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Criteria;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Criteria;
 
 /**
  * Class Order

modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\DataView;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\DataView;
 
 use Icinga\Protocol\Statusdat\View\ObjectRemappingView;
 use Icinga\Protocol\Statusdat\IReader;

modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/ServiceStatusView.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\DataView;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\DataView;
 
 use Icinga\Protocol\Statusdat\View\ObjectRemappingView;
 use Icinga\Protocol\Statusdat\IReader;

modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\DataView;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\DataView;
 
 use Icinga\Protocol\Statusdat\View\ObjectRemappingView;
 use \Icinga\Protocol\Statusdat\IReader;

modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 abstract class GroupsummaryQuery extends Query
 {

modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupsummaryQuery.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 /**
  * Class HostgroupsummaryQuery

modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 use Icinga\Protocol\Statusdat;
 use Icinga\Exception;

modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php

@@ -26,9 +26,9 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
-use Monitoring\Backend\Statusdat\Criteria\Order;
+use \Icinga\Module\Monitoring\Backend\Statusdat\Criteria\Order;
 use Icinga\Protocol\Statusdat;
 use Icinga\Exception;
 use Icinga\Data\AbstractQuery;

modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 /**
  * Class ServicegroupsummaryQuery

modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php

@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 use Icinga\Protocol\Statusdat;
 use Icinga\Exception;

modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php

@@ -7,7 +7,7 @@
  * To change this template use File | Settings | File Templates.
  */
 
-namespace Monitoring\Backend\Statusdat\Query;
+namespace Icinga\Module\Monitoring\Backend\Statusdat\Query;
 
 use Icinga\Protocol\Statusdat;
 use Icinga\Exception;

modules/monitoring/library/Monitoring/Command/Meta.php

@@ -23,7 +23,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\Command;
+namespace Icinga\Module\Monitoring\Command;
 
 use Icinga\User;
 use Icinga\Exception\ProgrammingError;

modules/monitoring/library/Monitoring/Environment.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring;
+namespace Icinga\Module\Monitoring;
 
 use \Icinga\Application\Config;
 use Icinga\Web\Session;

modules/monitoring/library/Monitoring/Object/AbstractObject.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Monitoring\Object;
+namespace Icinga\Module\Monitoring\Object;
 
 use Icinga\Data\AbstractQuery as Query;
-use Monitoring\Backend\AbstractBackend;
+use \Icinga\Module\Monitoring\Backend\AbstractBackend;
 
 abstract class AbstractObject
 {

modules/monitoring/library/Monitoring/Object/Host.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Object;
+namespace Icinga\Module\Monitoring\Object;
 
 use Icinga\Data\AbstractQuery as Query;
 

modules/monitoring/library/Monitoring/Object/Service.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Object;
+namespace Icinga\Module\Monitoring\Object;
 
 use Icinga\Data\AbstractQuery as Query;
 

modules/monitoring/library/Monitoring/Plugin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring;
+namespace Icinga\Module\Monitoring;
 
 require_once ICINGA_LIBDIR . '/Icinga/Application/Cli.php';
 

modules/monitoring/library/Monitoring/Plugin/Perfdata.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Plugin;
+namespace Icinga\Module\Monitoring\Plugin;
 
 class Perfdata
 {

modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\Plugin;
+namespace Icinga\Module\Monitoring\Plugin;
 
 class PerfdataSet
 {

modules/monitoring/library/Monitoring/View/CommentView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 class CommentView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/ContactView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 class ContactView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/ContactgroupView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 class ContactgroupView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/CustomvarView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 class CustomvarView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/DowntimeView.php

@@ -22,7 +22,7 @@
  * @author Icinga Development Team <info@icinga.org>
  */
 // {{{ICINGA_LICENSE_HEADER}}}
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 /**
  * Class DowntimeView

modules/monitoring/library/Monitoring/View/EventHistoryView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 class EventHistoryView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/HostgroupView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 class HostgroupView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/HoststatusView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 class HoststatusView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/MonitoringView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 use Icinga\Data\AbstractQuery;
 use Icinga\Data\Filter;
@@ -17,7 +17,7 @@ use Icinga\Data\Filter;
  *
  * Usage example:
  * <code>
- * use Monitoring\Backend;
+ * use \Icinga\Module\Monitoring\Backend;
  * $backend = Backend::getInstance();
  * $query = $backend->select()->from('viewname', array(
  *     'one_column',

modules/monitoring/library/Monitoring/View/NotificationView.php

@@ -23,7 +23,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 /**
  * NotificationView

modules/monitoring/library/Monitoring/View/ServicegroupView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 class ServicegroupView extends MonitoringView
 {

modules/monitoring/library/Monitoring/View/StatusView.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Monitoring\View;
+namespace Icinga\Module\Monitoring\View;
 
 class StatusView extends MonitoringView
 {

modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php

@@ -12,7 +12,7 @@ require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/Confi
 require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/DateTimeFactory.php');
 
 use \DateTimeZone;
-use \Monitoring\Form\Command\AcknowledgeForm; // Used by constant FORMCLASS
+use \Icinga\Module\Monitoring\Form\Command\AcknowledgeForm; // Used by constant FORMCLASS
 use \Icinga\Util\DateTimeFactory;
 use \Test\Icinga\Web\Form\BaseFormTest;
 

modules/monitoring/test/php/application/forms/Command/CommentFormTest.php

@@ -8,7 +8,7 @@ namespace Test\Monitoring\Forms\Command;
 require_once realpath('library/Icinga/Web/Form/BaseFormTest.php');
 require_once realpath(__DIR__ . '/../../../../../../../modules/monitoring/application/forms/Command/CommentForm.php');
 
-use \Monitoring\Form\Command\CommentForm; // Used by constant FORMCLASS
+use \Icinga\Module\Monitoring\Form\Command\CommentForm; // Used by constant FORMCLASS
 use \Test\Icinga\Web\Form\BaseFormTest;
 
 class CommentFormTest extends BaseFormTest

modules/monitoring/test/php/application/forms/Command/ConfirmationFormTest.php

@@ -9,8 +9,7 @@ require_once __DIR__. '/../../../../../application/forms/Command/CommandForm.php
 
 use \Zend_View;
 use \Test\Icinga\Web\Form\BaseFormTest;
-
+use \Icinga\Module\Monitoring\Form\Command\CommandForm;
-use Monitoring\Form\Command\CommandForm;
 
 class CommandFormTest extends BaseFormTest
 {

modules/monitoring/test/php/application/forms/Command/ConfirmationWithIdentifierFormTest.php

@@ -8,7 +8,7 @@ require_once __DIR__. '/../../../../../application/forms/Command/CommandForm.php
 require_once __DIR__. '/../../../../../application/forms/Command/WithChildrenCommandForm.php';
 require_once __DIR__. '/../../../../../application/forms/Command/CommandWithIdentifierForm.php';
 
-use Monitoring\Form\Command\CommandWithIdentifierForm;
+use \Icinga\Module\Monitoring\Form\Command\CommandWithIdentifierForm;
 use \Zend_View;
 use \Zend_Test_PHPUnit_ControllerTestCase;
 use \Test\Icinga\Web\Form\BaseFormTest;

modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php

@@ -8,8 +8,8 @@ namespace Test\Monitoring\Forms\Command;
 require_once realpath('library/Icinga/Web/Form/BaseFormTest.php');
 require_once realpath(__DIR__ . '/../../../../../application/forms/Command/CustomNotificationForm.php');
 
-use \Monitoring\Form\Command\CustomNotificationForm; // Used by constant FORM_CLASS
 use \Test\Icinga\Web\Form\BaseFormTest;
+use \Icinga\Module\Monitoring\Form\Command\CustomNotificationForm; // Used by constant FORM_CLASS
 
 class CustomNotificationFormTest extends BaseFormTest
 {

modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php

@@ -8,8 +8,8 @@ namespace Test\Monitoring\Forms\Command;
 require_once realpath('library/Icinga/Web/Form/BaseFormTest.php');
 require_once realpath(__DIR__ . '/../../../../../application/forms/Command/DelayNotificationForm.php');
 
-use \Monitoring\Form\Command\DelayNotificationForm; // Used by constant FORM_CLASS
 use \Test\Icinga\Web\Form\BaseFormTest;
+use \Icinga\Module\Monitoring\Form\Command\DelayNotificationForm; // Used by constant FORM_CLASS
 
 class DelayNotificationFormTest extends BaseFormTest
 {

modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php

@@ -10,7 +10,7 @@ require_once realpath(__DIR__ . '/../../../../../application/forms/Command/Resch
 require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/ConfigAwareFactory.php');
 require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/DateTimeFactory.php');
 
-use \Monitoring\Form\Command\RescheduleNextCheckForm; // Used by constant FORM_CLASS
+use \Icinga\Module\Monitoring\Form\Command\RescheduleNextCheckForm; // Used by constant FORM_CLASS
 use \DateTimeZone;
 use \Icinga\Util\DateTimeFactory;
 use \Test\Icinga\Web\Form\BaseFormTest;

modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php

@@ -10,7 +10,7 @@ require_once realpath(__DIR__ . '/../../../../../../../modules/monitoring/applic
 require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/ConfigAwareFactory.php');
 require_once realpath(__DIR__ . '/../../../../../../../library/Icinga/Util/DateTimeFactory.php');
 
-use \Monitoring\Form\Command\ScheduleDowntimeForm; // Used by constant FORM_CLASS
+use \Icinga\Module\Monitoring\Form\Command\ScheduleDowntimeForm; // Used by constant FORM_CLASS
 use \DateTimeZone;
 use \Icinga\Util\DateTimeFactory;
 use \Test\Icinga\Web\Form\BaseFormTest;

modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php

@@ -8,8 +8,8 @@ namespace Test\Monitoring\Forms\Command;
 require_once realpath('library/Icinga/Web/Form/BaseFormTest.php');
 require_once realpath(__DIR__ . '/../../../../../application/forms/Command/SubmitPassiveCheckResultForm.php');
 
-use \Monitoring\Form\Command\SubmitPassiveCheckResultForm; // Used by constant FORM_CLASS
 use \Test\Icinga\Web\Form\BaseFormTest;
+use \Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm; // Used by constant FORM_CLASS
 
 class SubmitPassiveCheckResultFormTest extends BaseFormTest
 {

modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php

@@ -2,7 +2,7 @@
 
 namespace Test\Modules\Monitoring\Application\Views\Helpers;
 
-use Monitoring\Command\Meta;
+use \Icinga\Module\Monitoring\Command\Meta;
 
 require_once 'Zend/View/Helper/Abstract.php';
 require_once 'Zend/View.php';

modules/monitoring/test/php/library/Backend/Statusdat/ServicegroupsummaryQueryTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Monitoring\Backend\Statusdat;
 use Tests\Icinga\Protocol\Statusdat\ReaderMock as ReaderMock;
-use Monitoring\Backend\Statusdat\Query\ServicegroupsummaryQuery;
+use \Icinga\Module\Monitoring\Backend\Statusdat\Query\ServicegroupsummaryQuery;
 use Tests\Icinga\Protocol\Statusdat\StatusdatTestLoader;
 
 $base = dirname(__FILE__)."/../../../../..";
@@ -12,7 +12,7 @@ StatusdatTestLoader::requireLibrary();
 require_once(realpath($base."/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php"));
 require_once(realpath($base."/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php"));
 
-class BackendMock  extends \Monitoring\Backend\AbstractBackend
+class BackendMock  extends \Icinga\Module\Monitoring\Backend\AbstractBackend
 {
     public $reader;
 

modules/monitoring/test/php/library/Command/MetaTest.php

@@ -5,7 +5,7 @@ namespace Test\Modules\Monitoring\Library\Command;
 require_once __DIR__. '/../../../../library/Monitoring/Command/Meta.php';
 require_once __DIR__. '/../../../../../../library/Icinga/Exception/ProgrammingError.php';
 
-use Monitoring\Command\Meta;
+use \Icinga\Module\Monitoring\Command\Meta;
 
 class HostStruct extends \stdClass
 {

modules/monitoring/test/php/testlib/MonitoringControllerTest.php

@@ -40,8 +40,8 @@ use \Zend_Test_PHPUnit_ControllerTestCase;
 use \Icinga\Protocol\Statusdat\Reader;
 use \Icinga\Web\Controller\ActionController;
 use \Icinga\Application\DbAdapterFactory;
-use \Monitoring\Backend\Ido;
+use \Icinga\Module\Monitoring\Backend\Ido;
-use \Monitoring\Backend\Statusdat;
+use \Icinga\Moudle\Monitoring\Backend\Statusdat;
 use \Test\Monitoring\Testlib\DataSource\TestFixture;
 use \Test\Monitoring\Testlib\DataSource\DataSourceTestSetup;
 
@@ -262,4 +262,4 @@ abstract class MonitoringControllerTest extends Zend_Test_PHPUnit_ControllerTest
             );
         }
     }
-}
+}

test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Icinga\Web\Paginator\Adapter;
 
-use Monitoring\Backend\Statusdat;
+use \Icinga\Module\Monitoring\Backend\Statusdat;
 use Icinga\Protocol\Statusdat\Reader;
 use Icinga\Web\Paginator\Adapter\QueryAdapter;
 use Tests\Icinga\Protocol\Statusdat\StatusdatTestLoader;

test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Icinga\Web\Paginator\ScrollingStyle;
 
-use Monitoring\Backend\Statusdat;
+use \Icinga\Module\Monitoring\Backend\Statusdat;
 use Icinga\Protocol\Statusdat\Reader;
 use Icinga\Web\Paginator\Adapter\QueryAdapter;
 use Tests\Icinga\Protocol\Statusdat\StatusdatTestLoader;