Commit 094d0844 authored by Steven Murray's avatar Steven Murray
Browse files

Moved UserError to common to be shared by Catalogue and Scheduler

parent 144780e7
......@@ -31,8 +31,7 @@ set (CATALOGUE_LIB_SRC_FILES
OracleCatalogue.cpp
RdbmsCatalogue.cpp
SqliteCatalogue.cpp
TapeForWriting.cpp
UserError.cpp)
TapeForWriting.cpp)
add_library (ctacatalogue SHARED
${CATALOGUE_LIB_SRC_FILES})
......
......@@ -19,8 +19,8 @@
#include "catalogue/ArchiveFileRow.hpp"
#include "catalogue/CatalogueFactory.hpp"
#include "catalogue/CatalogueTest.hpp"
#include "catalogue/UserError.hpp"
#include "common/exception/Exception.hpp"
#include "common/exception/UserError.hpp"
#include <gtest/gtest.h>
#include <limits>
......
......@@ -20,7 +20,6 @@
#include "catalogue/ArchiveFileRow.hpp"
#include "catalogue/CatalogueFactory.hpp"
#include "catalogue/UserError.hpp"
#include "common/exception/Exception.hpp"
#include "rdbms/DbLoginFactory.hpp"
......
......@@ -16,12 +16,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "rdbms/OcciConn.hpp"
#include "rdbms/OcciEnvSingleton.hpp"
#include "catalogue/OracleCatalogue.hpp"
#include "catalogue/UserError.hpp"
#include "common/exception/UserError.hpp"
#include "common/exception/Exception.hpp"
#include "common/utils/utils.hpp"
#include "rdbms/OcciConn.hpp"
#include "rdbms/OcciEnvSingleton.hpp"
namespace cta {
namespace catalogue {
......
......@@ -17,13 +17,13 @@
*/
#include "catalogue/ArchiveFileRow.hpp"
#include "rdbms/AutoRollback.hpp"
#include "catalogue/RdbmsCatalogue.hpp"
#include "catalogue/RdbmsCatalogueSchema.hpp"
#include "catalogue/UserError.hpp"
#include "common/dataStructures/TapeFile.hpp"
#include "common/exception/Exception.hpp"
#include "common/exception/UserError.hpp"
#include "common/utils/utils.hpp"
#include "rdbms/AutoRollback.hpp"
#include <ctype.h>
#include <iostream>
......
......@@ -16,13 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "rdbms/AutoRollback.hpp"
#include "catalogue/RdbmsCatalogueSchema.hpp"
#include "catalogue/SqliteCatalogue.hpp"
#include "rdbms/SqliteConn.hpp"
#include "catalogue/UserError.hpp"
#include "common/exception/UserError.hpp"
#include "common/exception/Exception.hpp"
#include "common/utils/utils.hpp"
#include "rdbms/AutoRollback.hpp"
namespace cta {
namespace catalogue {
......
......@@ -75,6 +75,7 @@ set (COMMON_LIB_SRC_FILES
exception/Backtrace.cpp
exception/Errnum.cpp
exception/Exception.cpp
exception/UserError.cpp
log/DummyLogger.cpp
log/LogContext.cpp
log/Logger.cpp
......
......@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "catalogue/UserError.hpp"
#include "common/exception/UserError.hpp"
namespace cta {
namespace catalogue {
......
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