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

Monitoring: Fix remaining usages of namespace Monitoring without Icinga\Module prefix 

refs #4586
This commit is contained in:
Eric Lippmann 2013-09-03 14:35:43 +02:00 committed by Jannis Moßhammer
parent 3e4d1aa2fb
commit 1b858cbdb4
11 changed files with 14 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Protocol/Statusdat/View/ObjectRemappingView.php
View File

@ -51,7 +51,7 @@ class ObjectRemappingView implements AccessorStrategy
/**
* When implementing your own Mapper, this contains the static mapping rules.
* @see Monitoring\Backend\Statusdat\DataView\StatusdatServiceView for an example
* @see Icinga\Module\Monitoring\Backend\Statusdat\DataView\StatusdatServiceView for an example
*
* @var array
*/

10
modules/monitoring/application/controllers/ConfigController.php
View File

@ -35,12 +35,12 @@ use \Icinga\Web\Controller\BaseConfigController;
use \Icinga\Web\Widget\Tab;
use \Icinga\Web\Url;
use \Monitoring\Form\Config\ConfirmRemovalForm;
use \Monitoring\Form\Config\Backend\EditBackendForm;
use \Monitoring\Form\Config\Backend\CreateBackendForm;
use Icinga\Module\Monitoring\Form\Config\ConfirmRemovalForm;
use Icinga\Module\Monitoring\Form\Config\Backend\EditBackendForm;
use Icinga\Module\Monitoring\Form\Config\Backend\CreateBackendForm;
use \Monitoring\Form\Config\Instance\EditInstanceForm;
use \Monitoring\Form\Config\Instance\CreateInstanceForm;
use Icinga\Module\Monitoring\Form\Config\Instance\EditInstanceForm;
use Icinga\Module\Monitoring\Form\Config\Instance\CreateInstanceForm;
/**
* Configuration controller for editing monitoring resources

2
modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
View File

@ -27,7 +27,7 @@
// {{{ICINGA_LICENSE_HEADER}}}
namespace Monitoring\Form\Config\Backend;
namespace Icinga\Module\Monitoring\Form\Config\Backend;
use \Zend_Config;

2
modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
View File

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

2
modules/monitoring/application/forms/Config/ConfirmRemovalForm.php
View File

@ -27,7 +27,7 @@
// {{{ICINGA_LICENSE_HEADER}}}
namespace Monitoring\Form\Config;
namespace Icinga\Module\Monitoring\Form\Config;
use Icinga\Web\Form;

2
modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
View File

@ -27,7 +27,7 @@
// {{{ICINGA_LICENSE_HEADER}}}
namespace Monitoring\Form\Config\Instance;
namespace Icinga\Module\Monitoring\Form\Config\Instance;
use \Icinga\Web\Form;
use \Zend_Config;

2
modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
View File

@ -27,7 +27,7 @@
// {{{ICINGA_LICENSE_HEADER}}}
namespace Monitoring\Form\Config\Instance;
namespace Icinga\Module\Monitoring\Form\Config\Instance;
use \Zend_Config;
use \Icinga\Web\Form;

2
modules/monitoring/application/views/scripts/show/history.phtml
View File

@ -27,7 +27,7 @@ There are no matching history entries right now
<td><?= $this->escape($event->host_name) ?></td>
<? endif ?>
<? if (! $object instanceof Monitoring\Object\Service): ?>
<? if (! $object instanceof Icinga\Module\Monitoring\Object\Service): ?>
<td>
<? if ($object): ?>
<a href="<?= $this->href('monitoring/show/service',array(

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

@ -7,7 +7,7 @@ use Icinga\Data\Db\Connection;
/**
* This class provides an easy-to-use interface to the IDO database
*
* You should usually not directly use this class but go through Monitoring\Backend.
* You should usually not directly use this class but go through Icinga\Module\Monitoring\Backend.
*
* New MySQL indexes:
* <code>

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

@ -13,7 +13,7 @@ use Icinga\Data\Filter;
*
* You should not directly instantiate such a view but always go through the
* Monitoring Backend. Using the Backend's select() method selecting from
* 'virtualtable' returns a Monitoring\View\VirtualtableView instance.
* 'virtualtable' returns a Icinga\Module\Monitoring\View\VirtualtableView instance.
*
* Usage example:
* <code>

47
test/php/library/Icinga/Test/BaseTestCaseFormTest.php
View File

@ -1,47 +0,0 @@
<?php
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga 2 Web.
*
* Icinga 2 Web - Head for multiple monitoring backends.
* Copyright (C) 2013 Icinga Development Team
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* @copyright 2013 Icinga Development Team <info@icinga.org>
* @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
* @author Icinga Development Team <info@icinga.org>
*/
// {{{ICINGA_LICENSE_HEADER}}}
namespace Tests\Icinga\Test;
require_once realpath(__DIR__ . '/../../../../../library/Icinga/Test/BaseTestCase.php');
use \Icinga\Test\BaseTestCase;
require_once BaseTestCase::$appDir . '/forms/Authentication/LoginForm.php';
require_once BaseTestCase::$moduleDir . '/monitoring/application/forms/Config/ConfirmRemovalForm.php';
class BaseTestCaseFormTest extends BaseTestCase
{
public function testFormCreation()
{
$form1 = $this->createForm('Icinga\Form\Authentication\LoginForm');
$this->assertInstanceOf('Icinga\Web\Form', $form1);
$form2 = $this->createForm('Monitoring\Form\Config\ConfirmRemovalForm');
$this->assertInstanceOf('Icinga\Web\Form', $form2);
}
}