Commit 414772e9 authored by Steven Murray's avatar Steven Murray
Browse files

Removed the redundant libs directory by bringing the middletier sub-directory up

parent d200b7ae
......@@ -29,9 +29,7 @@ set(CMAKE_DISABLE_SOURCE_CHANGES ON)
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
include_directories(${CMAKE_SOURCE_DIR})
add_subdirectory(libs)
add_subdirectory(middletier)
add_subdirectory(objectstore)
add_subdirectory(objectstore_middletier)
add_subdirectory(tests)
......
cmake_minimum_required (VERSION 2.6)
add_subdirectory(middletier)
cmake_minimum_required (VERSION 2.6)
find_package (sqlite REQUIRED)
include_directories (${SQLITE3_INCLUDE_DIR} ${CMAKE_SOURCE_DIR})
include_directories (${SQLITE3_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
set (MIDDLE_TIER_LIB_SRC_FILES
AdminHost.cpp
AdminUser.cpp
ArchivalJob.cpp
ArchivalJobState.cpp
ArchiveRoute.cpp
ArchiveRouteId.cpp
DirectoryEntry.cpp
DirectoryIterator.cpp
Exception.cpp
FileAttribute.cpp
FileSystemDirectoryEntry.cpp
FileSystemNode.cpp
FileSystemStorageClass.cpp
FileSystemStorageClasses.cpp
LogicalLibrary.cpp
MiddleTierAdmin.cpp
MiddleTierUser.cpp
RetrievalJob.cpp
RetrievalJobState.cpp
SecurityIdentity.cpp
SqliteDatabase.cpp
SqliteMiddleTierAdmin.cpp
SqliteMiddleTierUser.cpp
StorageClass.cpp
Tape.cpp
TapePool.cpp
UserIdentity.cpp
Utils.cpp
Vfs.cpp)
cta/AdminHost.cpp
cta/AdminUser.cpp
cta/ArchivalJob.cpp
cta/ArchivalJobState.cpp
cta/ArchiveRoute.cpp
cta/ArchiveRouteId.cpp
cta/DirectoryEntry.cpp
cta/DirectoryIterator.cpp
cta/Exception.cpp
cta/FileAttribute.cpp
cta/FileSystemDirectoryEntry.cpp
cta/FileSystemNode.cpp
cta/FileSystemStorageClass.cpp
cta/FileSystemStorageClasses.cpp
cta/LogicalLibrary.cpp
cta/MiddleTierAdmin.cpp
cta/MiddleTierUser.cpp
cta/RetrievalJob.cpp
cta/RetrievalJobState.cpp
cta/SecurityIdentity.cpp
cta/SqliteDatabase.cpp
cta/SqliteMiddleTierAdmin.cpp
cta/SqliteMiddleTierUser.cpp
cta/StorageClass.cpp
cta/Tape.cpp
cta/TapePool.cpp
cta/UserIdentity.cpp
cta/Utils.cpp
cta/Vfs.cpp)
add_library (ctamiddletier SHARED
${MIDDLE_TIER_LIB_SRC_FILES})
......@@ -40,10 +40,10 @@ add_library (ctamiddletier SHARED
target_link_libraries (ctamiddletier ${SQLITE3_LIBRARY_RELEASE})
set (MIDDLE_TIER_UNIT_TESTS_LIB_SRC_FILES
SqliteMiddleTierAdminTest.cpp
SqliteMiddleTierUserTest.cpp
UtilsTest.cpp
VfsTest.cpp)
cta/SqliteMiddleTierAdminTest.cpp
cta/SqliteMiddleTierUserTest.cpp
cta/UtilsTest.cpp
cta/VfsTest.cpp)
add_library (ctamiddletierunittests SHARED
${MIDDLE_TIER_UNIT_TESTS_LIB_SRC_FILES})
......
#include "AdminHost.hpp"
#include "cta/AdminHost.hpp"
//------------------------------------------------------------------------------
// constructor
......
#pragma once
#include "UserIdentity.hpp"
#include "cta/UserIdentity.hpp"
#include <string>
......
#include "AdminUser.hpp"
#include "cta/AdminUser.hpp"
//------------------------------------------------------------------------------
// constructor
......
#pragma once
#include "UserIdentity.hpp"
#include "cta/UserIdentity.hpp"
#include <string>
......
#include "ArchivalJob.hpp"
#include "cta/ArchivalJob.hpp"
//------------------------------------------------------------------------------
// constructor
......
#pragma once
#include "ArchivalJobState.hpp"
#include "UserIdentity.hpp"
#include "cta/ArchivalJobState.hpp"
#include "cta/UserIdentity.hpp"
#include <string>
#include <time.h>
......
#include "ArchivalJob.hpp"
#include "cta/ArchivalJob.hpp"
//------------------------------------------------------------------------------
// toStr
......
#include "ArchiveRoute.hpp"
#include "cta/ArchiveRoute.hpp"
//------------------------------------------------------------------------------
// constructor
......
#pragma once
#include "UserIdentity.hpp"
#include "cta/UserIdentity.hpp"
#include <stdint.h>
#include <string>
......
#include "ArchiveRouteId.hpp"
#include "cta/ArchiveRouteId.hpp"
//------------------------------------------------------------------------------
// constructor
......
#include "DirectoryEntry.hpp"
#include "cta/DirectoryEntry.hpp"
//------------------------------------------------------------------------------
// entryTypeToStr
......
#include "DirectoryIterator.hpp"
#include "Exception.hpp"
#include "cta/DirectoryIterator.hpp"
#include "cta/Exception.hpp"
//------------------------------------------------------------------------------
// constructor
......
#pragma once
#include "DirectoryEntry.hpp"
#include "cta/DirectoryEntry.hpp"
#include <list>
......
#include "Exception.hpp"
#include "cta/Exception.hpp"
//------------------------------------------------------------------------------
// constructor
......
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