[config] Changed folder structure of previous SAttr implementation. (#…

…1749)
eclipse-ecal · Sep 30, 2024 · c2943a7 · c2943a7
1 parent 1e48373
commit c2943a7
Show file tree

Hide file tree

Showing 40 changed files with 41 additions and 41 deletions.
diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
@@ -425,7 +425,7 @@ endif()
 # common
 ######################################
 set(ecal_cmn_src
-    src/builder/monitoring_attribute_builder.cpp
+    src/config/builder/monitoring_attribute_builder.cpp
     src/ecal.cpp
     src/ecal_def.h
     src/ecal_def_ini.h
@@ -452,13 +452,13 @@ endif()
 # builder
 ######################################
 set (ecal_builder_src
-    src/builder/logging_attribute_builder.cpp
-    src/builder/monitoring_attribute_builder.cpp
-    src/builder/registration_attribute_builder.cpp
-    src/logging/builder/udp_attribute_builder.cpp
-    src/registration/builder/udp_shm_attribute_builder.cpp
-    src/registration/builder/sample_applier_attribute_builder.cpp
-    src/registration/udp/builder/udp_attribute_builder.cpp
+    src/config/builder/logging_attribute_builder.cpp
+    src/config/builder/monitoring_attribute_builder.cpp
+    src/config/builder/registration_attribute_builder.cpp
+    src/logging/config/builder/udp_attribute_builder.cpp
+    src/registration/config/builder/udp_shm_attribute_builder.cpp
+    src/registration/config/builder/sample_applier_attribute_builder.cpp
+    src/registration/udp/config/builder/udp_attribute_builder.cpp
 )
 
 

diff --git a/...src/builder/logging_attribute_builder.cpp → ...fig/builder/logging_attribute_builder.cpp b/...src/builder/logging_attribute_builder.cpp → ...fig/builder/logging_attribute_builder.cpp
diff --git a/...e/src/builder/logging_attribute_builder.h → ...onfig/builder/logging_attribute_builder.h b/...e/src/builder/logging_attribute_builder.h → ...onfig/builder/logging_attribute_builder.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "logging/attributes/logging_attributes.h"
+#include "logging/config/attributes/logging_attributes.h"
 #include "ecal/config/logging.h"
 #include "ecal/config/registration.h"
 #include "ecal/config/transport_layer.h"

diff --git a/.../builder/monitoring_attribute_builder.cpp → .../builder/monitoring_attribute_builder.cpp b/.../builder/monitoring_attribute_builder.cpp → .../builder/monitoring_attribute_builder.cpp
diff --git a/...rc/builder/monitoring_attribute_builder.h → ...ig/builder/monitoring_attribute_builder.h b/...rc/builder/monitoring_attribute_builder.h → ...ig/builder/monitoring_attribute_builder.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "monitoring/attributes/monitoring_attributes.h"
+#include "monitoring/config/attributes/monitoring_attributes.h"
 
 #include <ecal/config/monitoring.h>
 

diff --git a/...uilder/registration_attribute_builder.cpp → ...uilder/registration_attribute_builder.cpp b/...uilder/registration_attribute_builder.cpp → ...uilder/registration_attribute_builder.cpp
diff --git a/.../builder/registration_attribute_builder.h → .../builder/registration_attribute_builder.h b/.../builder/registration_attribute_builder.h → .../builder/registration_attribute_builder.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "registration/attributes/registration_attributes.h"
+#include "registration/config/attributes/registration_attributes.h"
 
 #include <ecal/ecal_config.h>
 

diff --git a/ecal/core/src/ecal_globals.cpp b/ecal/core/src/ecal_globals.cpp
@@ -33,9 +33,9 @@
 #include "service/ecal_service_singleton_manager.h"
 #endif
 
-#include "builder/registration_attribute_builder.h"
-#include "builder/monitoring_attribute_builder.h"
-#include "builder/logging_attribute_builder.h"
+#include "config/builder/registration_attribute_builder.h"
+#include "config/builder/monitoring_attribute_builder.h"
+#include "config/builder/logging_attribute_builder.h"
 
 namespace eCAL
 {

diff --git a/...c/logging/attributes/logging_attributes.h → ...ng/config/attributes/logging_attributes.h b/...c/logging/attributes/logging_attributes.h → ...ng/config/attributes/logging_attributes.h
diff --git a/...logging/builder/udp_attribute_builder.cpp → .../config/builder/udp_attribute_builder.cpp b/...logging/builder/udp_attribute_builder.cpp → .../config/builder/udp_attribute_builder.cpp
diff --git a/...c/logging/builder/udp_attribute_builder.h → ...ng/config/builder/udp_attribute_builder.h b/...c/logging/builder/udp_attribute_builder.h → ...ng/config/builder/udp_attribute_builder.h
@@ -23,7 +23,7 @@
 #include "io/udp/ecal_udp_receiver_attr.h"
 #include "io/udp/ecal_udp_sender_attr.h"
 
-#include "logging/attributes/logging_attributes.h"
+#include "logging/config/attributes/logging_attributes.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/logging/ecal_log_impl.cpp b/ecal/core/src/logging/ecal_log_impl.cpp
@@ -27,7 +27,7 @@
 
 #include "ecal_log_impl.h"
 #include "serialization/ecal_serialize_logging.h"
-#include "builder/udp_attribute_builder.h"
+#include "config/builder/udp_attribute_builder.h"
 #include <mutex>
 #include <cstdio>
 

diff --git a/ecal/core/src/logging/ecal_log_impl.h b/ecal/core/src/logging/ecal_log_impl.h
@@ -33,7 +33,7 @@
 #include <ecal/ecal_log_level.h>
 #include <ecal/types/logging.h>
 
-#include "attributes/logging_attributes.h"
+#include "config/attributes/logging_attributes.h"
 #include "ecal_global_accessors.h"
 
 #include <atomic>

diff --git a/...toring/attributes/monitoring_attributes.h → ...config/attributes/monitoring_attributes.h b/...toring/attributes/monitoring_attributes.h → ...config/attributes/monitoring_attributes.h
diff --git a/ecal/core/src/monitoring/ecal_monitoring_def.h b/ecal/core/src/monitoring/ecal_monitoring_def.h
@@ -25,7 +25,7 @@
 
 #include <ecal/types/monitoring.h>
 
-#include "attributes/monitoring_attributes.h"
+#include "config/attributes/monitoring_attributes.h"
 
 #include <memory>
 #include <string>

diff --git a/ecal/core/src/monitoring/ecal_monitoring_filter.h b/ecal/core/src/monitoring/ecal_monitoring_filter.h
@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 
-#include "monitoring/attributes/monitoring_attributes.h"
+#include "monitoring/config/attributes/monitoring_attributes.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/monitoring/ecal_monitoring_impl.h b/ecal/core/src/monitoring/ecal_monitoring_impl.h
@@ -26,7 +26,7 @@
 #include <ecal/types/monitoring.h>
 
 #include "ecal_def.h"
-#include "monitoring/attributes/monitoring_attributes.h"
+#include "monitoring/config/attributes/monitoring_attributes.h"
 #include "monitoring/ecal_monitoring_filter.h"
 
 #include "serialization/ecal_serialize_sample_registration.h"

diff --git a/...tion/attributes/registration_attributes.h → ...nfig/attributes/registration_attributes.h b/...tion/attributes/registration_attributes.h → ...nfig/attributes/registration_attributes.h
diff --git a/...on/attributes/sample_applier_attributes.h → ...ig/attributes/sample_applier_attributes.h b/...on/attributes/sample_applier_attributes.h → ...ig/attributes/sample_applier_attributes.h
diff --git a/...lder/sample_applier_attribute_builder.cpp → ...lder/sample_applier_attribute_builder.cpp b/...lder/sample_applier_attribute_builder.cpp → ...lder/sample_applier_attribute_builder.cpp
diff --git a/...uilder/sample_applier_attribute_builder.h → ...uilder/sample_applier_attribute_builder.h b/...uilder/sample_applier_attribute_builder.h → ...uilder/sample_applier_attribute_builder.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include "registration/attributes/registration_attributes.h"
-#include "registration/attributes/sample_applier_attributes.h"
+#include "registration/config/attributes/registration_attributes.h"
+#include "registration/config/attributes/sample_applier_attributes.h"
 
 namespace eCAL
 {

diff --git a/...ion/builder/udp_shm_attribute_builder.cpp → ...fig/builder/udp_shm_attribute_builder.cpp b/...ion/builder/udp_shm_attribute_builder.cpp → ...fig/builder/udp_shm_attribute_builder.cpp
diff --git a/...ation/builder/udp_shm_attribute_builder.h → ...onfig/builder/udp_shm_attribute_builder.h b/...ation/builder/udp_shm_attribute_builder.h → ...onfig/builder/udp_shm_attribute_builder.h
@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include "registration/udp/attributes/registration_sender_udp_attributes.h"
-#include "registration/udp/attributes/registration_receiver_udp_attributes.h"
-#include "registration/shm/attributes/registration_shm_attributes.h"
-#include "registration/attributes/registration_attributes.h"
+#include "registration/udp/config/attributes/registration_sender_udp_attributes.h"
+#include "registration/udp/config/attributes/registration_receiver_udp_attributes.h"
+#include "registration/shm/config/attributes/registration_shm_attributes.h"
+#include "registration/config/attributes/registration_attributes.h"
 
 
 namespace eCAL

diff --git a/ecal/core/src/registration/ecal_registration_provider.cpp b/ecal/core/src/registration/ecal_registration_provider.cpp
@@ -45,7 +45,7 @@
 #include <registration/shm/ecal_registration_sender_shm.h>
 #endif
 
-#include "builder/udp_shm_attribute_builder.h"
+#include "config/builder/udp_shm_attribute_builder.h"
 
 
 namespace eCAL

diff --git a/ecal/core/src/registration/ecal_registration_provider.h b/ecal/core/src/registration/ecal_registration_provider.h
@@ -31,7 +31,7 @@
 
 #include "registration/ecal_registration_sender.h"
 #include "util/ecal_thread.h"
-#include "attributes/registration_attributes.h"
+#include "config/attributes/registration_attributes.h"
 
 #include <atomic>
 #include <memory>

diff --git a/ecal/core/src/registration/ecal_registration_receiver.cpp b/ecal/core/src/registration/ecal_registration_receiver.cpp
@@ -42,8 +42,8 @@
 #include <mutex>
 #include <string>
 
-#include "builder/udp_shm_attribute_builder.h"
-#include "builder/sample_applier_attribute_builder.h"
+#include "config/builder/udp_shm_attribute_builder.h"
+#include "config/builder/sample_applier_attribute_builder.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/registration/ecal_registration_receiver.h b/ecal/core/src/registration/ecal_registration_receiver.h
@@ -34,7 +34,7 @@
 #include "registration/ecal_registration_sample_applier.h"
 #include "registration/ecal_registration_sample_applier_gates.h"
 #include "registration/ecal_registration_sample_applier_user.h"
-#include "attributes/registration_attributes.h"
+#include "config/attributes/registration_attributes.h"
 
 #include <atomic>
 #include <functional>

diff --git a/ecal/core/src/registration/ecal_registration_sample_applier.h b/ecal/core/src/registration/ecal_registration_sample_applier.h
@@ -29,7 +29,7 @@
 #include <ecal/ecal.h>
 
 #include "serialization/ecal_struct_sample_registration.h"
-#include "attributes/sample_applier_attributes.h"
+#include "config/attributes/sample_applier_attributes.h"
 
 #include <functional>
 #include <map>

diff --git a/.../attributes/registration_shm_attributes.h → .../attributes/registration_shm_attributes.h b/.../attributes/registration_shm_attributes.h → .../attributes/registration_shm_attributes.h
diff --git a/ecal/core/src/registration/shm/ecal_memfile_broadcast.h b/ecal/core/src/registration/shm/ecal_memfile_broadcast.h
@@ -32,7 +32,7 @@
 
 #include "relocatable_circular_queue.h"
 #include "io/shm/ecal_memfile.h"
-#include "attributes/registration_shm_attributes.h"
+#include "config/attributes/registration_shm_attributes.h"
 
 #include <ecal/ecal.h>
 

diff --git a/ecal/core/src/registration/shm/ecal_registration_receiver_shm.h b/ecal/core/src/registration/shm/ecal_registration_receiver_shm.h
@@ -29,7 +29,7 @@
 
 #include <memory>
 #include <registration/ecal_registration_types.h>
-#include "attributes/registration_shm_attributes.h"
+#include "config/attributes/registration_shm_attributes.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/registration/shm/ecal_registration_sender_shm.h b/ecal/core/src/registration/shm/ecal_registration_sender_shm.h
@@ -33,7 +33,7 @@
 #include "registration/shm/ecal_memfile_broadcast.h"
 #include "registration/shm/ecal_memfile_broadcast_writer.h"
 
-#include "attributes/registration_shm_attributes.h"
+#include "config/attributes/registration_shm_attributes.h"
 
 #include <vector>
 

diff --git a/...es/registration_receiver_udp_attributes.h → ...es/registration_receiver_udp_attributes.h b/...es/registration_receiver_udp_attributes.h → ...es/registration_receiver_udp_attributes.h
diff --git a/...utes/registration_sender_udp_attributes.h → ...utes/registration_sender_udp_attributes.h b/...utes/registration_sender_udp_attributes.h → ...utes/registration_sender_udp_attributes.h
diff --git a/...ion/udp/builder/udp_attribute_builder.cpp → .../config/builder/udp_attribute_builder.cpp b/...ion/udp/builder/udp_attribute_builder.cpp → .../config/builder/udp_attribute_builder.cpp
diff --git a/...ation/udp/builder/udp_attribute_builder.h → ...dp/config/builder/udp_attribute_builder.h b/...ation/udp/builder/udp_attribute_builder.h → ...dp/config/builder/udp_attribute_builder.h
@@ -23,8 +23,8 @@
 #include "io/udp/ecal_udp_receiver_attr.h"
 #include "io/udp/ecal_udp_sender_attr.h"
 
-#include "registration/udp/attributes/registration_sender_udp_attributes.h"
-#include "registration/udp/attributes/registration_receiver_udp_attributes.h"
+#include "registration/udp/config/attributes/registration_sender_udp_attributes.h"
+#include "registration/udp/config/attributes/registration_receiver_udp_attributes.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/registration/udp/ecal_registration_receiver_udp.cpp b/ecal/core/src/registration/udp/ecal_registration_receiver_udp.cpp
@@ -24,7 +24,7 @@
 #include "serialization/ecal_serialize_sample_registration.h"
 #include <ecal/ecal_config.h>
 
-#include "registration/udp/builder/udp_attribute_builder.h"
+#include "registration/udp/config/builder/udp_attribute_builder.h"
 
 using namespace eCAL;
 

diff --git a/ecal/core/src/registration/udp/ecal_registration_receiver_udp.h b/ecal/core/src/registration/udp/ecal_registration_receiver_udp.h
@@ -26,7 +26,7 @@
 
 #include <memory>
 #include <registration/ecal_registration_types.h>
-#include "registration/udp/attributes/registration_receiver_udp_attributes.h"
+#include "registration/udp/config/attributes/registration_receiver_udp_attributes.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/registration/udp/ecal_registration_sender_udp.cpp b/ecal/core/src/registration/udp/ecal_registration_sender_udp.cpp
@@ -32,7 +32,7 @@
 #include "io/udp/ecal_udp_configurations.h"
 #include <ecal/ecal_config.h>
 
-#include "registration/udp/builder/udp_attribute_builder.h"
+#include "registration/udp/config/builder/udp_attribute_builder.h"
 
 namespace eCAL
 {

diff --git a/ecal/core/src/registration/udp/ecal_registration_sender_udp.h b/ecal/core/src/registration/udp/ecal_registration_sender_udp.h
@@ -29,7 +29,7 @@
 #include "registration/ecal_registration_sender.h"
 
 #include "io/udp/ecal_udp_sample_sender.h"
-#include "registration/udp/attributes/registration_sender_udp_attributes.h"
+#include "registration/udp/config/attributes/registration_sender_udp_attributes.h"
 
 namespace eCAL
 {