From aade2ab7f6571e35f6f8d5253f69844303919271 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 20 Mar 2014 14:30:48 +0100
Subject: [PATCH] Move timeline classes into the monitoring module

refs #4190
---
 .../controllers/TimelineController.php           | 16 ++++++++--------
 .../library/Monitoring}/Timeline/TimeEntry.php   |  4 ++--
 .../library/Monitoring}/Timeline/TimeLine.php    |  7 +++----
 .../library/Monitoring}/Timeline/TimeRange.php   |  2 +-
 .../Monitoring}/Web/Hook/TimelineProvider.php    |  4 ++--
 5 files changed, 16 insertions(+), 17 deletions(-)
 rename {library/Icinga => modules/monitoring/library/Monitoring}/Timeline/TimeEntry.php (98%)
 rename {library/Icinga => modules/monitoring/library/Monitoring}/Timeline/TimeLine.php (99%)
 rename {library/Icinga => modules/monitoring/library/Monitoring}/Timeline/TimeRange.php (99%)
 rename {library/Icinga => modules/monitoring/library/Monitoring}/Web/Hook/TimelineProvider.php (94%)

diff --git a/modules/monitoring/application/controllers/TimelineController.php b/modules/monitoring/application/controllers/TimelineController.php
index 4571bbb4f..70dce5354 100644
--- a/modules/monitoring/application/controllers/TimelineController.php
+++ b/modules/monitoring/application/controllers/TimelineController.php
@@ -29,14 +29,14 @@
 use \DateTime;
 use \Exception;
 use \DateInterval;
-use \Icinga\Web\Hook;
-use \Icinga\Timeline\TimeLine;
-use \Icinga\Timeline\TimeEntry;
-use \Icinga\Timeline\TimeRange;
-use \Icinga\Application\Config;
-use \Icinga\Exception\ProgrammingError;
-use \Icinga\Web\Controller\ActionController;
-use \Icinga\Module\Monitoring\DataView\EventHistory as EventHistoryView;
+use Icinga\Web\Hook;
+use Icinga\Application\Config;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Web\Controller\ActionController;
+use Icinga\Module\Monitoring\Timeline\TimeLine;
+use Icinga\Module\Monitoring\Timeline\TimeEntry;
+use Icinga\Module\Monitoring\Timeline\TimeRange;
+use Icinga\Module\Monitoring\DataView\EventHistory as EventHistoryView;
 
 class Monitoring_TimelineController extends ActionController
 {
diff --git a/library/Icinga/Timeline/TimeEntry.php b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
similarity index 98%
rename from library/Icinga/Timeline/TimeEntry.php
rename to modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
index 7e51489e0..b6c2b8f42 100644
--- a/library/Icinga/Timeline/TimeEntry.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeEntry.php
@@ -26,10 +26,10 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Timeline;
+namespace Icinga\Module\Monitoring\Timeline;
 
 use \DateTime;
-use \Icinga\Exception\ProgrammingError;
+use Icinga\Exception\ProgrammingError;
 
 /**
  * An event group that is part of a timeline
diff --git a/library/Icinga/Timeline/TimeLine.php b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
similarity index 99%
rename from library/Icinga/Timeline/TimeLine.php
rename to modules/monitoring/library/Monitoring/Timeline/TimeLine.php
index 68d4c8047..a759656ba 100644
--- a/library/Icinga/Timeline/TimeLine.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeLine.php
@@ -26,14 +26,13 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Timeline;
+namespace Icinga\Module\Monitoring\Timeline;
 
 use \Zend_Config;
 use \DateInterval;
 use \Zend_View_Interface;
-use \Icinga\Web\Form;
-use \Icinga\Web\Form\Element\Note;
-use \Icinga\Timeline\TimeEntry;
+use Icinga\Web\Form;
+use Icinga\Web\Form\Element\Note;
 
 /**
  * Represents a set of events in a specific time range
diff --git a/library/Icinga/Timeline/TimeRange.php b/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
similarity index 99%
rename from library/Icinga/Timeline/TimeRange.php
rename to modules/monitoring/library/Monitoring/Timeline/TimeRange.php
index c79419071..9f4d5d9c3 100644
--- a/library/Icinga/Timeline/TimeRange.php
+++ b/modules/monitoring/library/Monitoring/Timeline/TimeRange.php
@@ -26,7 +26,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Timeline;
+namespace Icinga\Module\Monitoring\Timeline;
 
 use \StdClass;
 use \Iterator;
diff --git a/library/Icinga/Web/Hook/TimelineProvider.php b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProvider.php
similarity index 94%
rename from library/Icinga/Web/Hook/TimelineProvider.php
rename to modules/monitoring/library/Monitoring/Web/Hook/TimelineProvider.php
index cd88d4b6c..c0ecf50f3 100644
--- a/library/Icinga/Web/Hook/TimelineProvider.php
+++ b/modules/monitoring/library/Monitoring/Web/Hook/TimelineProvider.php
@@ -26,10 +26,10 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Web\Hook;
+namespace Icinga\Module\Monitoring\Web\Hook;
 
 use \Zend_Controller_Request_Abstract;
-use \Icinga\Timeline\TimeRange;
+use Icinga\Module\Monitoring\Timeline\TimeRange;
 
 /**
  * Base class for TimeEntry providers