tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename namespace Monitoring to Icingæ\Module\Monitoring 

refs #4586
This commit is contained in:
Eric Lippmann 2013-08-20 15:32:25 +02:00 committed by Jannis Moßhammer
parent 03f081ce33
commit c86874d4ba
82 changed files with 101 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/monitoring/application/controllers/CommandController.php
View File

@ -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 \Monitoring\Form\Command\CommentForm;
use \Monitoring\Form\Command\CommandForm;
use \Monitoring\Form\Command\CommandWithIdentifierForm;
use \Monitoring\Form\Command\CustomNotificationForm;
use \Monitoring\Form\Command\DelayNotificationForm;
use \Monitoring\Form\Command\RescheduleNextCheckForm;
use \Monitoring\Form\Command\ScheduleDowntimeForm;
use \Monitoring\Form\Command\SubmitPassiveCheckResultForm;
use \Icinga\Module\Monitoring\Backend;
use \Icinga\Module\Monitoring\Form\Command\AcknowledgeForm;
use \Icinga\Module\Monitoring\Form\Command\CommentForm;
use \Icinga\Module\Monitoring\Form\Command\CommandForm;
use \Icinga\Module\Monitoring\Form\Command\CommandWithIdentifierForm;
use \Icinga\Module\Monitoring\Form\Command\CustomNotificationForm;
use \Icinga\Module\Monitoring\Form\Command\DelayNotificationForm;
use \Icinga\Module\Monitoring\Form\Command\RescheduleNextCheckForm;
use \Icinga\Module\Monitoring\Form\Command\ScheduleDowntimeForm;
use \Icinga\Module\Monitoring\Form\Command\SubmitPassiveCheckResultForm;
/**
* Class Monitoring_CommandController

3
modules/monitoring/application/controllers/ListController.php
View File

@ -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
{

7
modules/monitoring/application/controllers/ShowController.php
View File

@ -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 Monitoring\Object\Service;
use \Icinga\Module\Monitoring\Object\Host;
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;

2
modules/monitoring/application/forms/Command/AcknowledgeForm.php
View File

@ -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;

2
modules/monitoring/application/forms/Command/CommandForm.php
View File

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

2
modules/monitoring/application/forms/Command/CommandWithIdentifierForm.php
View File

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

2
modules/monitoring/application/forms/Command/CommentForm.php
View File

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

2
modules/monitoring/application/forms/Command/CustomNotificationForm.php
View File

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

2
modules/monitoring/application/forms/Command/DelayNotificationForm.php
View File

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

2
modules/monitoring/application/forms/Command/RescheduleNextCheckForm.php
View File

@ -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;

2
modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
View File

@ -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;

2
modules/monitoring/application/forms/Command/SubmitPassiveCheckResultForm.php
View File

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

2
modules/monitoring/application/forms/Command/WithChildrenCommandForm.php
View File

@ -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

2
modules/monitoring/application/views/helpers/MonitoringCommands.php
View File

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

2
modules/monitoring/application/views/helpers/Perfdata.php
View File

@ -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
{

2
modules/monitoring/bin/action/list.inc.php
View File

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

5
modules/monitoring/library/Monitoring/Backend.php
View File

@ -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];

4
modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
View File

@ -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)

2
modules/monitoring/library/Monitoring/Backend/Ido.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/AbstractQuery.php
View File

@ -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;

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/CustomvarQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/EventHistoryQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostgroupQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/HoststatusQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicegroupQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicestatusQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
View File

@ -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
{

2
modules/monitoring/library/Monitoring/Backend/Livestatus.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Livestatus/Query/StatusQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Statusdat.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Filter.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/HostStatusView.php
View File

@ -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;

2
modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/ServiceStatusView.php
View File

@ -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;

2
modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php
View File

@ -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;

2
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupsummaryQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php
View File

@ -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;

4
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php
View File

@ -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;

2
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php
View File

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

2
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicelistQuery.php
View File

@ -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;

2
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php
View File

@ -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;

2
modules/monitoring/library/Monitoring/Command/Meta.php
View File

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

2
modules/monitoring/library/Monitoring/Environment.php
View File

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

4
modules/monitoring/library/Monitoring/Object/AbstractObject.php
View File

@ -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
{

2
modules/monitoring/library/Monitoring/Object/Host.php
View File

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

2
modules/monitoring/library/Monitoring/Object/Service.php
View File

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

2
modules/monitoring/library/Monitoring/Plugin.php
View File

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

2
modules/monitoring/library/Monitoring/Plugin/Perfdata.php
View File

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

2
modules/monitoring/library/Monitoring/Plugin/PerfdataSet.php
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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',

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

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

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

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

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

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

2
modules/monitoring/test/php/application/forms/Command/AcknowledgeFormTest.php
View File

@ -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;

2
modules/monitoring/test/php/application/forms/Command/CommentFormTest.php
View File

@ -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

3
modules/monitoring/test/php/application/forms/Command/ConfirmationFormTest.php
View File

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

2
modules/monitoring/test/php/application/forms/Command/ConfirmationWithIdentifierFormTest.php
View File

@ -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;

2
modules/monitoring/test/php/application/forms/Command/CustomNotificationFormTest.php
View File

@ -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
{

2
modules/monitoring/test/php/application/forms/Command/DelayNotificationFormTest.php
View File

@ -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
{

2
modules/monitoring/test/php/application/forms/Command/RescheduleNextCheckFormTest.php
View File

@ -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;

2
modules/monitoring/test/php/application/forms/Command/ScheduleDowntimeFormTest.php
View File

@ -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;

2
modules/monitoring/test/php/application/forms/Command/SubmitPassiveCheckResultTest.php
View File

@ -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
{

2
modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php
View File

@ -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';

4
modules/monitoring/test/php/library/Backend/Statusdat/ServicegroupsummaryQueryTest.php
View File

@ -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;

2
modules/monitoring/test/php/library/Command/MetaTest.php
View File

@ -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
{

4
modules/monitoring/test/php/testlib/MonitoringControllerTest.php
View File

@ -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 \Monitoring\Backend\Statusdat;
use \Icinga\Module\Monitoring\Backend\Ido;
use \Icinga\Moudle\Monitoring\Backend\Statusdat;
use \Test\Monitoring\Testlib\DataSource\TestFixture;
use \Test\Monitoring\Testlib\DataSource\DataSourceTestSetup;

2
test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
View File

@ -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;

2
test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
View File

@ -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;