Skip to content

Commit 448df76

Browse files
committed
Split permission related classes into separate files
Re ECFLOW-1960
1 parent c5b4386 commit 448df76

File tree

14 files changed

+569
-356
lines changed

14 files changed

+569
-356
lines changed

libs/CMakeLists.txt

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ set(srcs
363363
node/src/ecflow/node/NodeStats.hpp
364364
node/src/ecflow/node/NodeTreeVisitor.hpp
365365
node/src/ecflow/node/Operations.hpp
366-
node/src/ecflow/node/Permissions.hpp
367366
node/src/ecflow/node/ResolveExternsVisitor.hpp
368367
node/src/ecflow/node/ServerState.hpp
369368
node/src/ecflow/node/Signal.hpp
@@ -409,6 +408,10 @@ set(srcs
409408
node/src/ecflow/node/parser/VariableParser.hpp
410409
node/src/ecflow/node/parser/VerifyParser.hpp
411410
node/src/ecflow/node/parser/ZombieAttrParser.hpp
411+
node/src/ecflow/node/permissions/ActivePermissions.hpp
412+
node/src/ecflow/node/permissions/Allowed.hpp
413+
node/src/ecflow/node/permissions/Permission.hpp
414+
node/src/ecflow/node/permissions/Permissions.hpp
412415
# Node -- Sources
413416
node/src/ecflow/node/Alias.cpp
414417
node/src/ecflow/node/Attr.cpp
@@ -447,7 +450,6 @@ set(srcs
447450
node/src/ecflow/node/NodeStats.cpp
448451
node/src/ecflow/node/NodeTime.cpp
449452
node/src/ecflow/node/NodeTreeVisitor.cpp
450-
node/src/ecflow/node/Permissions.cpp
451453
node/src/ecflow/node/ResolveExternsVisitor.cpp
452454
node/src/ecflow/node/ServerState.cpp
453455
node/src/ecflow/node/Signal.cpp
@@ -488,6 +490,10 @@ set(srcs
488490
node/src/ecflow/node/parser/VariableParser.cpp
489491
node/src/ecflow/node/parser/VerifyParser.cpp
490492
node/src/ecflow/node/parser/ZombieAttrParser.cpp
493+
node/src/ecflow/node/permissions/ActivePermissions.cpp
494+
node/src/ecflow/node/permissions/Allowed.cpp
495+
node/src/ecflow/node/permissions/Permission.cpp
496+
node/src/ecflow/node/permissions/Permissions.cpp
491497

492498
# Server -- Headers
493499
server/src/ecflow/server/AuthenticationService.hpp
@@ -562,36 +568,36 @@ set(srcs
562568

563569
ecbuild_add_library(
564570
TARGET
565-
ecflow_all
571+
ecflow_all
566572
NOINSTALL
567573
TYPE STATIC
568574
SOURCES
569-
${srcs}
575+
${srcs}
570576
PUBLIC_INCLUDES
571-
attribute/src
572-
base/src
573-
client/src
574-
core/src
575-
node/src
576-
service/src
577-
server/src
578-
udp/src
579-
${CMAKE_BINARY_DIR}/generated/src
577+
attribute/src
578+
base/src
579+
client/src
580+
core/src
581+
node/src
582+
service/src
583+
server/src
584+
udp/src
585+
${CMAKE_BINARY_DIR}/generated/src
580586
PUBLIC_LIBS
581-
nlohmann::json
582-
cereal::cereal # this needs to be public as it appears in public header files used downstream
583-
httplib::httplib
584-
$<$<VERSION_LESS:${Boost_VERSION},1.69.0>:Boost::system>
585-
Boost::filesystem
586-
Boost::date_time
587-
Boost::program_options
588-
$<$<BOOL:${OPENSSL_FOUND}>:OpenSSL::SSL>
589-
$<$<BOOL:${Crypt_FOUND}>:crypt::crypt>
590-
Threads::Threads
591-
$<$<BOOL:${ZLIB_FOUND}>:ZLIB::ZLIB>
587+
nlohmann::json
588+
cereal::cereal # this needs to be public as it appears in public header files used downstream
589+
httplib::httplib
590+
$<$<VERSION_LESS:${Boost_VERSION},1.69.0>:Boost::system>
591+
Boost::filesystem
592+
Boost::date_time
593+
Boost::program_options
594+
$<$<BOOL:${OPENSSL_FOUND}>:OpenSSL::SSL>
595+
$<$<BOOL:${Crypt_FOUND}>:crypt::crypt>
596+
Threads::Threads
597+
$<$<BOOL:${ZLIB_FOUND}>:ZLIB::ZLIB>
592598
PUBLIC_DEFINITIONS
593-
CMAKE
594-
$<$<BOOL:${ZLIB_FOUND}>:ECF_HTTP_COMPRESSION>
599+
CMAKE
600+
$<$<BOOL:${ZLIB_FOUND}>:ECF_HTTP_COMPRESSION>
595601
)
596602
target_clangformat(ecflow_all)
597603

libs/node/src/ecflow/node/Node.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#include "ecflow/node/InLimitMgr.hpp"
4949
#include "ecflow/node/MirrorAttr.hpp"
5050
#include "ecflow/node/NodeFwd.hpp"
51-
#include "ecflow/node/Permissions.hpp"
51+
#include "ecflow/node/permissions/Permissions.hpp"
5252

5353
namespace ecf {
5454
class Simulator;

libs/node/src/ecflow/node/Permissions.cpp

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)