Skip to content

Commit 16c85c9

Browse files
committed
Split permission related classes into separate files
Re ECFLOW-1960
1 parent 30587a8 commit 16c85c9

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
@@ -364,7 +364,6 @@ set(srcs
364364
node/src/ecflow/node/NodeStats.hpp
365365
node/src/ecflow/node/NodeTreeVisitor.hpp
366366
node/src/ecflow/node/Operations.hpp
367-
node/src/ecflow/node/Permissions.hpp
368367
node/src/ecflow/node/ResolveExternsVisitor.hpp
369368
node/src/ecflow/node/ServerState.hpp
370369
node/src/ecflow/node/Signal.hpp
@@ -411,6 +410,10 @@ set(srcs
411410
node/src/ecflow/node/parser/VariableParser.hpp
412411
node/src/ecflow/node/parser/VerifyParser.hpp
413412
node/src/ecflow/node/parser/ZombieAttrParser.hpp
413+
node/src/ecflow/node/permissions/ActivePermissions.hpp
414+
node/src/ecflow/node/permissions/Allowed.hpp
415+
node/src/ecflow/node/permissions/Permission.hpp
416+
node/src/ecflow/node/permissions/Permissions.hpp
414417
# Node -- Sources
415418
node/src/ecflow/node/Alias.cpp
416419
node/src/ecflow/node/Attr.cpp
@@ -449,7 +452,6 @@ set(srcs
449452
node/src/ecflow/node/NodeStats.cpp
450453
node/src/ecflow/node/NodeTime.cpp
451454
node/src/ecflow/node/NodeTreeVisitor.cpp
452-
node/src/ecflow/node/Permissions.cpp
453455
node/src/ecflow/node/ResolveExternsVisitor.cpp
454456
node/src/ecflow/node/ServerState.cpp
455457
node/src/ecflow/node/Signal.cpp
@@ -491,6 +493,10 @@ set(srcs
491493
node/src/ecflow/node/parser/VariableParser.cpp
492494
node/src/ecflow/node/parser/VerifyParser.cpp
493495
node/src/ecflow/node/parser/ZombieAttrParser.cpp
496+
node/src/ecflow/node/permissions/ActivePermissions.cpp
497+
node/src/ecflow/node/permissions/Allowed.cpp
498+
node/src/ecflow/node/permissions/Permission.cpp
499+
node/src/ecflow/node/permissions/Permissions.cpp
494500

495501
# Server -- Headers
496502
server/src/ecflow/server/AuthenticationService.hpp
@@ -565,36 +571,36 @@ set(srcs
565571

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

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

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

5252
namespace ecf {
5353
class Simulator;

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

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

0 commit comments

Comments
 (0)