diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index d49c2f73315f6869f2d88edd3916d81b70976249..4e94819a076c3d372c070bd949265544af0c9a8a 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -68,7 +68,6 @@ set (COMMON_LIB_SRC_FILES dataStructures/VerifyInfo.cpp dataStructures/WriteTestResult.cpp dataStructures/utils.cpp - archiveRoutes/ArchiveRoute.cpp checksum/Checksum.cpp exception/AcceptConnectionInterrupted.cpp exception/AcsQueryVolumeCmd.cpp diff --git a/common/archiveRoutes/ArchiveRoute.cpp b/common/archiveRoutes/ArchiveRoute.cpp deleted file mode 100644 index cfb3f57899c96d658afd605cc5c219440abf5517..0000000000000000000000000000000000000000 --- a/common/archiveRoutes/ArchiveRoute.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * The CERN Tape Archive (CTA) project - * Copyright (C) 2015 CERN - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "common/archiveRoutes/ArchiveRoute.hpp" - -//------------------------------------------------------------------------------ -// constructor -//------------------------------------------------------------------------------ -cta::common::archiveRoute::ArchiveRoute::ArchiveRoute(): - copyNb(0) { -} - -//------------------------------------------------------------------------------ -// destructor -//------------------------------------------------------------------------------ -cta::common::archiveRoute::ArchiveRoute::~ArchiveRoute() throw() { -} - -//------------------------------------------------------------------------------ -// constructor -//------------------------------------------------------------------------------ -cta::common::archiveRoute::ArchiveRoute::ArchiveRoute( - const std::string &storageClassName, - const uint16_t copyNb, - const std::string &tapePoolName, - const CreationLog &creationLog): - storageClassName(storageClassName), - copyNb(copyNb), - tapePoolName(tapePoolName), - creationLog(creationLog) { -} diff --git a/common/archiveRoutes/ArchiveRoute.hpp b/common/archiveRoutes/ArchiveRoute.hpp deleted file mode 100644 index 737c2a3791c6f33c38d7d8fa25dc31b7ba8cefe3..0000000000000000000000000000000000000000 --- a/common/archiveRoutes/ArchiveRoute.hpp +++ /dev/null @@ -1,83 +0,0 @@ -/* - * The CERN Tape Archive (CTA) project - * Copyright (C) 2015 CERN - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "common/UserIdentity.hpp" -#include "common/CreationLog.hpp" - -#include <stdint.h> -#include <string> -#include <time.h> - -namespace cta { namespace common { namespace archiveRoute { - -/** - * An archive route. - */ -struct ArchiveRoute { - - /** - * Constructor. - */ - ArchiveRoute(); - - /** - * Destructor. - */ - ~ArchiveRoute() throw(); - - /** - * Constructor. - * - * @param storageClassName The name of the storage class that identifies the - * source disk files. - * @param copyNb The tape copy number. Copy numbers start from 1. - * @param tapePoolName The name of the destination tape pool. - * @param creationLog The who, where, when an why of this modification. - * time is used. - */ - ArchiveRoute( - const std::string &storageClassName, - const uint16_t copyNb, - const std::string &tapePoolName, - const CreationLog &creationLog); - - /** - * The name of the storage class that identifies the source disk files. - */ - std::string storageClassName; - - /** - * The tape copy number. - */ - uint32_t copyNb; - - /** - * The name of the destination tape pool. - */ - std::string tapePoolName; - - /** - * The record of the entry's creation - */ - CreationLog creationLog; - -}; // class ArchiveRoute - -}}} // namespace cta::common::archiveRoute \ No newline at end of file diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp index 3c36de78ecbbfb979e9e6ea558f7aee7f068b0fa..d825dae4ac580e7ac4688b2b2e546703be226eef 100644 --- a/scheduler/OStoreDB/OStoreDB.cpp +++ b/scheduler/OStoreDB/OStoreDB.cpp @@ -25,7 +25,6 @@ //#include "objectstore/RetrieveRequest.hpp" #include "objectstore/Helpers.hpp" #include "common/exception/Exception.hpp" -#include "common/archiveRoutes/ArchiveRoute.hpp" #include "common/utils/utils.hpp" #include "scheduler/LogicalLibrary.hpp" #include "common/dataStructures/MountPolicy.hpp" diff --git a/scheduler/SchedulerDatabase.hpp b/scheduler/SchedulerDatabase.hpp index 5b03fdc36f566ded4b26ac00b30470e8fa857837..5bbc23ee71cbc0d0e0c753e3b1803c25e78dc7f4 100644 --- a/scheduler/SchedulerDatabase.hpp +++ b/scheduler/SchedulerDatabase.hpp @@ -18,7 +18,6 @@ #pragma once -#include "common/archiveRoutes/ArchiveRoute.hpp" #include "common/dataStructures/RetrieveFileQueueCriteria.hpp" #include "common/dataStructures/DriveState.hpp" #include "common/MountControl.hpp" @@ -49,11 +48,6 @@ namespace cta { // Forward declarations for opaque references. -namespace common { -namespace archiveRoute { - class ArchiveRoute; -} // cta::common::archiveRoute -} // cta::common class ArchiveRequest; class LogicalLibrary; class RetrieveRequestDump; diff --git a/scheduler/SchedulerDatabaseTest.cpp b/scheduler/SchedulerDatabaseTest.cpp index 74908b9945fc62db2f62de465524774a1a7a089c..2f4671fba538d5a95d1d39ea828cff7ce5252089 100644 --- a/scheduler/SchedulerDatabaseTest.cpp +++ b/scheduler/SchedulerDatabaseTest.cpp @@ -19,7 +19,6 @@ #include "objectstore/BackendRadosTestSwitch.hpp" #include "tests/TestsCompileTimeSwitches.hpp" #include "common/UserIdentity.hpp" -#include "common/archiveRoutes/ArchiveRoute.hpp" #include "scheduler/SchedulerDatabase.hpp" #include "scheduler/SchedulerDatabaseFactory.hpp" #include "common/dataStructures/SecurityIdentity.hpp" diff --git a/scheduler/SchedulerTest.cpp b/scheduler/SchedulerTest.cpp index a5b7a339744149e29446fe4dd89796bbaf448dd0..978f6e098fb9f69cbacb237c64682e2ff8948979 100644 --- a/scheduler/SchedulerTest.cpp +++ b/scheduler/SchedulerTest.cpp @@ -18,7 +18,6 @@ #include "catalogue/InMemoryCatalogue.hpp" #include "catalogue/SchemaCreatingSqliteCatalogue.hpp" -#include "common/archiveRoutes/ArchiveRoute.hpp" #include "common/log/DummyLogger.hpp" #include "common/make_unique.hpp" #include "scheduler/ArchiveMount.hpp"