Commit 91f0beed authored by Eric Cano's avatar Eric Cano
Browse files

Moved parts from scheduler directory out into common, in a move to reduce this too long directory.

Also organised common in subdirectories, and added sub directory for mockDB.
parent af157d49
......@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common/ByteArray.hpp"
#include "common/checksum/ByteArray.hpp"
#include <gtest/gtest.h>
......
......@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common/Checksum.hpp"
#include "common/checksum/Checksum.hpp"
#include <sstream>
......
......@@ -18,7 +18,7 @@
#pragma once
#include "common/ByteArray.hpp"
#include "common/checksum/ByteArray.hpp"
namespace cta {
......
......@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common/Checksum.hpp"
#include "common/checksum/Checksum.hpp"
#include <gtest/gtest.h>
......
......@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common/RemoteFileStatus.hpp"
#include "common/remoteFS/RemoteFileStatus.hpp"
//------------------------------------------------------------------------------
// constructor
......
......@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common/RemotePath.hpp"
#include "common/remoteFS/RemotePath.hpp"
#include "common/exception/Exception.hpp"
#include <sstream>
......
......@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common/RemotePathAndStatus.hpp"
#include "common/remoteFS/RemotePathAndStatus.hpp"
//------------------------------------------------------------------------------
// constructor
......
......@@ -18,8 +18,8 @@
#pragma once
#include "common/RemoteFileStatus.hpp"
#include "common/RemotePath.hpp"
#include "common/remoteFS/RemoteFileStatus.hpp"
#include "common/remoteFS/RemotePath.hpp"
namespace cta {
......
......@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common/RemotePath.hpp"
#include "common/remoteFS/RemotePath.hpp"
#include <gtest/gtest.h>
#include <sys/types.h>
......
......@@ -3,7 +3,8 @@ cmake_minimum_required (VERSION 2.6)
include_directories(/usr/include/shift)
add_library (ctanameserver SHARED
MockNameServer.cpp
mockNS/MockNameServer.cpp
mockNS/SmartFd.cpp
CastorNameServer.cpp
NameServer.cpp)
......@@ -14,8 +15,9 @@ add_executable(castornstest CastorNameServerTest.cpp)
target_link_libraries(castornstest ctanameserver ctacommon ctascheduler)
add_library (ctanameservertest SHARED
MockNameServerFactory.cpp
MockNameServerTest.cpp
mockNS/MockNameServerFactory.cpp
mockNS/MockNameServerTest.cpp
mockNS/SmartFdTest.cpp
NameServerFactory.cpp)
target_link_libraries(ctanameservertest
......
......@@ -29,7 +29,6 @@
#include "common/exception/Exception.hpp"
#include "common/exception/Serrnum.hpp"
#include "common/SmartFd.hpp"
#include "common/Utils.hpp"
#include "nameserver/CastorNameServer.hpp"
......
......@@ -18,7 +18,7 @@
#pragma once
#include "common/ArchiveDirIterator.hpp"
#include "common/archiveNS/ArchiveDirIterator.hpp"
#include "common/UserIdentity.hpp"
#include "nameserver/NameServer.hpp"
#include "scheduler/SecurityIdentity.hpp"
......
......@@ -18,8 +18,8 @@
#pragma once
#include "common/ArchiveDirIterator.hpp"
#include "common/ArchiveFileStatus.hpp"
#include "common/archiveNS/ArchiveDirIterator.hpp"
#include "common/archiveNS/ArchiveFileStatus.hpp"
#include "scheduler/SecurityIdentity.hpp"
#include <memory>
......
......@@ -29,9 +29,9 @@
#include "common/exception/Exception.hpp"
#include "common/exception/Errnum.hpp"
#include "common/SmartFd.hpp"
#include "nameserver/mockNS/SmartFd.hpp"
#include "common/Utils.hpp"
#include "nameserver/MockNameServer.hpp"
#include "nameserver/mockNS/MockNameServer.hpp"
//------------------------------------------------------------------------------
// assertFsDirExists
......
......@@ -18,7 +18,7 @@
#pragma once
#include "common/ArchiveDirIterator.hpp"
#include "common/archiveNS/ArchiveDirIterator.hpp"
#include "common/UserIdentity.hpp"
#include "nameserver/NameServer.hpp"
#include "scheduler/SecurityIdentity.hpp"
......
......@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "nameserver/MockNameServer.hpp"
#include "nameserver/MockNameServerFactory.hpp"
#include "nameserver/mockNS/MockNameServer.hpp"
#include "nameserver/mockNS/MockNameServerFactory.hpp"
//------------------------------------------------------------------------------
// destructor
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment