From f4baa94c104ef2bfbf3b3f15acee0a8701b10fef Mon Sep 17 00:00:00 2001 From: fgerlits Date: Fri, 12 May 2006 21:49:03 +0000 Subject: [PATCH] renamed namespace as per #1670 --- .../core/include/LiveSupport/Core/SearchCriteria.h | 4 ++-- .../{Storage => StorageClient}/StorageClientFactory.h | 6 +++--- .../StorageClientInterface.h | 4 ++-- .../storageClient/src/StorageClientFactory.cxx | 4 ++-- .../storageClient/src/StorageClientFactoryTest.cxx | 6 +++--- .../storageClient/src/StorageClientFactoryTest.h | 4 ++-- .../modules/storageClient/src/TestStorageClient.cxx | 11 ++++++----- .../src/modules/storageClient/src/TestStorageClient.h | 6 +++--- .../storageClient/src/TestStorageClientTest.cxx | 2 +- .../modules/storageClient/src/TestStorageClientTest.h | 4 ++-- .../modules/storageClient/src/WebStorageClient.cxx | 2 +- .../src/modules/storageClient/src/WebStorageClient.h | 6 +++--- .../storageClient/src/WebStorageClientTest.cxx | 2 +- .../modules/storageClient/src/WebStorageClientTest.h | 4 ++-- .../src/products/gLiveSupport/src/AudioPlayerTest.cxx | 4 ++-- .../gLiveSupport/src/ExportFormatRadioButtons.cxx | 2 +- .../gLiveSupport/src/ExportFormatRadioButtons.h | 4 ++-- .../src/products/gLiveSupport/src/GLiveSupport.cxx | 4 ++-- .../src/products/gLiveSupport/src/GLiveSupport.h | 4 ++-- .../src/products/gLiveSupport/src/TransportList.cxx | 2 +- .../scheduler/src/AddAudioClipToPlaylistMethod.cxx | 6 +++--- .../src/AddAudioClipToPlaylistMethodTest.cxx | 4 ++-- .../products/scheduler/src/CreatePlaylistMethod.cxx | 6 +++--- .../scheduler/src/CreatePlaylistMethodTest.cxx | 4 ++-- .../products/scheduler/src/DisplayAudioClipMethod.cxx | 6 +++--- .../scheduler/src/DisplayAudioClipMethodTest.cxx | 4 ++-- .../scheduler/src/DisplayAudioClipsMethod.cxx | 6 +++--- .../scheduler/src/DisplayAudioClipsMethodTest.cxx | 4 ++-- .../products/scheduler/src/DisplayPlaylistMethod.cxx | 6 +++--- .../scheduler/src/DisplayPlaylistMethodTest.cxx | 4 ++-- .../products/scheduler/src/DisplayPlaylistsMethod.cxx | 6 +++--- .../scheduler/src/DisplayPlaylistsMethodTest.cxx | 4 ++-- .../scheduler/src/DisplayScheduleMethodTest.cxx | 4 ++-- .../scheduler/src/GeneratePlayReportMethodTest.cxx | 4 ++-- .../products/scheduler/src/GetSchedulerTimeMethod.cxx | 6 +++--- .../scheduler/src/OpenPlaylistForEditingMethod.cxx | 6 +++--- .../src/OpenPlaylistForEditingMethodTest.cxx | 4 ++-- .../src/products/scheduler/src/PlaylistEvent.h | 4 ++-- .../products/scheduler/src/PlaylistEventContainer.h | 4 ++-- .../scheduler/src/PlaylistEventContainerTest.cxx | 4 ++-- .../scheduler/src/PlaylistEventContainerTest.h | 4 ++-- .../src/products/scheduler/src/PlaylistEventTest.cxx | 4 ++-- .../src/products/scheduler/src/PlaylistEventTest.h | 2 +- .../src/RemoveAudioClipFromPlaylistMethod.cxx | 6 +++--- .../src/RemoveAudioClipFromPlaylistMethodTest.cxx | 4 ++-- .../scheduler/src/RemoveFromScheduleMethodTest.cxx | 4 ++-- .../products/scheduler/src/RescheduleMethodTest.cxx | 2 +- .../src/products/scheduler/src/ResetStorageMethod.cxx | 6 +++--- .../scheduler/src/RevertEditedPlaylistMethod.cxx | 6 +++--- .../scheduler/src/RevertEditedPlaylistMethodTest.cxx | 4 ++-- .../src/products/scheduler/src/SavePlaylistMethod.cxx | 6 +++--- .../products/scheduler/src/SavePlaylistMethodTest.cxx | 4 ++-- .../src/products/scheduler/src/SchedulerDaemon.cxx | 4 ++-- .../src/products/scheduler/src/SchedulerDaemon.h | 4 ++-- .../scheduler/src/UpdateFadeInFadeOutMethod.cxx | 6 +++--- .../scheduler/src/UpdateFadeInFadeOutMethodTest.cxx | 4 ++-- .../products/scheduler/src/UploadPlaylistMethod.cxx | 6 +++--- .../scheduler/src/UploadPlaylistMethodTest.cxx | 4 ++-- .../products/scheduler/src/ValidatePlaylistMethod.cxx | 6 +++--- .../scheduler/src/ValidatePlaylistMethodTest.cxx | 4 ++-- 60 files changed, 136 insertions(+), 135 deletions(-) rename livesupport/src/modules/storageClient/include/LiveSupport/{Storage => StorageClient}/StorageClientFactory.h (98%) rename livesupport/src/modules/storageClient/include/LiveSupport/{Storage => StorageClient}/StorageClientInterface.h (99%) diff --git a/livesupport/src/modules/core/include/LiveSupport/Core/SearchCriteria.h b/livesupport/src/modules/core/include/LiveSupport/Core/SearchCriteria.h index a3e3eeef7..854809473 100644 --- a/livesupport/src/modules/core/include/LiveSupport/Core/SearchCriteria.h +++ b/livesupport/src/modules/core/include/LiveSupport/Core/SearchCriteria.h @@ -49,7 +49,7 @@ // forward declaration of friend class namespace LiveSupport { -namespace Storage { +namespace StorageClient { class TestStorageClient; } } @@ -178,7 +178,7 @@ class SearchCriteria /** * Give access of private members to the TestStorageClient. */ - friend class LiveSupport::Storage::TestStorageClient; + friend class LiveSupport::StorageClient::TestStorageClient; public: diff --git a/livesupport/src/modules/storageClient/include/LiveSupport/Storage/StorageClientFactory.h b/livesupport/src/modules/storageClient/include/LiveSupport/StorageClient/StorageClientFactory.h similarity index 98% rename from livesupport/src/modules/storageClient/include/LiveSupport/Storage/StorageClientFactory.h rename to livesupport/src/modules/storageClient/include/LiveSupport/StorageClient/StorageClientFactory.h index 05a2d0299..11f9494cf 100644 --- a/livesupport/src/modules/storageClient/include/LiveSupport/Storage/StorageClientFactory.h +++ b/livesupport/src/modules/storageClient/include/LiveSupport/StorageClient/StorageClientFactory.h @@ -43,11 +43,11 @@ #include #include "LiveSupport/Core/Configurable.h" -#include "LiveSupport/Storage/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" namespace LiveSupport { -namespace Storage { +namespace StorageClient { using namespace LiveSupport; using namespace LiveSupport::Core; @@ -193,7 +193,7 @@ class StorageClientFactory : /* ====================================================== function prototypes */ -} // namespace Storage +} // namespace StorageClient } // namespace LiveSupport #endif // LiveSupport_Storage_StorageClientFactory_h diff --git a/livesupport/src/modules/storageClient/include/LiveSupport/Storage/StorageClientInterface.h b/livesupport/src/modules/storageClient/include/LiveSupport/StorageClient/StorageClientInterface.h similarity index 99% rename from livesupport/src/modules/storageClient/include/LiveSupport/Storage/StorageClientInterface.h rename to livesupport/src/modules/storageClient/include/LiveSupport/StorageClient/StorageClientInterface.h index 4edb66dea..862d4ea5a 100644 --- a/livesupport/src/modules/storageClient/include/LiveSupport/Storage/StorageClientInterface.h +++ b/livesupport/src/modules/storageClient/include/LiveSupport/StorageClient/StorageClientInterface.h @@ -50,7 +50,7 @@ namespace LiveSupport { -namespace Storage { +namespace StorageClient { using namespace Core; @@ -706,7 +706,7 @@ class StorageClientInterface /* ====================================================== function prototypes */ -} // namespace Storage +} // namespace StorageClient } // namespace LiveSupport #endif // LiveSupport_Storage_StorageClientInterface_h diff --git a/livesupport/src/modules/storageClient/src/StorageClientFactory.cxx b/livesupport/src/modules/storageClient/src/StorageClientFactory.cxx index c7b57dfb8..c115463c5 100644 --- a/livesupport/src/modules/storageClient/src/StorageClientFactory.cxx +++ b/livesupport/src/modules/storageClient/src/StorageClientFactory.cxx @@ -34,13 +34,13 @@ #endif -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "TestStorageClient.h" #include "WebStorageClient.h" using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; /* =================================================== local data structures */ diff --git a/livesupport/src/modules/storageClient/src/StorageClientFactoryTest.cxx b/livesupport/src/modules/storageClient/src/StorageClientFactoryTest.cxx index 477d02233..d7212703c 100644 --- a/livesupport/src/modules/storageClient/src/StorageClientFactoryTest.cxx +++ b/livesupport/src/modules/storageClient/src/StorageClientFactoryTest.cxx @@ -46,15 +46,15 @@ #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" -#include "LiveSupport/Storage/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" #include "StorageClientFactoryTest.h" using namespace std; using namespace LiveSupport::Core; using namespace LiveSupport::Authentication; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; /* =================================================== local data structures */ diff --git a/livesupport/src/modules/storageClient/src/StorageClientFactoryTest.h b/livesupport/src/modules/storageClient/src/StorageClientFactoryTest.h index a7cb54ea7..c7cb578e9 100644 --- a/livesupport/src/modules/storageClient/src/StorageClientFactoryTest.h +++ b/livesupport/src/modules/storageClient/src/StorageClientFactoryTest.h @@ -44,7 +44,7 @@ namespace LiveSupport { -namespace Storage { +namespace StorageClient { /* ================================================================ constants */ @@ -100,7 +100,7 @@ class StorageClientFactoryTest : public CPPUNIT_NS::TestFixture /* ====================================================== function prototypes */ -} // namespace Storage +} // namespace StorageClient } // namespace LiveSupport #endif // StorageClientFactoryTest_h diff --git a/livesupport/src/modules/storageClient/src/TestStorageClient.cxx b/livesupport/src/modules/storageClient/src/TestStorageClient.cxx index 88520841e..3a35a7002 100644 --- a/livesupport/src/modules/storageClient/src/TestStorageClient.cxx +++ b/livesupport/src/modules/storageClient/src/TestStorageClient.cxx @@ -51,7 +51,7 @@ using namespace boost::posix_time; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; /* =================================================== local data structures */ @@ -940,10 +940,11 @@ TestStorageClient :: satisfiesCondition( * Separate a key into the metadata name and its namespace *----------------------------------------------------------------------------*/ void -LiveSupport::Storage :: separateNameAndNameSpace(const std::string & key, - std::string & name, - std::string & prefix) - throw () +LiveSupport::StorageClient :: separateNameAndNameSpace( + const std::string & key, + std::string & name, + std::string & prefix) + throw () { unsigned int colonPosition = key.find(':'); diff --git a/livesupport/src/modules/storageClient/src/TestStorageClient.h b/livesupport/src/modules/storageClient/src/TestStorageClient.h index b4e0d9710..d3aba0b59 100644 --- a/livesupport/src/modules/storageClient/src/TestStorageClient.h +++ b/livesupport/src/modules/storageClient/src/TestStorageClient.h @@ -43,11 +43,11 @@ #include #include "LiveSupport/Core/Configurable.h" -#include "LiveSupport/Storage/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" namespace LiveSupport { -namespace Storage { +namespace StorageClient { using namespace LiveSupport; using namespace LiveSupport::Core; @@ -824,7 +824,7 @@ class TestStorageClient : std::string & prefix) throw (); -} // namespace Storage +} // namespace StorageClient } // namespace LiveSupport #endif // TestStorageClient_h diff --git a/livesupport/src/modules/storageClient/src/TestStorageClientTest.cxx b/livesupport/src/modules/storageClient/src/TestStorageClientTest.cxx index e3bf91c08..460ecbbda 100644 --- a/livesupport/src/modules/storageClient/src/TestStorageClientTest.cxx +++ b/livesupport/src/modules/storageClient/src/TestStorageClientTest.cxx @@ -51,7 +51,7 @@ using namespace std; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; /* =================================================== local data structures */ diff --git a/livesupport/src/modules/storageClient/src/TestStorageClientTest.h b/livesupport/src/modules/storageClient/src/TestStorageClientTest.h index dde3f7ebf..69ad54a92 100644 --- a/livesupport/src/modules/storageClient/src/TestStorageClientTest.h +++ b/livesupport/src/modules/storageClient/src/TestStorageClientTest.h @@ -44,7 +44,7 @@ namespace LiveSupport { -namespace Storage { +namespace StorageClient { /* ================================================================ constants */ @@ -218,7 +218,7 @@ class TestStorageClientTest : public CPPUNIT_NS::TestFixture /* ====================================================== function prototypes */ -} // namespace Storage +} // namespace StorageClient } // namespace LiveSupport #endif // TestStorageClientTest_h diff --git a/livesupport/src/modules/storageClient/src/WebStorageClient.cxx b/livesupport/src/modules/storageClient/src/WebStorageClient.cxx index 585d21e2e..851ba60d6 100644 --- a/livesupport/src/modules/storageClient/src/WebStorageClient.cxx +++ b/livesupport/src/modules/storageClient/src/WebStorageClient.cxx @@ -60,7 +60,7 @@ using namespace boost::posix_time; using namespace XmlRpc; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; /* =================================================== local data structures */ diff --git a/livesupport/src/modules/storageClient/src/WebStorageClient.h b/livesupport/src/modules/storageClient/src/WebStorageClient.h index b4d93c71a..a48622f5e 100644 --- a/livesupport/src/modules/storageClient/src/WebStorageClient.h +++ b/livesupport/src/modules/storageClient/src/WebStorageClient.h @@ -46,11 +46,11 @@ #include "LiveSupport/Core/Playlist.h" #include "LiveSupport/Core/Configurable.h" -#include "LiveSupport/Storage/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" namespace LiveSupport { -namespace Storage { +namespace StorageClient { using namespace XmlRpc; @@ -908,7 +908,7 @@ class WebStorageClient : /* ====================================================== function prototypes */ -} // namespace Core +} // namespace StorageClient } // namespace LiveSupport #endif // WebStorageClient_h diff --git a/livesupport/src/modules/storageClient/src/WebStorageClientTest.cxx b/livesupport/src/modules/storageClient/src/WebStorageClientTest.cxx index 01c0d78fe..41c968b36 100644 --- a/livesupport/src/modules/storageClient/src/WebStorageClientTest.cxx +++ b/livesupport/src/modules/storageClient/src/WebStorageClientTest.cxx @@ -61,7 +61,7 @@ using namespace boost::posix_time; using namespace LiveSupport::Core; using namespace LiveSupport::Authentication; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; /* =================================================== local data structures */ diff --git a/livesupport/src/modules/storageClient/src/WebStorageClientTest.h b/livesupport/src/modules/storageClient/src/WebStorageClientTest.h index 3784e1d7f..7616dbe6a 100644 --- a/livesupport/src/modules/storageClient/src/WebStorageClientTest.h +++ b/livesupport/src/modules/storageClient/src/WebStorageClientTest.h @@ -47,7 +47,7 @@ #include "LiveSupport/Authentication/AuthenticationClientFactory.h" namespace LiveSupport { -namespace Storage { +namespace StorageClient { using namespace LiveSupport::Core; using namespace LiveSupport::Authentication; @@ -234,7 +234,7 @@ class WebStorageClientTest : public BaseTestMethod /* ====================================================== function prototypes */ -} // namespace Storage +} // namespace StorageClient } // namespace LiveSupport #endif // WebStorageClientTest_h diff --git a/livesupport/src/products/gLiveSupport/src/AudioPlayerTest.cxx b/livesupport/src/products/gLiveSupport/src/AudioPlayerTest.cxx index ac2adbd00..5c4485c8a 100644 --- a/livesupport/src/products/gLiveSupport/src/AudioPlayerTest.cxx +++ b/livesupport/src/products/gLiveSupport/src/AudioPlayerTest.cxx @@ -45,7 +45,7 @@ #include "LiveSupport/Core/TimeConversion.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "LiveSupport/Core/AudioClip.h" #include "LiveSupport/Core/Playlist.h" @@ -55,7 +55,7 @@ using namespace LiveSupport::PlaylistExecutor; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Authentication; using namespace LiveSupport::gLiveSupport; diff --git a/livesupport/src/products/gLiveSupport/src/ExportFormatRadioButtons.cxx b/livesupport/src/products/gLiveSupport/src/ExportFormatRadioButtons.cxx index 008e97cad..ebbdba592 100644 --- a/livesupport/src/products/gLiveSupport/src/ExportFormatRadioButtons.cxx +++ b/livesupport/src/products/gLiveSupport/src/ExportFormatRadioButtons.cxx @@ -37,7 +37,7 @@ using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Widgets; using namespace LiveSupport::GLiveSupport; diff --git a/livesupport/src/products/gLiveSupport/src/ExportFormatRadioButtons.h b/livesupport/src/products/gLiveSupport/src/ExportFormatRadioButtons.h index 10fb64dbf..3bfa8911b 100644 --- a/livesupport/src/products/gLiveSupport/src/ExportFormatRadioButtons.h +++ b/livesupport/src/products/gLiveSupport/src/ExportFormatRadioButtons.h @@ -37,7 +37,7 @@ /* ============================================================ include files */ #include "LiveSupport/Core/LocalizedObject.h" -#include "LiveSupport/Storage/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" #include "LiveSupport/Widgets/RadioButtons.h" @@ -45,7 +45,7 @@ namespace LiveSupport { namespace GLiveSupport { using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Widgets; /* ================================================================ constants */ diff --git a/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx b/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx index 4dfc0ad88..f319a4f20 100644 --- a/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx +++ b/livesupport/src/products/gLiveSupport/src/GLiveSupport.cxx @@ -56,7 +56,7 @@ #include "LiveSupport/Core/LocalizedObject.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/SchedulerClient/SchedulerClientFactory.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerFactory.h" #include "LiveSupport/Core/TimeConversion.h" @@ -71,7 +71,7 @@ using namespace boost::posix_time; using namespace LiveSupport::Core; using namespace LiveSupport::Authentication; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::SchedulerClient; using namespace LiveSupport::Widgets; using namespace LiveSupport::GLiveSupport; diff --git a/livesupport/src/products/gLiveSupport/src/GLiveSupport.h b/livesupport/src/products/gLiveSupport/src/GLiveSupport.h index c50f7b67e..c36ed267f 100644 --- a/livesupport/src/products/gLiveSupport/src/GLiveSupport.h +++ b/livesupport/src/products/gLiveSupport/src/GLiveSupport.h @@ -51,7 +51,7 @@ #include "LiveSupport/Core/MetadataTypeContainer.h" #include "LiveSupport/Core/OptionsContainer.h" #include "LiveSupport/Authentication/AuthenticationClientInterface.h" -#include "LiveSupport/Storage/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" #include "LiveSupport/SchedulerClient/SchedulerClientInterface.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h" #include "LiveSupport/Widgets/WidgetFactory.h" @@ -65,7 +65,7 @@ namespace GLiveSupport { using namespace LiveSupport::Core; using namespace LiveSupport::SchedulerClient; using namespace LiveSupport::Authentication; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::PlaylistExecutor; using namespace LiveSupport::Widgets; diff --git a/livesupport/src/products/gLiveSupport/src/TransportList.cxx b/livesupport/src/products/gLiveSupport/src/TransportList.cxx index 0d75565e3..d838643f8 100644 --- a/livesupport/src/products/gLiveSupport/src/TransportList.cxx +++ b/livesupport/src/products/gLiveSupport/src/TransportList.cxx @@ -38,7 +38,7 @@ using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Widgets; using namespace LiveSupport::GLiveSupport; diff --git a/livesupport/src/products/scheduler/src/AddAudioClipToPlaylistMethod.cxx b/livesupport/src/products/scheduler/src/AddAudioClipToPlaylistMethod.cxx index a0d1e897f..8a0d91a3b 100644 --- a/livesupport/src/products/scheduler/src/AddAudioClipToPlaylistMethod.cxx +++ b/livesupport/src/products/scheduler/src/AddAudioClipToPlaylistMethod.cxx @@ -42,8 +42,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "ScheduleInterface.h" #include "ScheduleFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -56,7 +56,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/AddAudioClipToPlaylistMethodTest.cxx b/livesupport/src/products/scheduler/src/AddAudioClipToPlaylistMethodTest.cxx index 3d789280f..dce4aa055 100644 --- a/livesupport/src/products/scheduler/src/AddAudioClipToPlaylistMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/AddAudioClipToPlaylistMethodTest.cxx @@ -45,7 +45,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -56,7 +56,7 @@ using namespace std; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/CreatePlaylistMethod.cxx b/livesupport/src/products/scheduler/src/CreatePlaylistMethod.cxx index 08f484849..daa808b18 100644 --- a/livesupport/src/products/scheduler/src/CreatePlaylistMethod.cxx +++ b/livesupport/src/products/scheduler/src/CreatePlaylistMethod.cxx @@ -42,8 +42,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "ScheduleInterface.h" #include "ScheduleFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -56,7 +56,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/CreatePlaylistMethodTest.cxx b/livesupport/src/products/scheduler/src/CreatePlaylistMethodTest.cxx index e02343590..875459056 100644 --- a/livesupport/src/products/scheduler/src/CreatePlaylistMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/CreatePlaylistMethodTest.cxx @@ -45,7 +45,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "SchedulerDaemon.h" @@ -56,7 +56,7 @@ using namespace XmlRpc; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/DisplayAudioClipMethod.cxx b/livesupport/src/products/scheduler/src/DisplayAudioClipMethod.cxx index 1107a4b34..6d3266dcb 100644 --- a/livesupport/src/products/scheduler/src/DisplayAudioClipMethod.cxx +++ b/livesupport/src/products/scheduler/src/DisplayAudioClipMethod.cxx @@ -42,8 +42,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "ScheduleInterface.h" #include "ScheduleFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -56,7 +56,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/DisplayAudioClipMethodTest.cxx b/livesupport/src/products/scheduler/src/DisplayAudioClipMethodTest.cxx index 9ea268845..ac3cc7eaa 100644 --- a/livesupport/src/products/scheduler/src/DisplayAudioClipMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/DisplayAudioClipMethodTest.cxx @@ -45,7 +45,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "SchedulerDaemon.h" @@ -54,7 +54,7 @@ using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/DisplayAudioClipsMethod.cxx b/livesupport/src/products/scheduler/src/DisplayAudioClipsMethod.cxx index e062c1658..a3e345853 100644 --- a/livesupport/src/products/scheduler/src/DisplayAudioClipsMethod.cxx +++ b/livesupport/src/products/scheduler/src/DisplayAudioClipsMethod.cxx @@ -36,8 +36,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" #include "DisplayAudioClipsMethod.h" @@ -47,7 +47,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/DisplayAudioClipsMethodTest.cxx b/livesupport/src/products/scheduler/src/DisplayAudioClipsMethodTest.cxx index 039cd7ee6..c12f5783d 100644 --- a/livesupport/src/products/scheduler/src/DisplayAudioClipsMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/DisplayAudioClipsMethodTest.cxx @@ -46,7 +46,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "SchedulerDaemon.h" @@ -55,7 +55,7 @@ using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/DisplayPlaylistMethod.cxx b/livesupport/src/products/scheduler/src/DisplayPlaylistMethod.cxx index 3b229a084..67af32652 100644 --- a/livesupport/src/products/scheduler/src/DisplayPlaylistMethod.cxx +++ b/livesupport/src/products/scheduler/src/DisplayPlaylistMethod.cxx @@ -42,8 +42,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "ScheduleInterface.h" #include "ScheduleFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -56,7 +56,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/DisplayPlaylistMethodTest.cxx b/livesupport/src/products/scheduler/src/DisplayPlaylistMethodTest.cxx index a1b9dba99..469b2b970 100644 --- a/livesupport/src/products/scheduler/src/DisplayPlaylistMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/DisplayPlaylistMethodTest.cxx @@ -45,7 +45,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "SchedulerDaemon.h" @@ -54,7 +54,7 @@ using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/DisplayPlaylistsMethod.cxx b/livesupport/src/products/scheduler/src/DisplayPlaylistsMethod.cxx index 33ddd8593..289d1d6c8 100644 --- a/livesupport/src/products/scheduler/src/DisplayPlaylistsMethod.cxx +++ b/livesupport/src/products/scheduler/src/DisplayPlaylistsMethod.cxx @@ -36,8 +36,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" #include "DisplayPlaylistsMethod.h" @@ -47,7 +47,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/DisplayPlaylistsMethodTest.cxx b/livesupport/src/products/scheduler/src/DisplayPlaylistsMethodTest.cxx index 5c3ac213f..54d458e58 100644 --- a/livesupport/src/products/scheduler/src/DisplayPlaylistsMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/DisplayPlaylistsMethodTest.cxx @@ -46,7 +46,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "SchedulerDaemon.h" @@ -55,7 +55,7 @@ using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/DisplayScheduleMethodTest.cxx b/livesupport/src/products/scheduler/src/DisplayScheduleMethodTest.cxx index 92626c6d9..88cd6e2ad 100644 --- a/livesupport/src/products/scheduler/src/DisplayScheduleMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/DisplayScheduleMethodTest.cxx @@ -45,7 +45,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "SchedulerDaemon.h" @@ -58,7 +58,7 @@ using namespace std; using namespace XmlRpc; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/GeneratePlayReportMethodTest.cxx b/livesupport/src/products/scheduler/src/GeneratePlayReportMethodTest.cxx index aa27f822b..1bceb07db 100644 --- a/livesupport/src/products/scheduler/src/GeneratePlayReportMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/GeneratePlayReportMethodTest.cxx @@ -45,7 +45,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "SchedulerDaemon.h" @@ -57,7 +57,7 @@ using namespace std; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/GetSchedulerTimeMethod.cxx b/livesupport/src/products/scheduler/src/GetSchedulerTimeMethod.cxx index 46547c3ad..58aba68fa 100644 --- a/livesupport/src/products/scheduler/src/GetSchedulerTimeMethod.cxx +++ b/livesupport/src/products/scheduler/src/GetSchedulerTimeMethod.cxx @@ -43,8 +43,8 @@ #include #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Core/TimeConversion.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -56,7 +56,7 @@ using namespace boost::gregorian; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/OpenPlaylistForEditingMethod.cxx b/livesupport/src/products/scheduler/src/OpenPlaylistForEditingMethod.cxx index fee91c3ba..0a9880ef4 100644 --- a/livesupport/src/products/scheduler/src/OpenPlaylistForEditingMethod.cxx +++ b/livesupport/src/products/scheduler/src/OpenPlaylistForEditingMethod.cxx @@ -42,8 +42,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "ScheduleInterface.h" #include "ScheduleFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -56,7 +56,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/OpenPlaylistForEditingMethodTest.cxx b/livesupport/src/products/scheduler/src/OpenPlaylistForEditingMethodTest.cxx index 514774653..e2e6eae7b 100644 --- a/livesupport/src/products/scheduler/src/OpenPlaylistForEditingMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/OpenPlaylistForEditingMethodTest.cxx @@ -45,7 +45,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -55,7 +55,7 @@ using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/PlaylistEvent.h b/livesupport/src/products/scheduler/src/PlaylistEvent.h index d3d7f62be..ade1e8b41 100644 --- a/livesupport/src/products/scheduler/src/PlaylistEvent.h +++ b/livesupport/src/products/scheduler/src/PlaylistEvent.h @@ -42,7 +42,7 @@ #include "LiveSupport/Core/SessionId.h" #include "LiveSupport/Core/ScheduleEntry.h" -#include "LiveSupport/Storage/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h" #include "LiveSupport/EventScheduler/ScheduledEventInterface.h" @@ -58,7 +58,7 @@ using namespace LiveSupport::Core; using namespace LiveSupport::PlaylistExecutor; using namespace LiveSupport::EventScheduler; using namespace LiveSupport::Scheduler; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; /* ================================================================ constants */ diff --git a/livesupport/src/products/scheduler/src/PlaylistEventContainer.h b/livesupport/src/products/scheduler/src/PlaylistEventContainer.h index 11f1636db..0e6625bee 100644 --- a/livesupport/src/products/scheduler/src/PlaylistEventContainer.h +++ b/livesupport/src/products/scheduler/src/PlaylistEventContainer.h @@ -41,7 +41,7 @@ #endif #include "LiveSupport/Core/SessionId.h" -#include "LiveSupport/Storage/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h" #include "LiveSupport/EventScheduler/EventContainerInterface.h" @@ -58,7 +58,7 @@ using namespace LiveSupport; using namespace LiveSupport::Core; using namespace LiveSupport::PlaylistExecutor; using namespace LiveSupport::EventScheduler; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; /* ================================================================ constants */ diff --git a/livesupport/src/products/scheduler/src/PlaylistEventContainerTest.cxx b/livesupport/src/products/scheduler/src/PlaylistEventContainerTest.cxx index e0bdca2b8..5a6b2343d 100644 --- a/livesupport/src/products/scheduler/src/PlaylistEventContainerTest.cxx +++ b/livesupport/src/products/scheduler/src/PlaylistEventContainerTest.cxx @@ -44,7 +44,7 @@ #include "LiveSupport/Core/TimeConversion.h" #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "PlayLogFactory.h" @@ -58,7 +58,7 @@ using namespace boost::posix_time; using namespace LiveSupport::Core; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::PlaylistExecutor; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/PlaylistEventContainerTest.h b/livesupport/src/products/scheduler/src/PlaylistEventContainerTest.h index d604f99f4..c8a7d2f2d 100644 --- a/livesupport/src/products/scheduler/src/PlaylistEventContainerTest.h +++ b/livesupport/src/products/scheduler/src/PlaylistEventContainerTest.h @@ -45,7 +45,7 @@ #include "LiveSupport/Authentication/AuthenticationClientInterface.h" #include "LiveSupport/Core/SessionId.h" -#include "LiveSupport/Storage/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h" #include "ScheduleInterface.h" #include "PlayLogInterface.h" @@ -62,7 +62,7 @@ using namespace LiveSupport::Core; using namespace LiveSupport::PlaylistExecutor; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; /* ================================================================ constants */ diff --git a/livesupport/src/products/scheduler/src/PlaylistEventTest.cxx b/livesupport/src/products/scheduler/src/PlaylistEventTest.cxx index d334e87d2..ef318589e 100644 --- a/livesupport/src/products/scheduler/src/PlaylistEventTest.cxx +++ b/livesupport/src/products/scheduler/src/PlaylistEventTest.cxx @@ -44,7 +44,7 @@ #include "LiveSupport/Core/TimeConversion.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerFactory.h" #include "SchedulerDaemon.h" @@ -57,7 +57,7 @@ using namespace boost::posix_time; using namespace LiveSupport::Core; using namespace LiveSupport::Authentication; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::PlaylistExecutor; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/PlaylistEventTest.h b/livesupport/src/products/scheduler/src/PlaylistEventTest.h index d930d7007..ac08c8f3f 100644 --- a/livesupport/src/products/scheduler/src/PlaylistEventTest.h +++ b/livesupport/src/products/scheduler/src/PlaylistEventTest.h @@ -43,7 +43,7 @@ #include #include "LiveSupport/Authentication/AuthenticationClientInterface.h" -#include "LiveSupport/Storage/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h" #include "PlayLogInterface.h" diff --git a/livesupport/src/products/scheduler/src/RemoveAudioClipFromPlaylistMethod.cxx b/livesupport/src/products/scheduler/src/RemoveAudioClipFromPlaylistMethod.cxx index ad3c51652..1fff8f483 100644 --- a/livesupport/src/products/scheduler/src/RemoveAudioClipFromPlaylistMethod.cxx +++ b/livesupport/src/products/scheduler/src/RemoveAudioClipFromPlaylistMethod.cxx @@ -42,8 +42,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "ScheduleInterface.h" #include "ScheduleFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -56,7 +56,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/RemoveAudioClipFromPlaylistMethodTest.cxx b/livesupport/src/products/scheduler/src/RemoveAudioClipFromPlaylistMethodTest.cxx index 3f3edcc46..62d882651 100644 --- a/livesupport/src/products/scheduler/src/RemoveAudioClipFromPlaylistMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/RemoveAudioClipFromPlaylistMethodTest.cxx @@ -45,7 +45,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -58,7 +58,7 @@ using namespace std; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/RemoveFromScheduleMethodTest.cxx b/livesupport/src/products/scheduler/src/RemoveFromScheduleMethodTest.cxx index 531a3ce7e..125009560 100644 --- a/livesupport/src/products/scheduler/src/RemoveFromScheduleMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/RemoveFromScheduleMethodTest.cxx @@ -47,7 +47,7 @@ #include "ScheduleFactory.h" #include "LiveSupport/Core/TimeConversion.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "SchedulerDaemon.h" #include "UploadPlaylistMethod.h" @@ -58,7 +58,7 @@ using namespace boost::posix_time; using namespace LiveSupport::Authentication; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/RescheduleMethodTest.cxx b/livesupport/src/products/scheduler/src/RescheduleMethodTest.cxx index 98c2688c7..936e23c62 100644 --- a/livesupport/src/products/scheduler/src/RescheduleMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/RescheduleMethodTest.cxx @@ -46,7 +46,7 @@ #include "LiveSupport/Core/TimeConversion.h" #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "SchedulerDaemon.h" diff --git a/livesupport/src/products/scheduler/src/ResetStorageMethod.cxx b/livesupport/src/products/scheduler/src/ResetStorageMethod.cxx index b54382b54..93a34f7f8 100644 --- a/livesupport/src/products/scheduler/src/ResetStorageMethod.cxx +++ b/livesupport/src/products/scheduler/src/ResetStorageMethod.cxx @@ -33,14 +33,14 @@ #include "configure.h" #endif -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" #include "ResetStorageMethod.h" -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; /* =================================================== local data structures */ diff --git a/livesupport/src/products/scheduler/src/RevertEditedPlaylistMethod.cxx b/livesupport/src/products/scheduler/src/RevertEditedPlaylistMethod.cxx index 3d83617e9..594071fab 100644 --- a/livesupport/src/products/scheduler/src/RevertEditedPlaylistMethod.cxx +++ b/livesupport/src/products/scheduler/src/RevertEditedPlaylistMethod.cxx @@ -42,8 +42,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" #include "RevertEditedPlaylistMethod.h" @@ -51,7 +51,7 @@ using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/RevertEditedPlaylistMethodTest.cxx b/livesupport/src/products/scheduler/src/RevertEditedPlaylistMethodTest.cxx index 482330c97..0e00226e2 100644 --- a/livesupport/src/products/scheduler/src/RevertEditedPlaylistMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/RevertEditedPlaylistMethodTest.cxx @@ -45,7 +45,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "SchedulerDaemon.h" @@ -58,7 +58,7 @@ using namespace std; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/SavePlaylistMethod.cxx b/livesupport/src/products/scheduler/src/SavePlaylistMethod.cxx index 3102f3b74..1f0aeaea7 100644 --- a/livesupport/src/products/scheduler/src/SavePlaylistMethod.cxx +++ b/livesupport/src/products/scheduler/src/SavePlaylistMethod.cxx @@ -42,8 +42,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" #include "SavePlaylistMethod.h" @@ -51,7 +51,7 @@ using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/SavePlaylistMethodTest.cxx b/livesupport/src/products/scheduler/src/SavePlaylistMethodTest.cxx index 749366eca..c86132eb8 100644 --- a/livesupport/src/products/scheduler/src/SavePlaylistMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/SavePlaylistMethodTest.cxx @@ -46,7 +46,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "OpenPlaylistForEditingMethod.h" @@ -56,7 +56,7 @@ using namespace std; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/SchedulerDaemon.cxx b/livesupport/src/products/scheduler/src/SchedulerDaemon.cxx index 19dc225e9..928cdc7c4 100644 --- a/livesupport/src/products/scheduler/src/SchedulerDaemon.cxx +++ b/livesupport/src/products/scheduler/src/SchedulerDaemon.cxx @@ -55,7 +55,7 @@ #include "LiveSupport/Db/ConnectionManagerFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerFactory.h" #include "ScheduleFactory.h" #include "PlayLogFactory.h" @@ -67,7 +67,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; /* =================================================== local data structures */ diff --git a/livesupport/src/products/scheduler/src/SchedulerDaemon.h b/livesupport/src/products/scheduler/src/SchedulerDaemon.h index ba2ace28b..3adffc732 100644 --- a/livesupport/src/products/scheduler/src/SchedulerDaemon.h +++ b/livesupport/src/products/scheduler/src/SchedulerDaemon.h @@ -62,7 +62,7 @@ #include "LiveSupport/Core/Configurable.h" #include "LiveSupport/Core/SessionId.h" #include "LiveSupport/Db/ConnectionManagerInterface.h" -#include "LiveSupport/Storage/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" #include "LiveSupport/Authentication/AuthenticationClientInterface.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h" #include "LiveSupport/EventScheduler/EventScheduler.h" @@ -100,7 +100,7 @@ using namespace LiveSupport; using namespace LiveSupport::Core; using namespace LiveSupport::Authentication; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::PlaylistExecutor; diff --git a/livesupport/src/products/scheduler/src/UpdateFadeInFadeOutMethod.cxx b/livesupport/src/products/scheduler/src/UpdateFadeInFadeOutMethod.cxx index 6dde0c825..d96bc5a14 100644 --- a/livesupport/src/products/scheduler/src/UpdateFadeInFadeOutMethod.cxx +++ b/livesupport/src/products/scheduler/src/UpdateFadeInFadeOutMethod.cxx @@ -42,8 +42,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Core/Playlist.h" #include "LiveSupport/Core/FadeInfo.h" #include "ScheduleInterface.h" @@ -58,7 +58,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/UpdateFadeInFadeOutMethodTest.cxx b/livesupport/src/products/scheduler/src/UpdateFadeInFadeOutMethodTest.cxx index 348240550..8b627d55b 100644 --- a/livesupport/src/products/scheduler/src/UpdateFadeInFadeOutMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/UpdateFadeInFadeOutMethodTest.cxx @@ -45,7 +45,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -58,7 +58,7 @@ using namespace std; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/UploadPlaylistMethod.cxx b/livesupport/src/products/scheduler/src/UploadPlaylistMethod.cxx index 889749e9d..976f48c0e 100644 --- a/livesupport/src/products/scheduler/src/UploadPlaylistMethod.cxx +++ b/livesupport/src/products/scheduler/src/UploadPlaylistMethod.cxx @@ -43,8 +43,8 @@ #include #include "LiveSupport/Core/XmlRpcTools.h" -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "ScheduleInterface.h" #include "ScheduleFactory.h" #include "SchedulerDaemon.h" @@ -57,7 +57,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/UploadPlaylistMethodTest.cxx b/livesupport/src/products/scheduler/src/UploadPlaylistMethodTest.cxx index c5156bc25..fe6991395 100644 --- a/livesupport/src/products/scheduler/src/UploadPlaylistMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/UploadPlaylistMethodTest.cxx @@ -46,7 +46,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "ScheduleFactory.h" @@ -54,7 +54,7 @@ #include "UploadPlaylistMethodTest.h" using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication; diff --git a/livesupport/src/products/scheduler/src/ValidatePlaylistMethod.cxx b/livesupport/src/products/scheduler/src/ValidatePlaylistMethod.cxx index 3b6c3c09a..7c856b24e 100644 --- a/livesupport/src/products/scheduler/src/ValidatePlaylistMethod.cxx +++ b/livesupport/src/products/scheduler/src/ValidatePlaylistMethod.cxx @@ -42,8 +42,8 @@ #include -#include "LiveSupport/Storage/StorageClientInterface.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientInterface.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "ScheduleInterface.h" #include "ScheduleFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -56,7 +56,7 @@ using namespace boost::posix_time; using namespace LiveSupport; using namespace LiveSupport::Core; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; diff --git a/livesupport/src/products/scheduler/src/ValidatePlaylistMethodTest.cxx b/livesupport/src/products/scheduler/src/ValidatePlaylistMethodTest.cxx index 56bfa3c3c..90dad733c 100644 --- a/livesupport/src/products/scheduler/src/ValidatePlaylistMethodTest.cxx +++ b/livesupport/src/products/scheduler/src/ValidatePlaylistMethodTest.cxx @@ -45,7 +45,7 @@ #include #include "LiveSupport/Db/ConnectionManagerFactory.h" -#include "LiveSupport/Storage/StorageClientFactory.h" +#include "LiveSupport/StorageClient/StorageClientFactory.h" #include "LiveSupport/Authentication/AuthenticationClientFactory.h" #include "LiveSupport/Core/XmlRpcTools.h" @@ -58,7 +58,7 @@ using namespace std; using namespace LiveSupport::Db; -using namespace LiveSupport::Storage; +using namespace LiveSupport::StorageClient; using namespace LiveSupport::Scheduler; using namespace LiveSupport::Authentication;