You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ad...@apache.org on 2025/08/11 14:24:06 UTC
(nifi-minifi-cpp) 21/37: Rename
This is an automated email from the ASF dual-hosted git repository.
adebreceni pushed a commit to branch minifi-api-reduced
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit c4cd764c12ad7ffdc43222eb52ffd0a4435247cc
Author: Adam Debreceni <ad...@apache.org>
AuthorDate: Mon Jun 23 14:34:34 2025 +0200
Rename
---
CMakeLists.txt | 4 ++--
core-framework/CMakeLists.txt | 22 ++++++++++++++++++++++
{utils => core-framework}/include/Exception.h | 0
{utils => core-framework}/include/SwapManager.h | 0
.../include/agent/agent_docs.h | 0
.../include/agent/agent_version.h | 0
.../include/core/Annotation.h | 0
.../include/core/BufferedContentSession.h | 0
.../include/core/ClassLoader.h | 0
{utils => core-framework}/include/core/ClassName.h | 0
.../include/core/ConfigurableComponentImpl.h | 0
.../include/core/Connectable.h | 0
.../include/core/ContentRepository.h | 0
.../include/core/ContentSession.h | 0
{utils => core-framework}/include/core/Core.h | 0
.../include/core/ObjectFactory.h | 0
.../include/core/OutputAttributeDefinition.h | 0
.../include/core/ProcessContext.h | 0
.../include/core/ProcessContextBuilder.h | 0
.../include/core/ProcessorFactory.h | 0
.../include/core/ProcessorImpl.h | 0
.../include/core/ProcessorMetrics.h | 0
{utils => core-framework}/include/core/Property.h | 0
.../include/core/PropertyDefinition.h | 0
.../include/core/PropertyDefinitionBuilder.h | 0
.../include/core/Relationship.h | 0
.../include/core/RelationshipDefinition.h | 0
.../include/core/Repository.h | 0
.../include/core/RepositoryMetricsSource.h | 0
{utils => core-framework}/include/core/Resource.h | 0
.../include/core/StreamManager.h | 0
.../include/core/ThreadedRepository.h | 0
.../include/core/TypedValues.h | 0
.../include/core/VariableRegistry.h | 0
.../include/core/controller/ControllerService.h | 0
{utils => core-framework}/include/core/expect.h | 0
.../include/core/extension/Extension.h | 0
.../include/core/logging/Logger.h | 0
.../include/core/logging/LoggerFactory.h | 0
.../include/core/state/MetricsPublisher.h | 0
.../include/core/state/PublishedMetricProvider.h | 0
.../include/core/state/Value.h | 0
.../include/core/state/nodes/ResponseNode.h | 0
.../include/http/BaseHTTPClient.h | 0
.../include/http/HTTPCallback.h | 0
.../include/http/HTTPClient.h | 0
.../include/http/HTTPStream.h | 0
.../include/io/ArchiveStream.h | 0
{utils => core-framework}/include/io/AsioStream.h | 0
{utils => core-framework}/include/io/BaseStream.h | 0
.../include/io/BufferStream.h | 0
{utils => core-framework}/include/io/CRCStream.h | 0
{utils => core-framework}/include/io/FileStream.h | 0
{utils => core-framework}/include/io/InputStream.h | 0
.../include/io/OutputStream.h | 0
{utils => core-framework}/include/io/Stream.h | 0
{utils => core-framework}/include/io/StreamPipe.h | 0
{utils => core-framework}/include/io/StreamSlice.h | 0
{utils => core-framework}/include/io/ZlibStream.h | 0
{utils => core-framework}/include/io/validation.h | 0
.../include/utils/ArrayUtils.h | 0
.../include/utils/AttributeErrors.h | 0
.../include/utils/AutoPersistor.h | 0
.../include/utils/BackTrace.h | 0
.../include/utils/ByteArrayCallback.h | 0
.../include/utils/CallBackTimer.h | 0
.../include/utils/ClassUtils.h | 0
.../include/utils/CollectionUtils.h | 0
.../include/utils/ConfigurationUtils.h | 0
{utils => core-framework}/include/utils/Cron.h | 0
{utils => core-framework}/include/utils/Deleters.h | 0
{utils => core-framework}/include/utils/Enum.h | 0
.../include/utils/Environment.h | 0
{utils => core-framework}/include/utils/Error.h | 0
{utils => core-framework}/include/utils/Export.h | 0
.../include/utils/FailurePolicy.h | 0
.../include/utils/FifoExecutor.h | 0
.../include/utils/FileMutex.h | 0
.../include/utils/GeneralUtils.h | 0
.../include/utils/HTTPUtils.h | 0
{utils => core-framework}/include/utils/Hash.h | 0
{utils => core-framework}/include/utils/Id.h | 0
.../include/utils/IntervalSwitch.h | 0
.../include/utils/JsonCallback.h | 0
.../utils/LineByLineInputOutputStreamCallback.h | 0
{utils => core-framework}/include/utils/Literals.h | 0
{utils => core-framework}/include/utils/LogUtils.h | 0
{utils => core-framework}/include/utils/Macro.h | 0
{utils => core-framework}/include/utils/MapUtils.h | 0
.../include/utils/MinifiConcurrentQueue.h | 0
{utils => core-framework}/include/utils/Monitors.h | 0
.../include/utils/OptionalUtils.h | 0
{utils => core-framework}/include/utils/OsUtils.h | 0
.../include/utils/ParsingErrors.h | 0
.../include/utils/ParsingUtils.h | 0
.../include/utils/ProcessCpuUsageTracker.h | 0
.../include/utils/PropertyErrors.h | 0
.../include/utils/PropertyExceptions.h | 0
.../include/utils/RegexUtils.h | 0
{utils => core-framework}/include/utils/Searcher.h | 0
.../include/utils/SmallString.h | 0
.../include/utils/StoppableThread.h | 0
.../include/utils/StringUtils.h | 0
.../include/utils/SystemCpuUsageTracker.h | 0
.../include/utils/ThreadPool.h | 0
{utils => core-framework}/include/utils/TimeUtil.h | 0
.../include/utils/TryMoveCall.h | 0
.../include/utils/UnicodeConversion.h | 0
.../include/utils/ValueCaster.h | 0
.../include/utils/ValueParser.h | 0
.../include/utils/crypto/EncryptionManager.h | 0
.../include/utils/crypto/EncryptionProvider.h | 0
.../include/utils/crypto/EncryptionUtils.h | 0
.../include/utils/crypto/ciphers/Aes256Ecb.h | 0
.../include/utils/crypto/ciphers/XSalsa20.h | 0
.../property_encryption/PropertyEncryptionUtils.h | 0
.../utils/detail/MonadicOperationWrappers.h | 0
{utils => core-framework}/include/utils/expected.h | 0
.../include/utils/file/FilePattern.h | 0
.../include/utils/file/FileUtils.h | 0
.../include/utils/file/PathUtils.h | 0
{utils => core-framework}/include/utils/gsl.h | 0
.../include/utils/meta/detected.h | 0
.../include/utils/meta/type_list.h | 0
.../include/utils/net/AsioCoro.h | 0
.../include/utils/net/AsioSocketUtils.h | 0
{utils => core-framework}/include/utils/net/DNS.h | 0
.../include/utils/net/NetworkInterfaceInfo.h | 0
.../include/utils/net/Socket.h | 0
.../include/utils/requirements/Container.h | 0
.../utils/requirements/EqualityComparable.h | 0
.../utils/requirements/LegacyForwardIterator.h | 0
.../utils/requirements/LegacyInputIterator.h | 0
.../include/utils/requirements/LegacyIterator.h | 0
.../include/utils/requirements/Swappable.h | 0
{utils => core-framework}/include/utils/span.h | 0
.../src/core/BufferedContentSession.cpp | 0
.../src/core/ConfigurableComponentImpl.cpp | 0
{utils => core-framework}/src/core/Connectable.cpp | 0
.../src/core/ContentRepository.cpp | 0
.../src/core/ContentSession.cpp | 0
{utils => core-framework}/src/core/Core.cpp | 0
.../src/core/ProcessContextBuilder.cpp | 0
.../src/core/ProcessSession.cpp | 0
.../src/core/ProcessorImpl.cpp | 0
.../src/core/ProcessorMetrics.cpp | 0
{utils => core-framework}/src/core/Property.cpp | 0
{utils => core-framework}/src/core/Repository.cpp | 0
{utils => core-framework}/src/core/TypedValues.cpp | 0
.../src/core/extension/Extension.cpp | 0
.../src/http/BaseHTTPClient.cpp | 0
{utils => core-framework}/src/http/HTTPClient.cpp | 0
{utils => core-framework}/src/http/HTTPStream.cpp | 0
{utils => core-framework}/src/io/BufferStream.cpp | 0
{utils => core-framework}/src/io/CPPLINT.cfg | 0
{utils => core-framework}/src/io/CRCStream.cpp | 0
{utils => core-framework}/src/io/FileStream.cpp | 0
{utils => core-framework}/src/io/InputStream.cpp | 0
{utils => core-framework}/src/io/OutputStream.cpp | 0
{utils => core-framework}/src/io/StreamSlice.cpp | 0
{utils => core-framework}/src/io/ZlibStream.cpp | 0
.../src/utils/AutoPersistor.cpp | 0
{utils => core-framework}/src/utils/BackTrace.cpp | 0
.../src/utils/ByteArrayCallback.cpp | 0
{utils => core-framework}/src/utils/ClassUtils.cpp | 0
.../src/utils/ConfigurationUtils.cpp | 0
{utils => core-framework}/src/utils/Cron.cpp | 0
.../src/utils/Environment.cpp | 0
{utils => core-framework}/src/utils/Error.cpp | 0
.../src/utils/FifoExecutor.cpp | 0
{utils => core-framework}/src/utils/FileMutex.cpp | 0
{utils => core-framework}/src/utils/HTTPUtils.cpp | 0
{utils => core-framework}/src/utils/Id.cpp | 0
.../utils/LineByLineInputOutputStreamCallback.cpp | 0
{utils => core-framework}/src/utils/OsUtils.cpp | 0
.../src/utils/ParsingUtils.cpp | 0
.../src/utils/ProcessCpuUsageTracker.cpp | 0
{utils => core-framework}/src/utils/RegexUtils.cpp | 0
.../src/utils/StoppableThread.cpp | 0
.../src/utils/StringUtils.cpp | 0
.../src/utils/SystemCpuUsageTracker.cpp | 0
{utils => core-framework}/src/utils/ThreadPool.cpp | 0
{utils => core-framework}/src/utils/TimeUtil.cpp | 0
.../src/utils/crypto/EncryptionManager.cpp | 0
.../src/utils/crypto/EncryptionProvider.cpp | 0
.../src/utils/crypto/EncryptionUtils.cpp | 0
.../src/utils/crypto/ciphers/Aes256Ecb.cpp | 0
.../PropertyEncryptionUtils.cpp | 0
.../src/utils/file/FilePattern.cpp | 0
.../src/utils/file/FileUtils.cpp | 0
.../src/utils/file/PathUtils.cpp | 0
.../src/utils/net/AsioSocketUtils.cpp | 0
{utils => core-framework}/src/utils/net/DNS.cpp | 0
.../src/utils/net/NetworkInterfaceInfo.cpp | 0
{utils => core-framework}/src/utils/net/Socket.cpp | 0
.../CMakeLists.txt | 16 ++++++++--------
.../include/FlowFileRecord.h | 0
.../include/ResourceClaim.h | 0
.../include/controllers/AttributeProviderService.h | 0
.../include/controllers/RecordSetReader.h | 0
.../include/controllers/RecordSetWriter.h | 0
.../include/controllers/SSLContextService.h | 0
.../controllers/SSLContextServiceInterface.h | 0
.../controllers/keyvalue/KeyValueStateManager.h | 0
.../controllers/keyvalue/KeyValueStateStorage.h | 0
.../include/core/AbstractProcessor.h | 0
.../include/core/FlowFile.h | 0
.../include/core/FlowFileStore.h | 0
.../include/core/ProcessSession.h | 0
.../include/core/StateManager.h | 0
.../include/core/StateStorage.h | 0
.../include/properties/Configure.h | 0
.../include/properties/Properties.h | 0
.../include/serialization/FlowFileSerializer.h | 0
.../include/serialization/FlowFileV3Serializer.h | 0
.../include/serialization/PayloadSerializer.h | 0
.../include/utils/ListingStateManager.h | 0
.../include/utils/OpenTelemetryLogDataModelUtils.h | 0
.../include/utils/ProcessorConfigUtils.h | 0
.../include/utils/ResourceQueue.h | 0
.../include/utils/file/FileManager.h | 0
.../include/utils/file/FileReaderCallback.h | 0
.../include/utils/file/FileWriterCallback.h | 0
.../include/utils/file/ListedFile.h | 0
.../include/utils/net/ConnectionHandler.h | 0
.../include/utils/net/ConnectionHandlerBase.h | 0
.../include/utils/net/IpProtocol.h | 0
.../include/utils/net/Message.h | 0
.../include/utils/net/Server.h | 0
.../include/utils/net/Ssl.h | 0
.../include/utils/net/TcpServer.h | 0
.../include/utils/net/UdpServer.h | 0
.../controllers/keyvalue/KeyValueStateManager.cpp | 0
.../controllers/keyvalue/KeyValueStateStorage.cpp | 0
.../src/core/ProcessContext.cpp | 0
.../src/serialization/FlowFileV3Serializer.cpp | 0
.../src/serialization/PayloadSerializer.cpp | 0
.../src/utils/CallBackTimer.cpp | 0
.../src/utils/ListingStateManager.cpp | 0
.../src/utils/file/FileReaderCallback.cpp | 0
.../src/utils/file/FileWriterCallback.cpp | 0
.../src/utils/net/Ssl.cpp | 0
.../src/utils/net/TcpServer.cpp | 0
.../src/utils/net/UdpServer.cpp | 0
.../include/controllers/SSLContextService.h | 0
extensions/rocksdb-repos/CMakeLists.txt | 2 +-
libminifi/CMakeLists.txt | 4 ++--
libminifi/test/libtest/unit/CMakeLists.txt | 2 +-
utils/CMakeLists.txt | 22 ----------------------
249 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9f94363e..7748ac0e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,8 +339,8 @@ SET(TEST_DIR ${CMAKE_SOURCE_DIR}/libminifi/test)
include(Extensions)
add_subdirectory(minifi-api)
-add_subdirectory(utils)
-add_subdirectory(extension-utils)
+add_subdirectory(core-framework)
+add_subdirectory(extension-framework)
add_subdirectory(libminifi)
if (ENABLE_ALL OR ENABLE_AZURE)
diff --git a/core-framework/CMakeLists.txt b/core-framework/CMakeLists.txt
new file mode 100644
index 000000000..cf3203f24
--- /dev/null
+++ b/core-framework/CMakeLists.txt
@@ -0,0 +1,22 @@
+file(GLOB SOURCES
+ src/*.cpp
+ src/core/*.cpp
+ src/core/extension/*.cpp
+ src/io/*.cpp
+ src/http/*.cpp
+ src/utils/*.cpp
+ src/utils/crypto/*.cpp
+ src/utils/crypto/ciphers/*.cpp
+ src/utils/crypto/property_encryption/*.cpp
+ src/utils/net/*.cpp
+ src/utils/file/*.cpp)
+
+add_minifi_library(minifi-core-framework STATIC ${SOURCES})
+target_include_directories(minifi-core-framework PUBLIC include)
+target_link_libraries(minifi-core-framework PUBLIC minifi-api ZLIB::ZLIB concurrentqueue RapidJSON spdlog Threads::Threads gsl-lite libsodium range-v3 expected-lite date::date date::tz asio magic_enum OpenSSL::Crypto OpenSSL::SSL CURL::libcurl RapidJSON)
+if(NOT WIN32)
+ target_link_libraries(minifi-core-framework PUBLIC OSSP::libuuid++)
+endif()
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
+ target_link_libraries(minifi-core-framework PUBLIC stdc++fs)
+endif()
diff --git a/utils/include/Exception.h b/core-framework/include/Exception.h
similarity index 100%
rename from utils/include/Exception.h
rename to core-framework/include/Exception.h
diff --git a/utils/include/SwapManager.h b/core-framework/include/SwapManager.h
similarity index 100%
rename from utils/include/SwapManager.h
rename to core-framework/include/SwapManager.h
diff --git a/utils/include/agent/agent_docs.h b/core-framework/include/agent/agent_docs.h
similarity index 100%
rename from utils/include/agent/agent_docs.h
rename to core-framework/include/agent/agent_docs.h
diff --git a/utils/include/agent/agent_version.h b/core-framework/include/agent/agent_version.h
similarity index 100%
rename from utils/include/agent/agent_version.h
rename to core-framework/include/agent/agent_version.h
diff --git a/utils/include/core/Annotation.h b/core-framework/include/core/Annotation.h
similarity index 100%
rename from utils/include/core/Annotation.h
rename to core-framework/include/core/Annotation.h
diff --git a/utils/include/core/BufferedContentSession.h b/core-framework/include/core/BufferedContentSession.h
similarity index 100%
rename from utils/include/core/BufferedContentSession.h
rename to core-framework/include/core/BufferedContentSession.h
diff --git a/utils/include/core/ClassLoader.h b/core-framework/include/core/ClassLoader.h
similarity index 100%
rename from utils/include/core/ClassLoader.h
rename to core-framework/include/core/ClassLoader.h
diff --git a/utils/include/core/ClassName.h b/core-framework/include/core/ClassName.h
similarity index 100%
rename from utils/include/core/ClassName.h
rename to core-framework/include/core/ClassName.h
diff --git a/utils/include/core/ConfigurableComponentImpl.h b/core-framework/include/core/ConfigurableComponentImpl.h
similarity index 100%
rename from utils/include/core/ConfigurableComponentImpl.h
rename to core-framework/include/core/ConfigurableComponentImpl.h
diff --git a/utils/include/core/Connectable.h b/core-framework/include/core/Connectable.h
similarity index 100%
rename from utils/include/core/Connectable.h
rename to core-framework/include/core/Connectable.h
diff --git a/utils/include/core/ContentRepository.h b/core-framework/include/core/ContentRepository.h
similarity index 100%
rename from utils/include/core/ContentRepository.h
rename to core-framework/include/core/ContentRepository.h
diff --git a/utils/include/core/ContentSession.h b/core-framework/include/core/ContentSession.h
similarity index 100%
rename from utils/include/core/ContentSession.h
rename to core-framework/include/core/ContentSession.h
diff --git a/utils/include/core/Core.h b/core-framework/include/core/Core.h
similarity index 100%
rename from utils/include/core/Core.h
rename to core-framework/include/core/Core.h
diff --git a/utils/include/core/ObjectFactory.h b/core-framework/include/core/ObjectFactory.h
similarity index 100%
rename from utils/include/core/ObjectFactory.h
rename to core-framework/include/core/ObjectFactory.h
diff --git a/utils/include/core/OutputAttributeDefinition.h b/core-framework/include/core/OutputAttributeDefinition.h
similarity index 100%
rename from utils/include/core/OutputAttributeDefinition.h
rename to core-framework/include/core/OutputAttributeDefinition.h
diff --git a/utils/include/core/ProcessContext.h b/core-framework/include/core/ProcessContext.h
similarity index 100%
rename from utils/include/core/ProcessContext.h
rename to core-framework/include/core/ProcessContext.h
diff --git a/utils/include/core/ProcessContextBuilder.h b/core-framework/include/core/ProcessContextBuilder.h
similarity index 100%
rename from utils/include/core/ProcessContextBuilder.h
rename to core-framework/include/core/ProcessContextBuilder.h
diff --git a/utils/include/core/ProcessorFactory.h b/core-framework/include/core/ProcessorFactory.h
similarity index 100%
rename from utils/include/core/ProcessorFactory.h
rename to core-framework/include/core/ProcessorFactory.h
diff --git a/utils/include/core/ProcessorImpl.h b/core-framework/include/core/ProcessorImpl.h
similarity index 100%
rename from utils/include/core/ProcessorImpl.h
rename to core-framework/include/core/ProcessorImpl.h
diff --git a/utils/include/core/ProcessorMetrics.h b/core-framework/include/core/ProcessorMetrics.h
similarity index 100%
rename from utils/include/core/ProcessorMetrics.h
rename to core-framework/include/core/ProcessorMetrics.h
diff --git a/utils/include/core/Property.h b/core-framework/include/core/Property.h
similarity index 100%
rename from utils/include/core/Property.h
rename to core-framework/include/core/Property.h
diff --git a/utils/include/core/PropertyDefinition.h b/core-framework/include/core/PropertyDefinition.h
similarity index 100%
rename from utils/include/core/PropertyDefinition.h
rename to core-framework/include/core/PropertyDefinition.h
diff --git a/utils/include/core/PropertyDefinitionBuilder.h b/core-framework/include/core/PropertyDefinitionBuilder.h
similarity index 100%
rename from utils/include/core/PropertyDefinitionBuilder.h
rename to core-framework/include/core/PropertyDefinitionBuilder.h
diff --git a/utils/include/core/Relationship.h b/core-framework/include/core/Relationship.h
similarity index 100%
rename from utils/include/core/Relationship.h
rename to core-framework/include/core/Relationship.h
diff --git a/utils/include/core/RelationshipDefinition.h b/core-framework/include/core/RelationshipDefinition.h
similarity index 100%
rename from utils/include/core/RelationshipDefinition.h
rename to core-framework/include/core/RelationshipDefinition.h
diff --git a/utils/include/core/Repository.h b/core-framework/include/core/Repository.h
similarity index 100%
rename from utils/include/core/Repository.h
rename to core-framework/include/core/Repository.h
diff --git a/utils/include/core/RepositoryMetricsSource.h b/core-framework/include/core/RepositoryMetricsSource.h
similarity index 100%
rename from utils/include/core/RepositoryMetricsSource.h
rename to core-framework/include/core/RepositoryMetricsSource.h
diff --git a/utils/include/core/Resource.h b/core-framework/include/core/Resource.h
similarity index 100%
rename from utils/include/core/Resource.h
rename to core-framework/include/core/Resource.h
diff --git a/utils/include/core/StreamManager.h b/core-framework/include/core/StreamManager.h
similarity index 100%
rename from utils/include/core/StreamManager.h
rename to core-framework/include/core/StreamManager.h
diff --git a/utils/include/core/ThreadedRepository.h b/core-framework/include/core/ThreadedRepository.h
similarity index 100%
rename from utils/include/core/ThreadedRepository.h
rename to core-framework/include/core/ThreadedRepository.h
diff --git a/utils/include/core/TypedValues.h b/core-framework/include/core/TypedValues.h
similarity index 100%
rename from utils/include/core/TypedValues.h
rename to core-framework/include/core/TypedValues.h
diff --git a/utils/include/core/VariableRegistry.h b/core-framework/include/core/VariableRegistry.h
similarity index 100%
rename from utils/include/core/VariableRegistry.h
rename to core-framework/include/core/VariableRegistry.h
diff --git a/utils/include/core/controller/ControllerService.h b/core-framework/include/core/controller/ControllerService.h
similarity index 100%
rename from utils/include/core/controller/ControllerService.h
rename to core-framework/include/core/controller/ControllerService.h
diff --git a/utils/include/core/expect.h b/core-framework/include/core/expect.h
similarity index 100%
rename from utils/include/core/expect.h
rename to core-framework/include/core/expect.h
diff --git a/utils/include/core/extension/Extension.h b/core-framework/include/core/extension/Extension.h
similarity index 100%
rename from utils/include/core/extension/Extension.h
rename to core-framework/include/core/extension/Extension.h
diff --git a/utils/include/core/logging/Logger.h b/core-framework/include/core/logging/Logger.h
similarity index 100%
rename from utils/include/core/logging/Logger.h
rename to core-framework/include/core/logging/Logger.h
diff --git a/utils/include/core/logging/LoggerFactory.h b/core-framework/include/core/logging/LoggerFactory.h
similarity index 100%
rename from utils/include/core/logging/LoggerFactory.h
rename to core-framework/include/core/logging/LoggerFactory.h
diff --git a/utils/include/core/state/MetricsPublisher.h b/core-framework/include/core/state/MetricsPublisher.h
similarity index 100%
rename from utils/include/core/state/MetricsPublisher.h
rename to core-framework/include/core/state/MetricsPublisher.h
diff --git a/utils/include/core/state/PublishedMetricProvider.h b/core-framework/include/core/state/PublishedMetricProvider.h
similarity index 100%
rename from utils/include/core/state/PublishedMetricProvider.h
rename to core-framework/include/core/state/PublishedMetricProvider.h
diff --git a/utils/include/core/state/Value.h b/core-framework/include/core/state/Value.h
similarity index 100%
rename from utils/include/core/state/Value.h
rename to core-framework/include/core/state/Value.h
diff --git a/utils/include/core/state/nodes/ResponseNode.h b/core-framework/include/core/state/nodes/ResponseNode.h
similarity index 100%
rename from utils/include/core/state/nodes/ResponseNode.h
rename to core-framework/include/core/state/nodes/ResponseNode.h
diff --git a/utils/include/http/BaseHTTPClient.h b/core-framework/include/http/BaseHTTPClient.h
similarity index 100%
rename from utils/include/http/BaseHTTPClient.h
rename to core-framework/include/http/BaseHTTPClient.h
diff --git a/utils/include/http/HTTPCallback.h b/core-framework/include/http/HTTPCallback.h
similarity index 100%
rename from utils/include/http/HTTPCallback.h
rename to core-framework/include/http/HTTPCallback.h
diff --git a/utils/include/http/HTTPClient.h b/core-framework/include/http/HTTPClient.h
similarity index 100%
rename from utils/include/http/HTTPClient.h
rename to core-framework/include/http/HTTPClient.h
diff --git a/utils/include/http/HTTPStream.h b/core-framework/include/http/HTTPStream.h
similarity index 100%
rename from utils/include/http/HTTPStream.h
rename to core-framework/include/http/HTTPStream.h
diff --git a/utils/include/io/ArchiveStream.h b/core-framework/include/io/ArchiveStream.h
similarity index 100%
rename from utils/include/io/ArchiveStream.h
rename to core-framework/include/io/ArchiveStream.h
diff --git a/utils/include/io/AsioStream.h b/core-framework/include/io/AsioStream.h
similarity index 100%
rename from utils/include/io/AsioStream.h
rename to core-framework/include/io/AsioStream.h
diff --git a/utils/include/io/BaseStream.h b/core-framework/include/io/BaseStream.h
similarity index 100%
rename from utils/include/io/BaseStream.h
rename to core-framework/include/io/BaseStream.h
diff --git a/utils/include/io/BufferStream.h b/core-framework/include/io/BufferStream.h
similarity index 100%
rename from utils/include/io/BufferStream.h
rename to core-framework/include/io/BufferStream.h
diff --git a/utils/include/io/CRCStream.h b/core-framework/include/io/CRCStream.h
similarity index 100%
rename from utils/include/io/CRCStream.h
rename to core-framework/include/io/CRCStream.h
diff --git a/utils/include/io/FileStream.h b/core-framework/include/io/FileStream.h
similarity index 100%
rename from utils/include/io/FileStream.h
rename to core-framework/include/io/FileStream.h
diff --git a/utils/include/io/InputStream.h b/core-framework/include/io/InputStream.h
similarity index 100%
rename from utils/include/io/InputStream.h
rename to core-framework/include/io/InputStream.h
diff --git a/utils/include/io/OutputStream.h b/core-framework/include/io/OutputStream.h
similarity index 100%
rename from utils/include/io/OutputStream.h
rename to core-framework/include/io/OutputStream.h
diff --git a/utils/include/io/Stream.h b/core-framework/include/io/Stream.h
similarity index 100%
rename from utils/include/io/Stream.h
rename to core-framework/include/io/Stream.h
diff --git a/utils/include/io/StreamPipe.h b/core-framework/include/io/StreamPipe.h
similarity index 100%
rename from utils/include/io/StreamPipe.h
rename to core-framework/include/io/StreamPipe.h
diff --git a/utils/include/io/StreamSlice.h b/core-framework/include/io/StreamSlice.h
similarity index 100%
rename from utils/include/io/StreamSlice.h
rename to core-framework/include/io/StreamSlice.h
diff --git a/utils/include/io/ZlibStream.h b/core-framework/include/io/ZlibStream.h
similarity index 100%
rename from utils/include/io/ZlibStream.h
rename to core-framework/include/io/ZlibStream.h
diff --git a/utils/include/io/validation.h b/core-framework/include/io/validation.h
similarity index 100%
rename from utils/include/io/validation.h
rename to core-framework/include/io/validation.h
diff --git a/utils/include/utils/ArrayUtils.h b/core-framework/include/utils/ArrayUtils.h
similarity index 100%
rename from utils/include/utils/ArrayUtils.h
rename to core-framework/include/utils/ArrayUtils.h
diff --git a/utils/include/utils/AttributeErrors.h b/core-framework/include/utils/AttributeErrors.h
similarity index 100%
rename from utils/include/utils/AttributeErrors.h
rename to core-framework/include/utils/AttributeErrors.h
diff --git a/utils/include/utils/AutoPersistor.h b/core-framework/include/utils/AutoPersistor.h
similarity index 100%
rename from utils/include/utils/AutoPersistor.h
rename to core-framework/include/utils/AutoPersistor.h
diff --git a/utils/include/utils/BackTrace.h b/core-framework/include/utils/BackTrace.h
similarity index 100%
rename from utils/include/utils/BackTrace.h
rename to core-framework/include/utils/BackTrace.h
diff --git a/utils/include/utils/ByteArrayCallback.h b/core-framework/include/utils/ByteArrayCallback.h
similarity index 100%
rename from utils/include/utils/ByteArrayCallback.h
rename to core-framework/include/utils/ByteArrayCallback.h
diff --git a/utils/include/utils/CallBackTimer.h b/core-framework/include/utils/CallBackTimer.h
similarity index 100%
rename from utils/include/utils/CallBackTimer.h
rename to core-framework/include/utils/CallBackTimer.h
diff --git a/utils/include/utils/ClassUtils.h b/core-framework/include/utils/ClassUtils.h
similarity index 100%
rename from utils/include/utils/ClassUtils.h
rename to core-framework/include/utils/ClassUtils.h
diff --git a/utils/include/utils/CollectionUtils.h b/core-framework/include/utils/CollectionUtils.h
similarity index 100%
rename from utils/include/utils/CollectionUtils.h
rename to core-framework/include/utils/CollectionUtils.h
diff --git a/utils/include/utils/ConfigurationUtils.h b/core-framework/include/utils/ConfigurationUtils.h
similarity index 100%
rename from utils/include/utils/ConfigurationUtils.h
rename to core-framework/include/utils/ConfigurationUtils.h
diff --git a/utils/include/utils/Cron.h b/core-framework/include/utils/Cron.h
similarity index 100%
rename from utils/include/utils/Cron.h
rename to core-framework/include/utils/Cron.h
diff --git a/utils/include/utils/Deleters.h b/core-framework/include/utils/Deleters.h
similarity index 100%
rename from utils/include/utils/Deleters.h
rename to core-framework/include/utils/Deleters.h
diff --git a/utils/include/utils/Enum.h b/core-framework/include/utils/Enum.h
similarity index 100%
rename from utils/include/utils/Enum.h
rename to core-framework/include/utils/Enum.h
diff --git a/utils/include/utils/Environment.h b/core-framework/include/utils/Environment.h
similarity index 100%
rename from utils/include/utils/Environment.h
rename to core-framework/include/utils/Environment.h
diff --git a/utils/include/utils/Error.h b/core-framework/include/utils/Error.h
similarity index 100%
rename from utils/include/utils/Error.h
rename to core-framework/include/utils/Error.h
diff --git a/utils/include/utils/Export.h b/core-framework/include/utils/Export.h
similarity index 100%
rename from utils/include/utils/Export.h
rename to core-framework/include/utils/Export.h
diff --git a/utils/include/utils/FailurePolicy.h b/core-framework/include/utils/FailurePolicy.h
similarity index 100%
rename from utils/include/utils/FailurePolicy.h
rename to core-framework/include/utils/FailurePolicy.h
diff --git a/utils/include/utils/FifoExecutor.h b/core-framework/include/utils/FifoExecutor.h
similarity index 100%
rename from utils/include/utils/FifoExecutor.h
rename to core-framework/include/utils/FifoExecutor.h
diff --git a/utils/include/utils/FileMutex.h b/core-framework/include/utils/FileMutex.h
similarity index 100%
rename from utils/include/utils/FileMutex.h
rename to core-framework/include/utils/FileMutex.h
diff --git a/utils/include/utils/GeneralUtils.h b/core-framework/include/utils/GeneralUtils.h
similarity index 100%
rename from utils/include/utils/GeneralUtils.h
rename to core-framework/include/utils/GeneralUtils.h
diff --git a/utils/include/utils/HTTPUtils.h b/core-framework/include/utils/HTTPUtils.h
similarity index 100%
rename from utils/include/utils/HTTPUtils.h
rename to core-framework/include/utils/HTTPUtils.h
diff --git a/utils/include/utils/Hash.h b/core-framework/include/utils/Hash.h
similarity index 100%
rename from utils/include/utils/Hash.h
rename to core-framework/include/utils/Hash.h
diff --git a/utils/include/utils/Id.h b/core-framework/include/utils/Id.h
similarity index 100%
rename from utils/include/utils/Id.h
rename to core-framework/include/utils/Id.h
diff --git a/utils/include/utils/IntervalSwitch.h b/core-framework/include/utils/IntervalSwitch.h
similarity index 100%
rename from utils/include/utils/IntervalSwitch.h
rename to core-framework/include/utils/IntervalSwitch.h
diff --git a/utils/include/utils/JsonCallback.h b/core-framework/include/utils/JsonCallback.h
similarity index 100%
rename from utils/include/utils/JsonCallback.h
rename to core-framework/include/utils/JsonCallback.h
diff --git a/utils/include/utils/LineByLineInputOutputStreamCallback.h b/core-framework/include/utils/LineByLineInputOutputStreamCallback.h
similarity index 100%
rename from utils/include/utils/LineByLineInputOutputStreamCallback.h
rename to core-framework/include/utils/LineByLineInputOutputStreamCallback.h
diff --git a/utils/include/utils/Literals.h b/core-framework/include/utils/Literals.h
similarity index 100%
rename from utils/include/utils/Literals.h
rename to core-framework/include/utils/Literals.h
diff --git a/utils/include/utils/LogUtils.h b/core-framework/include/utils/LogUtils.h
similarity index 100%
rename from utils/include/utils/LogUtils.h
rename to core-framework/include/utils/LogUtils.h
diff --git a/utils/include/utils/Macro.h b/core-framework/include/utils/Macro.h
similarity index 100%
rename from utils/include/utils/Macro.h
rename to core-framework/include/utils/Macro.h
diff --git a/utils/include/utils/MapUtils.h b/core-framework/include/utils/MapUtils.h
similarity index 100%
rename from utils/include/utils/MapUtils.h
rename to core-framework/include/utils/MapUtils.h
diff --git a/utils/include/utils/MinifiConcurrentQueue.h b/core-framework/include/utils/MinifiConcurrentQueue.h
similarity index 100%
rename from utils/include/utils/MinifiConcurrentQueue.h
rename to core-framework/include/utils/MinifiConcurrentQueue.h
diff --git a/utils/include/utils/Monitors.h b/core-framework/include/utils/Monitors.h
similarity index 100%
rename from utils/include/utils/Monitors.h
rename to core-framework/include/utils/Monitors.h
diff --git a/utils/include/utils/OptionalUtils.h b/core-framework/include/utils/OptionalUtils.h
similarity index 100%
rename from utils/include/utils/OptionalUtils.h
rename to core-framework/include/utils/OptionalUtils.h
diff --git a/utils/include/utils/OsUtils.h b/core-framework/include/utils/OsUtils.h
similarity index 100%
rename from utils/include/utils/OsUtils.h
rename to core-framework/include/utils/OsUtils.h
diff --git a/utils/include/utils/ParsingErrors.h b/core-framework/include/utils/ParsingErrors.h
similarity index 100%
rename from utils/include/utils/ParsingErrors.h
rename to core-framework/include/utils/ParsingErrors.h
diff --git a/utils/include/utils/ParsingUtils.h b/core-framework/include/utils/ParsingUtils.h
similarity index 100%
rename from utils/include/utils/ParsingUtils.h
rename to core-framework/include/utils/ParsingUtils.h
diff --git a/utils/include/utils/ProcessCpuUsageTracker.h b/core-framework/include/utils/ProcessCpuUsageTracker.h
similarity index 100%
rename from utils/include/utils/ProcessCpuUsageTracker.h
rename to core-framework/include/utils/ProcessCpuUsageTracker.h
diff --git a/utils/include/utils/PropertyErrors.h b/core-framework/include/utils/PropertyErrors.h
similarity index 100%
rename from utils/include/utils/PropertyErrors.h
rename to core-framework/include/utils/PropertyErrors.h
diff --git a/utils/include/utils/PropertyExceptions.h b/core-framework/include/utils/PropertyExceptions.h
similarity index 100%
rename from utils/include/utils/PropertyExceptions.h
rename to core-framework/include/utils/PropertyExceptions.h
diff --git a/utils/include/utils/RegexUtils.h b/core-framework/include/utils/RegexUtils.h
similarity index 100%
rename from utils/include/utils/RegexUtils.h
rename to core-framework/include/utils/RegexUtils.h
diff --git a/utils/include/utils/Searcher.h b/core-framework/include/utils/Searcher.h
similarity index 100%
rename from utils/include/utils/Searcher.h
rename to core-framework/include/utils/Searcher.h
diff --git a/utils/include/utils/SmallString.h b/core-framework/include/utils/SmallString.h
similarity index 100%
rename from utils/include/utils/SmallString.h
rename to core-framework/include/utils/SmallString.h
diff --git a/utils/include/utils/StoppableThread.h b/core-framework/include/utils/StoppableThread.h
similarity index 100%
rename from utils/include/utils/StoppableThread.h
rename to core-framework/include/utils/StoppableThread.h
diff --git a/utils/include/utils/StringUtils.h b/core-framework/include/utils/StringUtils.h
similarity index 100%
rename from utils/include/utils/StringUtils.h
rename to core-framework/include/utils/StringUtils.h
diff --git a/utils/include/utils/SystemCpuUsageTracker.h b/core-framework/include/utils/SystemCpuUsageTracker.h
similarity index 100%
rename from utils/include/utils/SystemCpuUsageTracker.h
rename to core-framework/include/utils/SystemCpuUsageTracker.h
diff --git a/utils/include/utils/ThreadPool.h b/core-framework/include/utils/ThreadPool.h
similarity index 100%
rename from utils/include/utils/ThreadPool.h
rename to core-framework/include/utils/ThreadPool.h
diff --git a/utils/include/utils/TimeUtil.h b/core-framework/include/utils/TimeUtil.h
similarity index 100%
rename from utils/include/utils/TimeUtil.h
rename to core-framework/include/utils/TimeUtil.h
diff --git a/utils/include/utils/TryMoveCall.h b/core-framework/include/utils/TryMoveCall.h
similarity index 100%
rename from utils/include/utils/TryMoveCall.h
rename to core-framework/include/utils/TryMoveCall.h
diff --git a/utils/include/utils/UnicodeConversion.h b/core-framework/include/utils/UnicodeConversion.h
similarity index 100%
rename from utils/include/utils/UnicodeConversion.h
rename to core-framework/include/utils/UnicodeConversion.h
diff --git a/utils/include/utils/ValueCaster.h b/core-framework/include/utils/ValueCaster.h
similarity index 100%
rename from utils/include/utils/ValueCaster.h
rename to core-framework/include/utils/ValueCaster.h
diff --git a/utils/include/utils/ValueParser.h b/core-framework/include/utils/ValueParser.h
similarity index 100%
rename from utils/include/utils/ValueParser.h
rename to core-framework/include/utils/ValueParser.h
diff --git a/utils/include/utils/crypto/EncryptionManager.h b/core-framework/include/utils/crypto/EncryptionManager.h
similarity index 100%
rename from utils/include/utils/crypto/EncryptionManager.h
rename to core-framework/include/utils/crypto/EncryptionManager.h
diff --git a/utils/include/utils/crypto/EncryptionProvider.h b/core-framework/include/utils/crypto/EncryptionProvider.h
similarity index 100%
rename from utils/include/utils/crypto/EncryptionProvider.h
rename to core-framework/include/utils/crypto/EncryptionProvider.h
diff --git a/utils/include/utils/crypto/EncryptionUtils.h b/core-framework/include/utils/crypto/EncryptionUtils.h
similarity index 100%
rename from utils/include/utils/crypto/EncryptionUtils.h
rename to core-framework/include/utils/crypto/EncryptionUtils.h
diff --git a/utils/include/utils/crypto/ciphers/Aes256Ecb.h b/core-framework/include/utils/crypto/ciphers/Aes256Ecb.h
similarity index 100%
rename from utils/include/utils/crypto/ciphers/Aes256Ecb.h
rename to core-framework/include/utils/crypto/ciphers/Aes256Ecb.h
diff --git a/utils/include/utils/crypto/ciphers/XSalsa20.h b/core-framework/include/utils/crypto/ciphers/XSalsa20.h
similarity index 100%
rename from utils/include/utils/crypto/ciphers/XSalsa20.h
rename to core-framework/include/utils/crypto/ciphers/XSalsa20.h
diff --git a/utils/include/utils/crypto/property_encryption/PropertyEncryptionUtils.h b/core-framework/include/utils/crypto/property_encryption/PropertyEncryptionUtils.h
similarity index 100%
rename from utils/include/utils/crypto/property_encryption/PropertyEncryptionUtils.h
rename to core-framework/include/utils/crypto/property_encryption/PropertyEncryptionUtils.h
diff --git a/utils/include/utils/detail/MonadicOperationWrappers.h b/core-framework/include/utils/detail/MonadicOperationWrappers.h
similarity index 100%
rename from utils/include/utils/detail/MonadicOperationWrappers.h
rename to core-framework/include/utils/detail/MonadicOperationWrappers.h
diff --git a/utils/include/utils/expected.h b/core-framework/include/utils/expected.h
similarity index 100%
rename from utils/include/utils/expected.h
rename to core-framework/include/utils/expected.h
diff --git a/utils/include/utils/file/FilePattern.h b/core-framework/include/utils/file/FilePattern.h
similarity index 100%
rename from utils/include/utils/file/FilePattern.h
rename to core-framework/include/utils/file/FilePattern.h
diff --git a/utils/include/utils/file/FileUtils.h b/core-framework/include/utils/file/FileUtils.h
similarity index 100%
rename from utils/include/utils/file/FileUtils.h
rename to core-framework/include/utils/file/FileUtils.h
diff --git a/utils/include/utils/file/PathUtils.h b/core-framework/include/utils/file/PathUtils.h
similarity index 100%
rename from utils/include/utils/file/PathUtils.h
rename to core-framework/include/utils/file/PathUtils.h
diff --git a/utils/include/utils/gsl.h b/core-framework/include/utils/gsl.h
similarity index 100%
rename from utils/include/utils/gsl.h
rename to core-framework/include/utils/gsl.h
diff --git a/utils/include/utils/meta/detected.h b/core-framework/include/utils/meta/detected.h
similarity index 100%
rename from utils/include/utils/meta/detected.h
rename to core-framework/include/utils/meta/detected.h
diff --git a/utils/include/utils/meta/type_list.h b/core-framework/include/utils/meta/type_list.h
similarity index 100%
rename from utils/include/utils/meta/type_list.h
rename to core-framework/include/utils/meta/type_list.h
diff --git a/utils/include/utils/net/AsioCoro.h b/core-framework/include/utils/net/AsioCoro.h
similarity index 100%
rename from utils/include/utils/net/AsioCoro.h
rename to core-framework/include/utils/net/AsioCoro.h
diff --git a/utils/include/utils/net/AsioSocketUtils.h b/core-framework/include/utils/net/AsioSocketUtils.h
similarity index 100%
rename from utils/include/utils/net/AsioSocketUtils.h
rename to core-framework/include/utils/net/AsioSocketUtils.h
diff --git a/utils/include/utils/net/DNS.h b/core-framework/include/utils/net/DNS.h
similarity index 100%
rename from utils/include/utils/net/DNS.h
rename to core-framework/include/utils/net/DNS.h
diff --git a/utils/include/utils/net/NetworkInterfaceInfo.h b/core-framework/include/utils/net/NetworkInterfaceInfo.h
similarity index 100%
rename from utils/include/utils/net/NetworkInterfaceInfo.h
rename to core-framework/include/utils/net/NetworkInterfaceInfo.h
diff --git a/utils/include/utils/net/Socket.h b/core-framework/include/utils/net/Socket.h
similarity index 100%
rename from utils/include/utils/net/Socket.h
rename to core-framework/include/utils/net/Socket.h
diff --git a/utils/include/utils/requirements/Container.h b/core-framework/include/utils/requirements/Container.h
similarity index 100%
rename from utils/include/utils/requirements/Container.h
rename to core-framework/include/utils/requirements/Container.h
diff --git a/utils/include/utils/requirements/EqualityComparable.h b/core-framework/include/utils/requirements/EqualityComparable.h
similarity index 100%
rename from utils/include/utils/requirements/EqualityComparable.h
rename to core-framework/include/utils/requirements/EqualityComparable.h
diff --git a/utils/include/utils/requirements/LegacyForwardIterator.h b/core-framework/include/utils/requirements/LegacyForwardIterator.h
similarity index 100%
rename from utils/include/utils/requirements/LegacyForwardIterator.h
rename to core-framework/include/utils/requirements/LegacyForwardIterator.h
diff --git a/utils/include/utils/requirements/LegacyInputIterator.h b/core-framework/include/utils/requirements/LegacyInputIterator.h
similarity index 100%
rename from utils/include/utils/requirements/LegacyInputIterator.h
rename to core-framework/include/utils/requirements/LegacyInputIterator.h
diff --git a/utils/include/utils/requirements/LegacyIterator.h b/core-framework/include/utils/requirements/LegacyIterator.h
similarity index 100%
rename from utils/include/utils/requirements/LegacyIterator.h
rename to core-framework/include/utils/requirements/LegacyIterator.h
diff --git a/utils/include/utils/requirements/Swappable.h b/core-framework/include/utils/requirements/Swappable.h
similarity index 100%
rename from utils/include/utils/requirements/Swappable.h
rename to core-framework/include/utils/requirements/Swappable.h
diff --git a/utils/include/utils/span.h b/core-framework/include/utils/span.h
similarity index 100%
rename from utils/include/utils/span.h
rename to core-framework/include/utils/span.h
diff --git a/utils/src/core/BufferedContentSession.cpp b/core-framework/src/core/BufferedContentSession.cpp
similarity index 100%
rename from utils/src/core/BufferedContentSession.cpp
rename to core-framework/src/core/BufferedContentSession.cpp
diff --git a/utils/src/core/ConfigurableComponentImpl.cpp b/core-framework/src/core/ConfigurableComponentImpl.cpp
similarity index 100%
rename from utils/src/core/ConfigurableComponentImpl.cpp
rename to core-framework/src/core/ConfigurableComponentImpl.cpp
diff --git a/utils/src/core/Connectable.cpp b/core-framework/src/core/Connectable.cpp
similarity index 100%
rename from utils/src/core/Connectable.cpp
rename to core-framework/src/core/Connectable.cpp
diff --git a/utils/src/core/ContentRepository.cpp b/core-framework/src/core/ContentRepository.cpp
similarity index 100%
rename from utils/src/core/ContentRepository.cpp
rename to core-framework/src/core/ContentRepository.cpp
diff --git a/utils/src/core/ContentSession.cpp b/core-framework/src/core/ContentSession.cpp
similarity index 100%
rename from utils/src/core/ContentSession.cpp
rename to core-framework/src/core/ContentSession.cpp
diff --git a/utils/src/core/Core.cpp b/core-framework/src/core/Core.cpp
similarity index 100%
rename from utils/src/core/Core.cpp
rename to core-framework/src/core/Core.cpp
diff --git a/utils/src/core/ProcessContextBuilder.cpp b/core-framework/src/core/ProcessContextBuilder.cpp
similarity index 100%
rename from utils/src/core/ProcessContextBuilder.cpp
rename to core-framework/src/core/ProcessContextBuilder.cpp
diff --git a/utils/src/core/ProcessSession.cpp b/core-framework/src/core/ProcessSession.cpp
similarity index 100%
rename from utils/src/core/ProcessSession.cpp
rename to core-framework/src/core/ProcessSession.cpp
diff --git a/utils/src/core/ProcessorImpl.cpp b/core-framework/src/core/ProcessorImpl.cpp
similarity index 100%
rename from utils/src/core/ProcessorImpl.cpp
rename to core-framework/src/core/ProcessorImpl.cpp
diff --git a/utils/src/core/ProcessorMetrics.cpp b/core-framework/src/core/ProcessorMetrics.cpp
similarity index 100%
rename from utils/src/core/ProcessorMetrics.cpp
rename to core-framework/src/core/ProcessorMetrics.cpp
diff --git a/utils/src/core/Property.cpp b/core-framework/src/core/Property.cpp
similarity index 100%
rename from utils/src/core/Property.cpp
rename to core-framework/src/core/Property.cpp
diff --git a/utils/src/core/Repository.cpp b/core-framework/src/core/Repository.cpp
similarity index 100%
rename from utils/src/core/Repository.cpp
rename to core-framework/src/core/Repository.cpp
diff --git a/utils/src/core/TypedValues.cpp b/core-framework/src/core/TypedValues.cpp
similarity index 100%
rename from utils/src/core/TypedValues.cpp
rename to core-framework/src/core/TypedValues.cpp
diff --git a/utils/src/core/extension/Extension.cpp b/core-framework/src/core/extension/Extension.cpp
similarity index 100%
rename from utils/src/core/extension/Extension.cpp
rename to core-framework/src/core/extension/Extension.cpp
diff --git a/utils/src/http/BaseHTTPClient.cpp b/core-framework/src/http/BaseHTTPClient.cpp
similarity index 100%
rename from utils/src/http/BaseHTTPClient.cpp
rename to core-framework/src/http/BaseHTTPClient.cpp
diff --git a/utils/src/http/HTTPClient.cpp b/core-framework/src/http/HTTPClient.cpp
similarity index 100%
rename from utils/src/http/HTTPClient.cpp
rename to core-framework/src/http/HTTPClient.cpp
diff --git a/utils/src/http/HTTPStream.cpp b/core-framework/src/http/HTTPStream.cpp
similarity index 100%
rename from utils/src/http/HTTPStream.cpp
rename to core-framework/src/http/HTTPStream.cpp
diff --git a/utils/src/io/BufferStream.cpp b/core-framework/src/io/BufferStream.cpp
similarity index 100%
rename from utils/src/io/BufferStream.cpp
rename to core-framework/src/io/BufferStream.cpp
diff --git a/utils/src/io/CPPLINT.cfg b/core-framework/src/io/CPPLINT.cfg
similarity index 100%
rename from utils/src/io/CPPLINT.cfg
rename to core-framework/src/io/CPPLINT.cfg
diff --git a/utils/src/io/CRCStream.cpp b/core-framework/src/io/CRCStream.cpp
similarity index 100%
rename from utils/src/io/CRCStream.cpp
rename to core-framework/src/io/CRCStream.cpp
diff --git a/utils/src/io/FileStream.cpp b/core-framework/src/io/FileStream.cpp
similarity index 100%
rename from utils/src/io/FileStream.cpp
rename to core-framework/src/io/FileStream.cpp
diff --git a/utils/src/io/InputStream.cpp b/core-framework/src/io/InputStream.cpp
similarity index 100%
rename from utils/src/io/InputStream.cpp
rename to core-framework/src/io/InputStream.cpp
diff --git a/utils/src/io/OutputStream.cpp b/core-framework/src/io/OutputStream.cpp
similarity index 100%
rename from utils/src/io/OutputStream.cpp
rename to core-framework/src/io/OutputStream.cpp
diff --git a/utils/src/io/StreamSlice.cpp b/core-framework/src/io/StreamSlice.cpp
similarity index 100%
rename from utils/src/io/StreamSlice.cpp
rename to core-framework/src/io/StreamSlice.cpp
diff --git a/utils/src/io/ZlibStream.cpp b/core-framework/src/io/ZlibStream.cpp
similarity index 100%
rename from utils/src/io/ZlibStream.cpp
rename to core-framework/src/io/ZlibStream.cpp
diff --git a/utils/src/utils/AutoPersistor.cpp b/core-framework/src/utils/AutoPersistor.cpp
similarity index 100%
rename from utils/src/utils/AutoPersistor.cpp
rename to core-framework/src/utils/AutoPersistor.cpp
diff --git a/utils/src/utils/BackTrace.cpp b/core-framework/src/utils/BackTrace.cpp
similarity index 100%
rename from utils/src/utils/BackTrace.cpp
rename to core-framework/src/utils/BackTrace.cpp
diff --git a/utils/src/utils/ByteArrayCallback.cpp b/core-framework/src/utils/ByteArrayCallback.cpp
similarity index 100%
rename from utils/src/utils/ByteArrayCallback.cpp
rename to core-framework/src/utils/ByteArrayCallback.cpp
diff --git a/utils/src/utils/ClassUtils.cpp b/core-framework/src/utils/ClassUtils.cpp
similarity index 100%
rename from utils/src/utils/ClassUtils.cpp
rename to core-framework/src/utils/ClassUtils.cpp
diff --git a/utils/src/utils/ConfigurationUtils.cpp b/core-framework/src/utils/ConfigurationUtils.cpp
similarity index 100%
rename from utils/src/utils/ConfigurationUtils.cpp
rename to core-framework/src/utils/ConfigurationUtils.cpp
diff --git a/utils/src/utils/Cron.cpp b/core-framework/src/utils/Cron.cpp
similarity index 100%
rename from utils/src/utils/Cron.cpp
rename to core-framework/src/utils/Cron.cpp
diff --git a/utils/src/utils/Environment.cpp b/core-framework/src/utils/Environment.cpp
similarity index 100%
rename from utils/src/utils/Environment.cpp
rename to core-framework/src/utils/Environment.cpp
diff --git a/utils/src/utils/Error.cpp b/core-framework/src/utils/Error.cpp
similarity index 100%
rename from utils/src/utils/Error.cpp
rename to core-framework/src/utils/Error.cpp
diff --git a/utils/src/utils/FifoExecutor.cpp b/core-framework/src/utils/FifoExecutor.cpp
similarity index 100%
rename from utils/src/utils/FifoExecutor.cpp
rename to core-framework/src/utils/FifoExecutor.cpp
diff --git a/utils/src/utils/FileMutex.cpp b/core-framework/src/utils/FileMutex.cpp
similarity index 100%
rename from utils/src/utils/FileMutex.cpp
rename to core-framework/src/utils/FileMutex.cpp
diff --git a/utils/src/utils/HTTPUtils.cpp b/core-framework/src/utils/HTTPUtils.cpp
similarity index 100%
rename from utils/src/utils/HTTPUtils.cpp
rename to core-framework/src/utils/HTTPUtils.cpp
diff --git a/utils/src/utils/Id.cpp b/core-framework/src/utils/Id.cpp
similarity index 100%
rename from utils/src/utils/Id.cpp
rename to core-framework/src/utils/Id.cpp
diff --git a/utils/src/utils/LineByLineInputOutputStreamCallback.cpp b/core-framework/src/utils/LineByLineInputOutputStreamCallback.cpp
similarity index 100%
rename from utils/src/utils/LineByLineInputOutputStreamCallback.cpp
rename to core-framework/src/utils/LineByLineInputOutputStreamCallback.cpp
diff --git a/utils/src/utils/OsUtils.cpp b/core-framework/src/utils/OsUtils.cpp
similarity index 100%
rename from utils/src/utils/OsUtils.cpp
rename to core-framework/src/utils/OsUtils.cpp
diff --git a/utils/src/utils/ParsingUtils.cpp b/core-framework/src/utils/ParsingUtils.cpp
similarity index 100%
rename from utils/src/utils/ParsingUtils.cpp
rename to core-framework/src/utils/ParsingUtils.cpp
diff --git a/utils/src/utils/ProcessCpuUsageTracker.cpp b/core-framework/src/utils/ProcessCpuUsageTracker.cpp
similarity index 100%
rename from utils/src/utils/ProcessCpuUsageTracker.cpp
rename to core-framework/src/utils/ProcessCpuUsageTracker.cpp
diff --git a/utils/src/utils/RegexUtils.cpp b/core-framework/src/utils/RegexUtils.cpp
similarity index 100%
rename from utils/src/utils/RegexUtils.cpp
rename to core-framework/src/utils/RegexUtils.cpp
diff --git a/utils/src/utils/StoppableThread.cpp b/core-framework/src/utils/StoppableThread.cpp
similarity index 100%
rename from utils/src/utils/StoppableThread.cpp
rename to core-framework/src/utils/StoppableThread.cpp
diff --git a/utils/src/utils/StringUtils.cpp b/core-framework/src/utils/StringUtils.cpp
similarity index 100%
rename from utils/src/utils/StringUtils.cpp
rename to core-framework/src/utils/StringUtils.cpp
diff --git a/utils/src/utils/SystemCpuUsageTracker.cpp b/core-framework/src/utils/SystemCpuUsageTracker.cpp
similarity index 100%
rename from utils/src/utils/SystemCpuUsageTracker.cpp
rename to core-framework/src/utils/SystemCpuUsageTracker.cpp
diff --git a/utils/src/utils/ThreadPool.cpp b/core-framework/src/utils/ThreadPool.cpp
similarity index 100%
rename from utils/src/utils/ThreadPool.cpp
rename to core-framework/src/utils/ThreadPool.cpp
diff --git a/utils/src/utils/TimeUtil.cpp b/core-framework/src/utils/TimeUtil.cpp
similarity index 100%
rename from utils/src/utils/TimeUtil.cpp
rename to core-framework/src/utils/TimeUtil.cpp
diff --git a/utils/src/utils/crypto/EncryptionManager.cpp b/core-framework/src/utils/crypto/EncryptionManager.cpp
similarity index 100%
rename from utils/src/utils/crypto/EncryptionManager.cpp
rename to core-framework/src/utils/crypto/EncryptionManager.cpp
diff --git a/utils/src/utils/crypto/EncryptionProvider.cpp b/core-framework/src/utils/crypto/EncryptionProvider.cpp
similarity index 100%
rename from utils/src/utils/crypto/EncryptionProvider.cpp
rename to core-framework/src/utils/crypto/EncryptionProvider.cpp
diff --git a/utils/src/utils/crypto/EncryptionUtils.cpp b/core-framework/src/utils/crypto/EncryptionUtils.cpp
similarity index 100%
rename from utils/src/utils/crypto/EncryptionUtils.cpp
rename to core-framework/src/utils/crypto/EncryptionUtils.cpp
diff --git a/utils/src/utils/crypto/ciphers/Aes256Ecb.cpp b/core-framework/src/utils/crypto/ciphers/Aes256Ecb.cpp
similarity index 100%
rename from utils/src/utils/crypto/ciphers/Aes256Ecb.cpp
rename to core-framework/src/utils/crypto/ciphers/Aes256Ecb.cpp
diff --git a/utils/src/utils/crypto/property_encryption/PropertyEncryptionUtils.cpp b/core-framework/src/utils/crypto/property_encryption/PropertyEncryptionUtils.cpp
similarity index 100%
rename from utils/src/utils/crypto/property_encryption/PropertyEncryptionUtils.cpp
rename to core-framework/src/utils/crypto/property_encryption/PropertyEncryptionUtils.cpp
diff --git a/utils/src/utils/file/FilePattern.cpp b/core-framework/src/utils/file/FilePattern.cpp
similarity index 100%
rename from utils/src/utils/file/FilePattern.cpp
rename to core-framework/src/utils/file/FilePattern.cpp
diff --git a/utils/src/utils/file/FileUtils.cpp b/core-framework/src/utils/file/FileUtils.cpp
similarity index 100%
rename from utils/src/utils/file/FileUtils.cpp
rename to core-framework/src/utils/file/FileUtils.cpp
diff --git a/utils/src/utils/file/PathUtils.cpp b/core-framework/src/utils/file/PathUtils.cpp
similarity index 100%
rename from utils/src/utils/file/PathUtils.cpp
rename to core-framework/src/utils/file/PathUtils.cpp
diff --git a/utils/src/utils/net/AsioSocketUtils.cpp b/core-framework/src/utils/net/AsioSocketUtils.cpp
similarity index 100%
rename from utils/src/utils/net/AsioSocketUtils.cpp
rename to core-framework/src/utils/net/AsioSocketUtils.cpp
diff --git a/utils/src/utils/net/DNS.cpp b/core-framework/src/utils/net/DNS.cpp
similarity index 100%
rename from utils/src/utils/net/DNS.cpp
rename to core-framework/src/utils/net/DNS.cpp
diff --git a/utils/src/utils/net/NetworkInterfaceInfo.cpp b/core-framework/src/utils/net/NetworkInterfaceInfo.cpp
similarity index 100%
rename from utils/src/utils/net/NetworkInterfaceInfo.cpp
rename to core-framework/src/utils/net/NetworkInterfaceInfo.cpp
diff --git a/utils/src/utils/net/Socket.cpp b/core-framework/src/utils/net/Socket.cpp
similarity index 100%
rename from utils/src/utils/net/Socket.cpp
rename to core-framework/src/utils/net/Socket.cpp
diff --git a/extension-utils/CMakeLists.txt b/extension-framework/CMakeLists.txt
similarity index 56%
rename from extension-utils/CMakeLists.txt
rename to extension-framework/CMakeLists.txt
index f5c969d8f..8fbbe0ede 100644
--- a/extension-utils/CMakeLists.txt
+++ b/extension-framework/CMakeLists.txt
@@ -9,9 +9,9 @@ file(GLOB SOURCES
src/utils/net/*.cpp
src/utils/tls/*.cpp
src/utils/*.cpp)
-add_minifi_library(minifi-extension-utils STATIC ${SOURCES})
-target_include_directories(minifi-extension-utils PUBLIC include)
-target_link_libraries(minifi-extension-utils PUBLIC minifi-api)
+add_minifi_library(minifi-extension-framework STATIC ${SOURCES})
+target_include_directories(minifi-extension-framework PUBLIC include)
+target_link_libraries(minifi-extension-framework PUBLIC minifi-api)
include(RangeV3)
include(Asio)
@@ -23,13 +23,13 @@ endif()
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
list(APPEND CORE_LIBRARIES stdc++fs)
endif()
-target_link_libraries(minifi-extension-utils PUBLIC ${CMAKE_DL_LIBS} ${CORE_LIBRARIES})
+target_link_libraries(minifi-extension-framework PUBLIC ${CMAKE_DL_LIBS} ${CORE_LIBRARIES})
if (APPLE)
- target_link_libraries(minifi-extension-utils PUBLIC "-framework CoreFoundation -framework SystemConfiguration")
+ target_link_libraries(minifi-extension-framework PUBLIC "-framework CoreFoundation -framework SystemConfiguration")
endif()
if (UNIX AND (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7"))
- target_link_libraries(minifi-extension-utils PUBLIC "-latomic")
+ target_link_libraries(minifi-extension-framework PUBLIC "-latomic")
endif()
-target_link_libraries(minifi-extension-utils PRIVATE minifi-api)
-target_link_libraries(minifi-extension-utils PUBLIC minifi-utils)
+target_link_libraries(minifi-extension-framework PRIVATE minifi-api)
+target_link_libraries(minifi-extension-framework PUBLIC minifi-core-framework)
diff --git a/extension-utils/include/FlowFileRecord.h b/extension-framework/include/FlowFileRecord.h
similarity index 100%
rename from extension-utils/include/FlowFileRecord.h
rename to extension-framework/include/FlowFileRecord.h
diff --git a/extension-utils/include/ResourceClaim.h b/extension-framework/include/ResourceClaim.h
similarity index 100%
rename from extension-utils/include/ResourceClaim.h
rename to extension-framework/include/ResourceClaim.h
diff --git a/extension-utils/include/controllers/AttributeProviderService.h b/extension-framework/include/controllers/AttributeProviderService.h
similarity index 100%
rename from extension-utils/include/controllers/AttributeProviderService.h
rename to extension-framework/include/controllers/AttributeProviderService.h
diff --git a/extension-utils/include/controllers/RecordSetReader.h b/extension-framework/include/controllers/RecordSetReader.h
similarity index 100%
rename from extension-utils/include/controllers/RecordSetReader.h
rename to extension-framework/include/controllers/RecordSetReader.h
diff --git a/extension-utils/include/controllers/RecordSetWriter.h b/extension-framework/include/controllers/RecordSetWriter.h
similarity index 100%
rename from extension-utils/include/controllers/RecordSetWriter.h
rename to extension-framework/include/controllers/RecordSetWriter.h
diff --git a/extension-utils/include/controllers/SSLContextServiceInterface.h b/extension-framework/include/controllers/SSLContextService.h
similarity index 100%
copy from extension-utils/include/controllers/SSLContextServiceInterface.h
copy to extension-framework/include/controllers/SSLContextService.h
diff --git a/extension-utils/include/controllers/SSLContextServiceInterface.h b/extension-framework/include/controllers/SSLContextServiceInterface.h
similarity index 100%
rename from extension-utils/include/controllers/SSLContextServiceInterface.h
rename to extension-framework/include/controllers/SSLContextServiceInterface.h
diff --git a/extension-utils/include/controllers/keyvalue/KeyValueStateManager.h b/extension-framework/include/controllers/keyvalue/KeyValueStateManager.h
similarity index 100%
rename from extension-utils/include/controllers/keyvalue/KeyValueStateManager.h
rename to extension-framework/include/controllers/keyvalue/KeyValueStateManager.h
diff --git a/extension-utils/include/controllers/keyvalue/KeyValueStateStorage.h b/extension-framework/include/controllers/keyvalue/KeyValueStateStorage.h
similarity index 100%
rename from extension-utils/include/controllers/keyvalue/KeyValueStateStorage.h
rename to extension-framework/include/controllers/keyvalue/KeyValueStateStorage.h
diff --git a/extension-utils/include/core/AbstractProcessor.h b/extension-framework/include/core/AbstractProcessor.h
similarity index 100%
rename from extension-utils/include/core/AbstractProcessor.h
rename to extension-framework/include/core/AbstractProcessor.h
diff --git a/extension-utils/include/core/FlowFile.h b/extension-framework/include/core/FlowFile.h
similarity index 100%
rename from extension-utils/include/core/FlowFile.h
rename to extension-framework/include/core/FlowFile.h
diff --git a/extension-utils/include/core/FlowFileStore.h b/extension-framework/include/core/FlowFileStore.h
similarity index 100%
rename from extension-utils/include/core/FlowFileStore.h
rename to extension-framework/include/core/FlowFileStore.h
diff --git a/extension-utils/include/core/ProcessSession.h b/extension-framework/include/core/ProcessSession.h
similarity index 100%
rename from extension-utils/include/core/ProcessSession.h
rename to extension-framework/include/core/ProcessSession.h
diff --git a/extension-utils/include/core/StateManager.h b/extension-framework/include/core/StateManager.h
similarity index 100%
rename from extension-utils/include/core/StateManager.h
rename to extension-framework/include/core/StateManager.h
diff --git a/extension-utils/include/core/StateStorage.h b/extension-framework/include/core/StateStorage.h
similarity index 100%
rename from extension-utils/include/core/StateStorage.h
rename to extension-framework/include/core/StateStorage.h
diff --git a/extension-utils/include/properties/Configure.h b/extension-framework/include/properties/Configure.h
similarity index 100%
rename from extension-utils/include/properties/Configure.h
rename to extension-framework/include/properties/Configure.h
diff --git a/extension-utils/include/properties/Properties.h b/extension-framework/include/properties/Properties.h
similarity index 100%
rename from extension-utils/include/properties/Properties.h
rename to extension-framework/include/properties/Properties.h
diff --git a/extension-utils/include/serialization/FlowFileSerializer.h b/extension-framework/include/serialization/FlowFileSerializer.h
similarity index 100%
rename from extension-utils/include/serialization/FlowFileSerializer.h
rename to extension-framework/include/serialization/FlowFileSerializer.h
diff --git a/extension-utils/include/serialization/FlowFileV3Serializer.h b/extension-framework/include/serialization/FlowFileV3Serializer.h
similarity index 100%
rename from extension-utils/include/serialization/FlowFileV3Serializer.h
rename to extension-framework/include/serialization/FlowFileV3Serializer.h
diff --git a/extension-utils/include/serialization/PayloadSerializer.h b/extension-framework/include/serialization/PayloadSerializer.h
similarity index 100%
rename from extension-utils/include/serialization/PayloadSerializer.h
rename to extension-framework/include/serialization/PayloadSerializer.h
diff --git a/extension-utils/include/utils/ListingStateManager.h b/extension-framework/include/utils/ListingStateManager.h
similarity index 100%
rename from extension-utils/include/utils/ListingStateManager.h
rename to extension-framework/include/utils/ListingStateManager.h
diff --git a/extension-utils/include/utils/OpenTelemetryLogDataModelUtils.h b/extension-framework/include/utils/OpenTelemetryLogDataModelUtils.h
similarity index 100%
rename from extension-utils/include/utils/OpenTelemetryLogDataModelUtils.h
rename to extension-framework/include/utils/OpenTelemetryLogDataModelUtils.h
diff --git a/extension-utils/include/utils/ProcessorConfigUtils.h b/extension-framework/include/utils/ProcessorConfigUtils.h
similarity index 100%
rename from extension-utils/include/utils/ProcessorConfigUtils.h
rename to extension-framework/include/utils/ProcessorConfigUtils.h
diff --git a/extension-utils/include/utils/ResourceQueue.h b/extension-framework/include/utils/ResourceQueue.h
similarity index 100%
rename from extension-utils/include/utils/ResourceQueue.h
rename to extension-framework/include/utils/ResourceQueue.h
diff --git a/extension-utils/include/utils/file/FileManager.h b/extension-framework/include/utils/file/FileManager.h
similarity index 100%
rename from extension-utils/include/utils/file/FileManager.h
rename to extension-framework/include/utils/file/FileManager.h
diff --git a/extension-utils/include/utils/file/FileReaderCallback.h b/extension-framework/include/utils/file/FileReaderCallback.h
similarity index 100%
rename from extension-utils/include/utils/file/FileReaderCallback.h
rename to extension-framework/include/utils/file/FileReaderCallback.h
diff --git a/extension-utils/include/utils/file/FileWriterCallback.h b/extension-framework/include/utils/file/FileWriterCallback.h
similarity index 100%
rename from extension-utils/include/utils/file/FileWriterCallback.h
rename to extension-framework/include/utils/file/FileWriterCallback.h
diff --git a/extension-utils/include/utils/file/ListedFile.h b/extension-framework/include/utils/file/ListedFile.h
similarity index 100%
rename from extension-utils/include/utils/file/ListedFile.h
rename to extension-framework/include/utils/file/ListedFile.h
diff --git a/extension-utils/include/utils/net/ConnectionHandler.h b/extension-framework/include/utils/net/ConnectionHandler.h
similarity index 100%
rename from extension-utils/include/utils/net/ConnectionHandler.h
rename to extension-framework/include/utils/net/ConnectionHandler.h
diff --git a/extension-utils/include/utils/net/ConnectionHandlerBase.h b/extension-framework/include/utils/net/ConnectionHandlerBase.h
similarity index 100%
rename from extension-utils/include/utils/net/ConnectionHandlerBase.h
rename to extension-framework/include/utils/net/ConnectionHandlerBase.h
diff --git a/extension-utils/include/utils/net/IpProtocol.h b/extension-framework/include/utils/net/IpProtocol.h
similarity index 100%
rename from extension-utils/include/utils/net/IpProtocol.h
rename to extension-framework/include/utils/net/IpProtocol.h
diff --git a/extension-utils/include/utils/net/Message.h b/extension-framework/include/utils/net/Message.h
similarity index 100%
rename from extension-utils/include/utils/net/Message.h
rename to extension-framework/include/utils/net/Message.h
diff --git a/extension-utils/include/utils/net/Server.h b/extension-framework/include/utils/net/Server.h
similarity index 100%
rename from extension-utils/include/utils/net/Server.h
rename to extension-framework/include/utils/net/Server.h
diff --git a/extension-utils/include/utils/net/Ssl.h b/extension-framework/include/utils/net/Ssl.h
similarity index 100%
rename from extension-utils/include/utils/net/Ssl.h
rename to extension-framework/include/utils/net/Ssl.h
diff --git a/extension-utils/include/utils/net/TcpServer.h b/extension-framework/include/utils/net/TcpServer.h
similarity index 100%
rename from extension-utils/include/utils/net/TcpServer.h
rename to extension-framework/include/utils/net/TcpServer.h
diff --git a/extension-utils/include/utils/net/UdpServer.h b/extension-framework/include/utils/net/UdpServer.h
similarity index 100%
rename from extension-utils/include/utils/net/UdpServer.h
rename to extension-framework/include/utils/net/UdpServer.h
diff --git a/extension-utils/src/controllers/keyvalue/KeyValueStateManager.cpp b/extension-framework/src/controllers/keyvalue/KeyValueStateManager.cpp
similarity index 100%
rename from extension-utils/src/controllers/keyvalue/KeyValueStateManager.cpp
rename to extension-framework/src/controllers/keyvalue/KeyValueStateManager.cpp
diff --git a/extension-utils/src/controllers/keyvalue/KeyValueStateStorage.cpp b/extension-framework/src/controllers/keyvalue/KeyValueStateStorage.cpp
similarity index 100%
rename from extension-utils/src/controllers/keyvalue/KeyValueStateStorage.cpp
rename to extension-framework/src/controllers/keyvalue/KeyValueStateStorage.cpp
diff --git a/extension-utils/src/core/ProcessContext.cpp b/extension-framework/src/core/ProcessContext.cpp
similarity index 100%
rename from extension-utils/src/core/ProcessContext.cpp
rename to extension-framework/src/core/ProcessContext.cpp
diff --git a/extension-utils/src/serialization/FlowFileV3Serializer.cpp b/extension-framework/src/serialization/FlowFileV3Serializer.cpp
similarity index 100%
rename from extension-utils/src/serialization/FlowFileV3Serializer.cpp
rename to extension-framework/src/serialization/FlowFileV3Serializer.cpp
diff --git a/extension-utils/src/serialization/PayloadSerializer.cpp b/extension-framework/src/serialization/PayloadSerializer.cpp
similarity index 100%
rename from extension-utils/src/serialization/PayloadSerializer.cpp
rename to extension-framework/src/serialization/PayloadSerializer.cpp
diff --git a/extension-utils/src/utils/CallBackTimer.cpp b/extension-framework/src/utils/CallBackTimer.cpp
similarity index 100%
rename from extension-utils/src/utils/CallBackTimer.cpp
rename to extension-framework/src/utils/CallBackTimer.cpp
diff --git a/extension-utils/src/utils/ListingStateManager.cpp b/extension-framework/src/utils/ListingStateManager.cpp
similarity index 100%
rename from extension-utils/src/utils/ListingStateManager.cpp
rename to extension-framework/src/utils/ListingStateManager.cpp
diff --git a/extension-utils/src/utils/file/FileReaderCallback.cpp b/extension-framework/src/utils/file/FileReaderCallback.cpp
similarity index 100%
rename from extension-utils/src/utils/file/FileReaderCallback.cpp
rename to extension-framework/src/utils/file/FileReaderCallback.cpp
diff --git a/extension-utils/src/utils/file/FileWriterCallback.cpp b/extension-framework/src/utils/file/FileWriterCallback.cpp
similarity index 100%
rename from extension-utils/src/utils/file/FileWriterCallback.cpp
rename to extension-framework/src/utils/file/FileWriterCallback.cpp
diff --git a/extension-utils/src/utils/net/Ssl.cpp b/extension-framework/src/utils/net/Ssl.cpp
similarity index 100%
rename from extension-utils/src/utils/net/Ssl.cpp
rename to extension-framework/src/utils/net/Ssl.cpp
diff --git a/extension-utils/src/utils/net/TcpServer.cpp b/extension-framework/src/utils/net/TcpServer.cpp
similarity index 100%
rename from extension-utils/src/utils/net/TcpServer.cpp
rename to extension-framework/src/utils/net/TcpServer.cpp
diff --git a/extension-utils/src/utils/net/UdpServer.cpp b/extension-framework/src/utils/net/UdpServer.cpp
similarity index 100%
rename from extension-utils/src/utils/net/UdpServer.cpp
rename to extension-framework/src/utils/net/UdpServer.cpp
diff --git a/extension-utils/include/controllers/SSLContextService.h b/extension-utils/include/controllers/SSLContextService.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/extensions/rocksdb-repos/CMakeLists.txt b/extensions/rocksdb-repos/CMakeLists.txt
index c5e507113..f4d535208 100644
--- a/extensions/rocksdb-repos/CMakeLists.txt
+++ b/extensions/rocksdb-repos/CMakeLists.txt
@@ -31,7 +31,7 @@ file(GLOB SOURCES "*.cpp" "controllers/*.cpp" "database/*.cpp" "encryption/*.cp
add_minifi_library(minifi-rocksdb-repos SHARED ${SOURCES})
target_link_libraries(minifi-rocksdb-repos PUBLIC RocksDB::RocksDB)
-target_link_libraries(minifi-rocksdb-repos PUBLIC minifi-api minifi-extension-utils Threads::Threads)
+target_link_libraries(minifi-rocksdb-repos PUBLIC minifi-api minifi-extension-framework Threads::Threads)
target_link_libraries(minifi-rocksdb-repos PRIVATE $<LINK_ONLY:core-minifi>)
register_extension(minifi-rocksdb-repos "ROCKSDB REPOS" ROCKSDB-REPOS "This Enables persistent provenance, flowfile, and content repositories using RocksDB" "extensions/rocksdb-repos/tests")
diff --git a/libminifi/CMakeLists.txt b/libminifi/CMakeLists.txt
index 116a41a0c..80c2f4624 100644
--- a/libminifi/CMakeLists.txt
+++ b/libminifi/CMakeLists.txt
@@ -84,7 +84,7 @@ endif()
include(RangeV3)
include(Asio)
include(MagicEnum)
-list(APPEND LIBMINIFI_LIBRARIES minifi-utils yaml-cpp ZLIB::ZLIB concurrentqueue RapidJSON spdlog::spdlog Threads::Threads gsl-lite libsodium range-v3 expected-lite asio magic_enum OpenSSL::Crypto OpenSSL::SSL CURL::libcurl RapidJSON fmt::fmt)
+list(APPEND LIBMINIFI_LIBRARIES minifi-core-framework yaml-cpp ZLIB::ZLIB concurrentqueue RapidJSON spdlog::spdlog Threads::Threads gsl-lite libsodium range-v3 expected-lite asio magic_enum OpenSSL::Crypto OpenSSL::SSL CURL::libcurl RapidJSON fmt::fmt)
if(NOT WIN32)
list(APPEND LIBMINIFI_LIBRARIES OSSP::libuuid++)
endif()
@@ -99,7 +99,7 @@ if (UNIX AND (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7"))
target_link_libraries(core-minifi "-latomic")
endif()
-SET(LIBMINIFI minifi-api minifi-extension-utils $<LINK_ONLY:core-minifi> PARENT_SCOPE)
+SET(LIBMINIFI minifi-api minifi-extension-framework $<LINK_ONLY:core-minifi> PARENT_SCOPE)
if (WIN32)
install(TARGETS core-minifi ARCHIVE DESTINATION bin COMPONENT bin)
diff --git a/libminifi/test/libtest/unit/CMakeLists.txt b/libminifi/test/libtest/unit/CMakeLists.txt
index 1a6220fe8..674d1969b 100644
--- a/libminifi/test/libtest/unit/CMakeLists.txt
+++ b/libminifi/test/libtest/unit/CMakeLists.txt
@@ -18,7 +18,7 @@
#
file(GLOB TEST_BASE_SOURCES "*.cpp")
add_minifi_library(libminifi-unittest STATIC ${TEST_BASE_SOURCES})
-target_link_libraries(libminifi-unittest core-minifi minifi-extension-utils Catch2WithMain)
+target_link_libraries(libminifi-unittest core-minifi minifi-extension-framework Catch2WithMain)
target_include_directories(libminifi-unittest BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/include/")
if(WIN32)
target_include_directories(libminifi-unittest BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/opsys/win")
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
deleted file mode 100644
index b789969a4..000000000
--- a/utils/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-file(GLOB SOURCES
- src/*.cpp
- src/core/*.cpp
- src/core/extension/*.cpp
- src/io/*.cpp
- src/http/*.cpp
- src/utils/*.cpp
- src/utils/crypto/*.cpp
- src/utils/crypto/ciphers/*.cpp
- src/utils/crypto/property_encryption/*.cpp
- src/utils/net/*.cpp
- src/utils/file/*.cpp)
-
-add_minifi_library(minifi-utils STATIC ${SOURCES})
-target_include_directories(minifi-utils PUBLIC include)
-target_link_libraries(minifi-utils PUBLIC minifi-api ZLIB::ZLIB concurrentqueue RapidJSON spdlog Threads::Threads gsl-lite libsodium range-v3 expected-lite date::date date::tz asio magic_enum OpenSSL::Crypto OpenSSL::SSL CURL::libcurl RapidJSON)
-if(NOT WIN32)
- target_link_libraries(minifi-utils PUBLIC OSSP::libuuid++)
-endif()
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
- target_link_libraries(minifi-utils PUBLIC stdc++fs)
-endif()