Commit 9419e489 authored by Victor Kotlyar's avatar Victor Kotlyar
Browse files

Renamed castor::exception::InvalidConfigEntry to

cta::exception::InvalidConfigEntry
parent fe4fb905
......@@ -75,6 +75,7 @@ set (COMMON_LIB_SRC_FILES
exception/BadAlloc.cpp
exception/CommandLineNotParsed.cpp
exception/InvalidArgument.cpp
exception/InvalidConfigEntry.cpp
log/DummyLogger.cpp
log/LogContext.cpp
log/Logger.cpp
......
......@@ -21,7 +21,7 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include "castor/exception/InvalidConfigEntry.hpp"
#include "common/exception/InvalidConfigEntry.hpp"
#include <errno.h>
......@@ -29,7 +29,7 @@
// -----------------------------------------------------------------------------
// Constructor
// -----------------------------------------------------------------------------
castor::exception::InvalidConfigEntry::InvalidConfigEntry(
cta::exception::InvalidConfigEntry::InvalidConfigEntry(
const char *const entryCategory, const char *const entryName,
const char *const entryValue) :
cta::exception::Exception(), m_entryCategory(entryCategory),
......@@ -40,7 +40,7 @@ castor::exception::InvalidConfigEntry::InvalidConfigEntry(
// -----------------------------------------------------------------------------
// getEntryCategory()
// -----------------------------------------------------------------------------
const std::string &castor::exception::InvalidConfigEntry::getEntryCategory() {
const std::string &cta::exception::InvalidConfigEntry::getEntryCategory() {
return m_entryCategory;
}
......@@ -48,7 +48,7 @@ const std::string &castor::exception::InvalidConfigEntry::getEntryCategory() {
// -----------------------------------------------------------------------------
// getEntryName()
// -----------------------------------------------------------------------------
const std::string &castor::exception::InvalidConfigEntry::getEntryName() {
const std::string &cta::exception::InvalidConfigEntry::getEntryName() {
return m_entryName;
}
......@@ -56,7 +56,7 @@ const std::string &castor::exception::InvalidConfigEntry::getEntryName() {
// -----------------------------------------------------------------------------
// getEntryValue()
// -----------------------------------------------------------------------------
const std::string &castor::exception::InvalidConfigEntry::getEntryValue()
const std::string &cta::exception::InvalidConfigEntry::getEntryValue()
{
return m_entryValue;
}
......@@ -28,7 +28,7 @@
#include <string>
namespace castor { namespace exception {
namespace cta { namespace exception {
/**
* Invalid configuration entry exception.
......@@ -88,5 +88,5 @@ namespace castor { namespace exception {
}; // class InvalidConfigEntry
} } // namespace castor exception
} } // namespace cta exception
......@@ -154,7 +154,7 @@ namespace castor {
}
if (!castor::utils::isValidUInt(strValue.c_str())) {
castor::exception::InvalidConfigEntry ex(category.c_str(),
cta::exception::InvalidConfigEntry ex(category.c_str(),
key.c_str(), strValue.c_str());
ex.getMessage() << "Failed to get configuration entry " << category <<
":" << key << ": Value is not a valid unsigned integer: value=" <<
......@@ -196,7 +196,7 @@ namespace castor {
const std::string strValue = getConfEntString(category, key);
if (!castor::utils::isValidUInt(strValue.c_str())) {
castor::exception::InvalidConfigEntry ex(category.c_str(),
cta::exception::InvalidConfigEntry ex(category.c_str(),
key.c_str(), strValue.c_str());
ex.getMessage() << "Failed to get configuration entry " << category <<
":" << key << ": Value is not a valid unsigned integer: value=" <<
......
......@@ -24,7 +24,7 @@
#pragma once
#include "castor/common/CastorConfiguration.hpp"
#include "castor/exception/InvalidConfigEntry.hpp"
#include "common/exception/InvalidConfigEntry.hpp"
#include "castor/exception/NoEntry.hpp"
#include "castor/server/Daemon.hpp"
#include "castor/server/ProcessCap.hpp"
......
......@@ -33,7 +33,6 @@ set (UTILS_LIB_SRC_FILES
../exception/NoEntry.cpp
../exception/Errnum.cpp
../exception/NotAnOwner.cpp
../exception/InvalidConfigEntry.cpp
../exception/MissingOperand.cpp
../exception/NoPortInRange.cpp
../exception/TimeOut.cpp
......
......@@ -25,7 +25,7 @@
#pragma once
#include "common/exception/InvalidArgument.hpp"
#include "castor/exception/InvalidConfigEntry.hpp"
#include "common/exception/InvalidConfigEntry.hpp"
#include "castor/exception/InvalidConfiguration.hpp"
#include "common/exception/Exception.hpp"
......
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