# HG changeset patch # User Sebastien Jodogne # Date 1591817251 -7200 # Node ID 05b8fd21089c68c5450d042e803838c6d8a1100e # Parent d25f4c0fa1608baded202f42177de0edec3302be fix path diff -r d25f4c0fa160 -r 05b8fd21089c CMakeLists.txt --- a/CMakeLists.txt Wed Jun 10 20:30:34 2020 +0200 +++ b/CMakeLists.txt Wed Jun 10 21:27:31 2020 +0200 @@ -7,7 +7,7 @@ ## Generic parameters of the Orthanc framework ##################################################################### -include(${CMAKE_SOURCE_DIR}/Resources/CMake/OrthancFrameworkParameters.cmake) +include(${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake) # Enable all the optional components of the Orthanc framework set(ENABLE_CRYPTO_OPTIONS ON) @@ -46,8 +46,8 @@ ## Configuration of the Orthanc framework ##################################################################### -include(${CMAKE_SOURCE_DIR}/Resources/CMake/VisualStudioPrecompiledHeaders.cmake) -include(${CMAKE_SOURCE_DIR}/Resources/CMake/OrthancFrameworkConfiguration.cmake) +include(${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/CMake/VisualStudioPrecompiledHeaders.cmake) +include(${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake) ##################################################################### @@ -55,103 +55,106 @@ ##################################################################### set(ORTHANC_SERVER_SOURCES - OrthancServer/Database/Compatibility/DatabaseLookup.cpp - OrthancServer/Database/Compatibility/ICreateInstance.cpp - OrthancServer/Database/Compatibility/IGetChildrenMetadata.cpp - OrthancServer/Database/Compatibility/ILookupResourceAndParent.cpp - OrthancServer/Database/Compatibility/ILookupResources.cpp - OrthancServer/Database/Compatibility/SetOfResources.cpp - OrthancServer/Database/ResourcesContent.cpp - OrthancServer/Database/SQLiteDatabaseWrapper.cpp - OrthancServer/DicomInstanceOrigin.cpp - OrthancServer/DicomInstanceToStore.cpp - OrthancServer/EmbeddedResourceHttpHandler.cpp - OrthancServer/ExportedResource.cpp - OrthancServer/LuaScripting.cpp - OrthancServer/OrthancConfiguration.cpp - OrthancServer/OrthancFindRequestHandler.cpp - OrthancServer/OrthancGetRequestHandler.cpp - OrthancServer/OrthancHttpHandler.cpp - OrthancServer/OrthancInitialization.cpp - OrthancServer/OrthancMoveRequestHandler.cpp - OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp - OrthancServer/OrthancRestApi/OrthancRestApi.cpp - OrthancServer/OrthancRestApi/OrthancRestArchive.cpp - OrthancServer/OrthancRestApi/OrthancRestChanges.cpp - OrthancServer/OrthancRestApi/OrthancRestModalities.cpp - OrthancServer/OrthancRestApi/OrthancRestResources.cpp - OrthancServer/OrthancRestApi/OrthancRestSystem.cpp - OrthancServer/QueryRetrieveHandler.cpp - OrthancServer/Search/DatabaseConstraint.cpp - OrthancServer/Search/DatabaseLookup.cpp - OrthancServer/Search/DicomTagConstraint.cpp - OrthancServer/Search/HierarchicalMatcher.cpp - OrthancServer/Search/ISqlLookupFormatter.cpp - OrthancServer/ServerContext.cpp - OrthancServer/ServerEnumerations.cpp - OrthancServer/ServerIndex.cpp - OrthancServer/ServerJobs/ArchiveJob.cpp - OrthancServer/ServerJobs/CleaningInstancesJob.cpp - OrthancServer/ServerJobs/DicomModalityStoreJob.cpp - OrthancServer/ServerJobs/DicomMoveScuJob.cpp - OrthancServer/ServerJobs/LuaJobManager.cpp - OrthancServer/ServerJobs/MergeStudyJob.cpp - OrthancServer/ServerJobs/Operations/DeleteResourceOperation.cpp - OrthancServer/ServerJobs/Operations/DicomInstanceOperationValue.cpp - OrthancServer/ServerJobs/Operations/ModifyInstanceOperation.cpp - OrthancServer/ServerJobs/Operations/StorePeerOperation.cpp - OrthancServer/ServerJobs/Operations/StoreScuOperation.cpp - OrthancServer/ServerJobs/Operations/SystemCallOperation.cpp - OrthancServer/ServerJobs/OrthancJobUnserializer.cpp - OrthancServer/ServerJobs/OrthancPeerStoreJob.cpp - OrthancServer/ServerJobs/ResourceModificationJob.cpp - OrthancServer/ServerJobs/SplitStudyJob.cpp - OrthancServer/ServerJobs/StorageCommitmentScpJob.cpp - OrthancServer/ServerToolbox.cpp - OrthancServer/SliceOrdering.cpp - OrthancServer/StorageCommitmentReports.cpp + OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp + OrthancServer/Sources/Database/Compatibility/ICreateInstance.cpp + OrthancServer/Sources/Database/Compatibility/IGetChildrenMetadata.cpp + OrthancServer/Sources/Database/Compatibility/ILookupResourceAndParent.cpp + OrthancServer/Sources/Database/Compatibility/ILookupResources.cpp + OrthancServer/Sources/Database/Compatibility/SetOfResources.cpp + OrthancServer/Sources/Database/ResourcesContent.cpp + OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp + OrthancServer/Sources/DicomInstanceOrigin.cpp + OrthancServer/Sources/DicomInstanceToStore.cpp + OrthancServer/Sources/EmbeddedResourceHttpHandler.cpp + OrthancServer/Sources/ExportedResource.cpp + OrthancServer/Sources/LuaScripting.cpp + OrthancServer/Sources/OrthancConfiguration.cpp + OrthancServer/Sources/OrthancFindRequestHandler.cpp + OrthancServer/Sources/OrthancGetRequestHandler.cpp + OrthancServer/Sources/OrthancHttpHandler.cpp + OrthancServer/Sources/OrthancInitialization.cpp + OrthancServer/Sources/OrthancMoveRequestHandler.cpp + OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp + OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp + OrthancServer/Sources/OrthancRestApi/OrthancRestArchive.cpp + OrthancServer/Sources/OrthancRestApi/OrthancRestChanges.cpp + OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp + OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp + OrthancServer/Sources/OrthancRestApi/OrthancRestSystem.cpp + OrthancServer/Sources/QueryRetrieveHandler.cpp + OrthancServer/Sources/Search/DatabaseConstraint.cpp + OrthancServer/Sources/Search/DatabaseLookup.cpp + OrthancServer/Sources/Search/DicomTagConstraint.cpp + OrthancServer/Sources/Search/HierarchicalMatcher.cpp + OrthancServer/Sources/Search/ISqlLookupFormatter.cpp + OrthancServer/Sources/ServerContext.cpp + OrthancServer/Sources/ServerEnumerations.cpp + OrthancServer/Sources/ServerIndex.cpp + OrthancServer/Sources/ServerJobs/ArchiveJob.cpp + OrthancServer/Sources/ServerJobs/CleaningInstancesJob.cpp + OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp + OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp + OrthancServer/Sources/ServerJobs/LuaJobManager.cpp + OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp + OrthancServer/Sources/ServerJobs/Operations/DeleteResourceOperation.cpp + OrthancServer/Sources/ServerJobs/Operations/DicomInstanceOperationValue.cpp + OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.cpp + OrthancServer/Sources/ServerJobs/Operations/StorePeerOperation.cpp + OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.cpp + OrthancServer/Sources/ServerJobs/Operations/SystemCallOperation.cpp + OrthancServer/Sources/ServerJobs/OrthancJobUnserializer.cpp + OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp + OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp + OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp + OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp + OrthancServer/Sources/ServerToolbox.cpp + OrthancServer/Sources/SliceOrdering.cpp + OrthancServer/Sources/StorageCommitmentReports.cpp ) -set(ORTHANC_UNIT_TESTS_SOURCES - UnitTestsSources/DatabaseLookupTests.cpp - UnitTestsSources/DicomMapTests.cpp - UnitTestsSources/FileStorageTests.cpp - UnitTestsSources/FrameworkTests.cpp - UnitTestsSources/FromDcmtkTests.cpp - UnitTestsSources/ImageProcessingTests.cpp - UnitTestsSources/ImageTests.cpp - UnitTestsSources/JpegLosslessTests.cpp - UnitTestsSources/LoggingTests.cpp - UnitTestsSources/LuaTests.cpp - UnitTestsSources/MemoryCacheTests.cpp - UnitTestsSources/MultiThreadingTests.cpp - UnitTestsSources/RestApiTests.cpp - UnitTestsSources/SQLiteChromiumTests.cpp - UnitTestsSources/SQLiteTests.cpp - UnitTestsSources/ServerIndexTests.cpp - UnitTestsSources/StreamTests.cpp - UnitTestsSources/ToolboxTests.cpp - UnitTestsSources/UnitTestsMain.cpp - UnitTestsSources/VersionsTests.cpp - UnitTestsSources/ZipTests.cpp +set(ORTHANC_FRAMEWORK_UNIT_TESTS + OrthancFramework/UnitTestsSources/FrameworkTests.cpp + OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp + OrthancFramework/UnitTestsSources/JpegLosslessTests.cpp + OrthancFramework/UnitTestsSources/LoggingTests.cpp + OrthancFramework/UnitTestsSources/RestApiTests.cpp + OrthancFramework/UnitTestsSources/SQLiteChromiumTests.cpp + OrthancFramework/UnitTestsSources/SQLiteTests.cpp + OrthancFramework/UnitTestsSources/StreamTests.cpp + OrthancFramework/UnitTestsSources/ToolboxTests.cpp + OrthancFramework/UnitTestsSources/ZipTests.cpp + ) + +set(ORTHANC_SERVER_UNIT_TESTS + OrthancServer/UnitTestsSources/DatabaseLookupTests.cpp + OrthancServer/UnitTestsSources/DicomMapTests.cpp + OrthancServer/UnitTestsSources/FileStorageTests.cpp + OrthancServer/UnitTestsSources/FromDcmtkTests.cpp + OrthancServer/UnitTestsSources/ImageTests.cpp + OrthancServer/UnitTestsSources/LuaTests.cpp + OrthancServer/UnitTestsSources/MemoryCacheTests.cpp + OrthancServer/UnitTestsSources/MultiThreadingTests.cpp + OrthancServer/UnitTestsSources/ServerIndexTests.cpp + OrthancServer/UnitTestsSources/UnitTestsMain.cpp + OrthancServer/UnitTestsSources/VersionsTests.cpp ) if (ENABLE_PLUGINS) - include_directories(${CMAKE_SOURCE_DIR}/Plugins/Include) + include_directories(${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Include) list(APPEND ORTHANC_SERVER_SOURCES - Plugins/Engine/OrthancPluginDatabase.cpp - Plugins/Engine/OrthancPlugins.cpp - Plugins/Engine/PluginsEnumerations.cpp - Plugins/Engine/PluginsErrorDictionary.cpp - Plugins/Engine/PluginsJob.cpp - Plugins/Engine/PluginsManager.cpp + OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp + OrthancServer/Plugins/Engine/OrthancPlugins.cpp + OrthancServer/Plugins/Engine/PluginsEnumerations.cpp + OrthancServer/Plugins/Engine/PluginsErrorDictionary.cpp + OrthancServer/Plugins/Engine/PluginsJob.cpp + OrthancServer/Plugins/Engine/PluginsManager.cpp ) - list(APPEND ORTHANC_UNIT_TESTS_SOURCES - UnitTestsSources/PluginsTests.cpp + list(APPEND ORTHANC_SERVER_UNIT_TESTS + OrthancServer/UnitTestsSources/PluginsTests.cpp ) endif() @@ -165,11 +168,12 @@ ${ORTHANC_CORE_SOURCES_INTERNAL} ${ORTHANC_DICOM_SOURCES_INTERNAL} ${ORTHANC_SERVER_SOURCES} - ${ORTHANC_UNIT_TESTS_SOURCES} - ${ORTHANC_ROOT}/Core/HttpServer/EmbeddedResourceHttpHandler.cpp - Plugins/Samples/ServeFolders/Plugin.cpp - Plugins/Samples/ModalityWorklists/Plugin.cpp - OrthancServer/main.cpp + ${ORTHANC_FRAMEWORK_UNIT_TESTS} + ${ORTHANC_SERVER_UNIT_TESTS} + ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp + ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp + ${ORTHANC_ROOT}/OrthancServer/Sources/EmbeddedResourceHttpHandler.cpp + ${ORTHANC_ROOT}/OrthancServer/Sources/main.cpp ) set_source_files_properties(${ORTHANC_ALL_SOURCES} @@ -183,16 +187,16 @@ ##################################################################### set(ORTHANC_EMBEDDED_FILES - CONFIGURATION_SAMPLE ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Configuration.json - DICOM_CONFORMANCE_STATEMENT ${CMAKE_CURRENT_SOURCE_DIR}/Resources/DicomConformanceStatement.txt - FONT_UBUNTU_MONO_BOLD_16 ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Fonts/UbuntuMonoBold-16.json - LUA_TOOLBOX ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Toolbox.lua - PREPARE_DATABASE ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/PrepareDatabase.sql - UPGRADE_DATABASE_3_TO_4 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/Upgrade3To4.sql - UPGRADE_DATABASE_4_TO_5 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/Upgrade4To5.sql + CONFIGURATION_SAMPLE ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Resources/Configuration.json + DICOM_CONFORMANCE_STATEMENT ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Resources/DicomConformanceStatement.txt + FONT_UBUNTU_MONO_BOLD_16 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancFramework/Resources/Fonts/UbuntuMonoBold-16.json + LUA_TOOLBOX ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Resources/Toolbox.lua + PREPARE_DATABASE ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Sources/Database/PrepareDatabase.sql + UPGRADE_DATABASE_3_TO_4 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Sources/Database/Upgrade3To4.sql + UPGRADE_DATABASE_4_TO_5 ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Sources/Database/Upgrade4To5.sql INSTALL_TRACK_ATTACHMENTS_SIZE - ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Database/InstallTrackAttachmentsSize.sql + ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/Sources/Database/InstallTrackAttachmentsSize.sql ) if (STANDALONE_BUILD) @@ -202,7 +206,7 @@ ) list(APPEND ORTHANC_EMBEDDED_FILES - ORTHANC_EXPLORER ${CMAKE_CURRENT_SOURCE_DIR}/OrthancExplorer + ORTHANC_EXPLORER ${CMAKE_CURRENT_SOURCE_DIR}/OrthancServer/OrthancExplorer ) else() add_definitions( @@ -214,7 +218,7 @@ EmbedResources( --namespace=Orthanc.ServerResources --target=OrthancServerResources - --framework-path=${CMAKE_SOURCE_DIR}/Core + --framework-path=${CMAKE_SOURCE_DIR}/OrthancFramework/Sources ${ORTHANC_EMBEDDED_FILES} ) @@ -284,12 +288,12 @@ TMP ORTHANC_CORE_PCH) ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( - "PrecompiledHeadersServer.h" "OrthancServer/PrecompiledHeadersServer.cpp" + "PrecompiledHeadersServer.h" "OrthancServer/Sources/PrecompiledHeadersServer.cpp" ORTHANC_SERVER_SOURCES ORTHANC_SERVER_PCH) ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS( "PrecompiledHeadersUnitTests.h" "UnitTestsSources/PrecompiledHeadersUnitTests.cpp" - ORTHANC_UNIT_TESTS_SOURCES ORTHANC_UNIT_TESTS_PCH) + ORTHANC_SERVER_UNIT_TESTS ORTHANC_UNIT_TESTS_PCH) endif() @@ -327,7 +331,7 @@ add_dependencies(ServerLibrary CoreLibrary) add_executable(Orthanc - OrthancServer/main.cpp + OrthancServer/Sources/main.cpp ${ORTHANC_RESOURCES} ) @@ -346,7 +350,8 @@ add_executable(UnitTests ${GOOGLE_TEST_SOURCES} ${ORTHANC_UNIT_TESTS_PCH} - ${ORTHANC_UNIT_TESTS_SOURCES} + ${ORTHANC_FRAMEWORK_UNIT_TESTS} + ${ORTHANC_SERVER_UNIT_TESTS} ${BOOST_EXTENDED_SOURCES} ) @@ -369,7 +374,7 @@ ${JSONCPP_SOURCES} ${LIBICONV_SOURCES} ${LIBICU_SOURCES} - Plugins/Samples/Common/OrthancPluginCppWrapper.cpp + OrthancServer/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp ) if (LIBICU_LIBRARIES) @@ -407,7 +412,7 @@ endif() add_library(ServeFolders SHARED - Plugins/Samples/ServeFolders/Plugin.cpp + ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp ${SERVE_FOLDERS_RESOURCES} ) @@ -450,7 +455,7 @@ endif() add_library(ModalityWorklists SHARED - Plugins/Samples/ModalityWorklists/Plugin.cpp + ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp ${MODALITY_WORKLISTS_RESOURCES} ) @@ -494,7 +499,7 @@ endif() externalproject_add(ConnectivityChecks - SOURCE_DIR "${ORTHANC_ROOT}/Plugins/Samples/ConnectivityChecks" + SOURCE_DIR "${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ConnectivityChecks" # We explicitly provide a build directory, in order to avoid paths # that are too long on our Visual Studio 2008 CIS @@ -538,7 +543,7 @@ if (BUILD_RECOVER_COMPRESSED_FILE) set(RECOVER_COMPRESSED_SOURCES - Resources/Samples/Tools/RecoverCompressedFile.cpp + ${ORTHANC_ROOT}/OrthancServer/Resources/Samples/Tools/RecoverCompressedFile.cpp ) if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") @@ -579,12 +584,12 @@ find_package(Doxygen) if (DOXYGEN_FOUND) configure_file( - ${CMAKE_SOURCE_DIR}/Resources/Orthanc.doxygen + ${CMAKE_SOURCE_DIR}/OrthancServer/Resources/Orthanc.doxygen ${CMAKE_CURRENT_BINARY_DIR}/Orthanc.doxygen @ONLY) configure_file( - ${CMAKE_SOURCE_DIR}/Resources/OrthancPlugin.doxygen + ${CMAKE_SOURCE_DIR}/OrthancServer/Resources/OrthancPlugin.doxygen ${CMAKE_CURRENT_BINARY_DIR}/OrthancPlugin.doxygen @ONLY) @@ -617,8 +622,8 @@ if (ENABLE_PLUGINS) install( FILES - Plugins/Include/orthanc/OrthancCPlugin.h - Plugins/Include/orthanc/OrthancCDatabasePlugin.h + OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h + OrthancServer/Plugins/Include/orthanc/OrthancCDatabasePlugin.h DESTINATION include/orthanc ) endif() @@ -631,7 +636,7 @@ ##################################################################### configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/Resources/CMake/Uninstall.cmake.in" + "${CMAKE_CURRENT_SOURCE_DIR}/OrthancFramework/Resources/CMake/Uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/BoostConfiguration.cmake --- a/OrthancFramework/Resources/CMake/BoostConfiguration.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/BoostConfiguration.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -86,7 +86,7 @@ execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/boost-${BOOST_VERSION}-linux-standard-base.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/boost-${BOOST_VERSION}-linux-standard-base.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake --- a/OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -26,7 +26,7 @@ execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/civetweb-1.12.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/civetweb-1.12.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/Compiler.cmake --- a/OrthancFramework/Resources/CMake/Compiler.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/Compiler.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -75,7 +75,7 @@ # compatibility header. # http://stackoverflow.com/a/70630/881731 # https://en.wikibooks.org/wiki/C_Programming/C_Reference/stdint.h#External_links - include_directories(${ORTHANC_ROOT}/Resources/ThirdParty/VisualStudio) + include_directories(${ORTHANC_ROOT}/OrthancFramework/Resources/ThirdParty/VisualStudio) endif() link_libraries(netapi32) @@ -109,7 +109,7 @@ if (NOT DEFINED ENABLE_PLUGINS_VERSION_SCRIPT OR ENABLE_PLUGINS_VERSION_SCRIPT) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${ORTHANC_ROOT}/Plugins/Samples/Common/VersionScript.map") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${ORTHANC_ROOT}/OrthancFramework/Resources/VersionScriptPlugins.map") endif() # Remove the "-rdynamic" option diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.0.cmake --- a/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.0.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.0.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -20,7 +20,7 @@ if (USE_DCMTK_362_PRIVATE_DIC) message("Using the dictionary of private tags from DCMTK 3.6.2") configure_file( - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-private.dic + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.2-private.dic ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic COPYONLY) else() @@ -31,7 +31,7 @@ message("Applying patch to solve vulnerability in DCMTK 3.6.0") execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-dulparse-vulnerability.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.0-dulparse-vulnerability.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) @@ -46,7 +46,7 @@ message("Applying patch for speed in DCMTK 3.6.0") execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-speed.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.0-speed.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) @@ -70,7 +70,7 @@ # Check out "../WebAssembly/ArithmeticTests/" to regenerate the # "arith.h" file configure_file( - ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h + ${CMAKE_CURRENT_LIST_DIR}/WebAssembly/arith.h ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h COPYONLY) @@ -89,7 +89,7 @@ execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.2-linux-standard-base.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) @@ -163,7 +163,7 @@ # This is a patch for DCMTK 3.6.0 and MinGW64 execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-mingw64.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.0-mingw64.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.2.cmake --- a/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.2.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.2.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -36,7 +36,7 @@ message("Applying patch to detect mathematic primitives in DCMTK 3.6.2 with C++11") execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.2.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) @@ -46,7 +46,7 @@ endif() configure_file( - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-dcdict_orthanc.cc + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-dcdict_orthanc.cc ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc COPYONLY) else() @@ -65,7 +65,7 @@ # Check out "../WebAssembly/ArithmeticTests/" to regenerate the # "arith.h" file configure_file( - ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h + ${CMAKE_CURRENT_LIST_DIR}/WebAssembly/arith.h ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h COPYONLY) @@ -85,7 +85,7 @@ if (FirstRun) execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.2-linux-standard-base.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake --- a/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ # Apply the patches execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.4.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.4.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) @@ -44,7 +44,7 @@ endif() configure_file( - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-dcdict_orthanc.cc + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-dcdict_orthanc.cc ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc COPYONLY) else() @@ -68,7 +68,7 @@ # Check out "../WebAssembly/ArithmeticTests/" to regenerate the # "arith.h" file configure_file( - ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h + ${CMAKE_CURRENT_LIST_DIR}/WebAssembly/arith.h ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h COPYONLY) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake --- a/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ # Apply the patches execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.5.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.5.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) @@ -44,7 +44,7 @@ endif() configure_file( - ${ORTHANC_ROOT}/Resources/Patches/dcmtk-dcdict_orthanc.cc + ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-dcdict_orthanc.cc ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc COPYONLY) else() @@ -68,7 +68,7 @@ # Check out "../WebAssembly/ArithmeticTests/" to regenerate the # "arith.h" file configure_file( - ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h + ${CMAKE_CURRENT_LIST_DIR}/WebAssembly/arith.h ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h COPYONLY) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake --- a/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -14,7 +14,7 @@ if (FirstRun) execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/curl-7.64.0-cmake.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/curl-7.64.0-cmake.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/MongooseConfiguration.cmake --- a/OrthancFramework/Resources/CMake/MongooseConfiguration.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/MongooseConfiguration.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -15,7 +15,7 @@ "${MONGOOSE_SOURCES_DIR}") add_definitions(-DMONGOOSE_USE_CALLBACKS=0) - set(MONGOOSE_PATCH ${ORTHANC_ROOT}/Resources/Patches/mongoose-3.1-patch.diff) + set(MONGOOSE_PATCH ${CMAKE_CURRENT_LIST_DIR}/../Patches/mongoose-3.1-patch.diff) else() # Use Mongoose 3.8 @@ -25,7 +25,7 @@ "${MONGOOSE_SOURCES_DIR}") add_definitions(-DMONGOOSE_USE_CALLBACKS=1) - set(MONGOOSE_PATCH ${ORTHANC_ROOT}/Resources/Patches/mongoose-3.8-patch.diff) + set(MONGOOSE_PATCH ${CMAKE_CURRENT_LIST_DIR}/../Patches/mongoose-3.8-patch.diff) endif() # Patch mongoose diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-1.1.1.cmake --- a/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-1.1.1.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-1.1.1.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -20,14 +20,14 @@ file(WRITE ${OPENSSL_SOURCES_DIR}/crypto/dso_conf.h "") configure_file( - ${ORTHANC_ROOT}/Resources/Patches/openssl-1.1.1-conf.h.in + ${CMAKE_CURRENT_LIST_DIR}/../Patches/openssl-1.1.1-conf.h.in ${OPENSSL_SOURCES_DIR}/include/openssl/opensslconf.h ) # Apply the patches execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/openssl-1.1.1g.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/openssl-1.1.1g.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake --- a/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -12,7 +12,7 @@ ##################################################################### # Path to the root folder of the Orthanc distribution -set(ORTHANC_ROOT ${CMAKE_CURRENT_LIST_DIR}/../..) +set(ORTHANC_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../..) # Some basic inclusions include(CMakePushCheckState) @@ -126,59 +126,59 @@ ##################################################################### set(ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/Cache/MemoryCache.cpp - ${ORTHANC_ROOT}/Core/Cache/MemoryObjectCache.cpp - ${ORTHANC_ROOT}/Core/Cache/MemoryStringCache.cpp - ${ORTHANC_ROOT}/Core/ChunkedBuffer.cpp - ${ORTHANC_ROOT}/Core/DicomFormat/DicomTag.cpp - ${ORTHANC_ROOT}/Core/EnumerationDictionary.h - ${ORTHANC_ROOT}/Core/Enumerations.cpp - ${ORTHANC_ROOT}/Core/FileStorage/MemoryStorageArea.cpp - ${ORTHANC_ROOT}/Core/HttpServer/MultipartStreamReader.cpp - ${ORTHANC_ROOT}/Core/HttpServer/StringMatcher.cpp - ${ORTHANC_ROOT}/Core/Logging.cpp - ${ORTHANC_ROOT}/Core/OrthancFramework.cpp - ${ORTHANC_ROOT}/Core/SerializationToolbox.cpp - ${ORTHANC_ROOT}/Core/Toolbox.cpp - ${ORTHANC_ROOT}/Core/WebServiceParameters.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Cache/MemoryCache.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Cache/MemoryObjectCache.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Cache/MemoryStringCache.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/ChunkedBuffer.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomTag.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/EnumerationDictionary.h + ${ORTHANC_ROOT}/OrthancFramework/Sources/Enumerations.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/FileStorage/MemoryStorageArea.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/MultipartStreamReader.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/StringMatcher.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Logging.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/OrthancFramework.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/SerializationToolbox.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Toolbox.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/WebServiceParameters.cpp ) if (ENABLE_MODULE_IMAGES) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/Images/Font.cpp - ${ORTHANC_ROOT}/Core/Images/FontRegistry.cpp - ${ORTHANC_ROOT}/Core/Images/IImageWriter.cpp - ${ORTHANC_ROOT}/Core/Images/Image.cpp - ${ORTHANC_ROOT}/Core/Images/ImageAccessor.cpp - ${ORTHANC_ROOT}/Core/Images/ImageBuffer.cpp - ${ORTHANC_ROOT}/Core/Images/ImageProcessing.cpp - ${ORTHANC_ROOT}/Core/Images/PamReader.cpp - ${ORTHANC_ROOT}/Core/Images/PamWriter.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/Font.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/FontRegistry.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/IImageWriter.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/Image.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/ImageAccessor.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/ImageBuffer.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/ImageProcessing.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/PamReader.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/PamWriter.cpp ) endif() if (ENABLE_MODULE_DICOM) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/DicomFormat/DicomArray.cpp - ${ORTHANC_ROOT}/Core/DicomFormat/DicomImageInformation.cpp - ${ORTHANC_ROOT}/Core/DicomFormat/DicomInstanceHasher.cpp - ${ORTHANC_ROOT}/Core/DicomFormat/DicomIntegerPixelAccessor.cpp - ${ORTHANC_ROOT}/Core/DicomFormat/DicomMap.cpp - ${ORTHANC_ROOT}/Core/DicomFormat/DicomValue.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomArray.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomImageInformation.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomInstanceHasher.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomIntegerPixelAccessor.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomMap.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomFormat/DicomValue.cpp ) endif() if (ENABLE_MODULE_JOBS) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/JobsEngine/GenericJobUnserializer.cpp - ${ORTHANC_ROOT}/Core/JobsEngine/JobInfo.cpp - ${ORTHANC_ROOT}/Core/JobsEngine/JobStatus.cpp - ${ORTHANC_ROOT}/Core/JobsEngine/JobStepResult.cpp - ${ORTHANC_ROOT}/Core/JobsEngine/Operations/JobOperationValues.cpp - ${ORTHANC_ROOT}/Core/JobsEngine/Operations/LogJobOperation.cpp - ${ORTHANC_ROOT}/Core/JobsEngine/Operations/SequenceOfOperationsJob.cpp - ${ORTHANC_ROOT}/Core/JobsEngine/SetOfCommandsJob.cpp - ${ORTHANC_ROOT}/Core/JobsEngine/SetOfInstancesJob.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/GenericJobUnserializer.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/JobInfo.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/JobStatus.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/JobStepResult.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/Operations/JobOperationValues.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/Operations/LogJobOperation.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/SetOfCommandsJob.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.cpp ) endif() @@ -198,12 +198,12 @@ add_definitions(-DORTHANC_ENABLE_SQLITE=1) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/SQLite/Connection.cpp - ${ORTHANC_ROOT}/Core/SQLite/FunctionContext.cpp - ${ORTHANC_ROOT}/Core/SQLite/Statement.cpp - ${ORTHANC_ROOT}/Core/SQLite/StatementId.cpp - ${ORTHANC_ROOT}/Core/SQLite/StatementReference.cpp - ${ORTHANC_ROOT}/Core/SQLite/Transaction.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/Connection.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/FunctionContext.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/Statement.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/StatementId.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/StatementReference.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/SQLite/Transaction.cpp ) endif() @@ -229,7 +229,7 @@ add_definitions(-DORTHANC_ENABLE_PKCS11=1) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/Pkcs11.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Pkcs11.cpp ) else() message(FATAL_ERROR "OpenSSL is required to enable PKCS#11 support") @@ -249,7 +249,7 @@ add_definitions(-DORTHANC_ENABLE_CURL=1) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/HttpClient.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpClient.cpp ) endif() @@ -271,22 +271,22 @@ endif() list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/HttpServer/BufferHttpSender.cpp - ${ORTHANC_ROOT}/Core/HttpServer/FilesystemHttpHandler.cpp - ${ORTHANC_ROOT}/Core/HttpServer/FilesystemHttpSender.cpp - ${ORTHANC_ROOT}/Core/HttpServer/HttpContentNegociation.cpp - ${ORTHANC_ROOT}/Core/HttpServer/HttpFileSender.cpp - ${ORTHANC_ROOT}/Core/HttpServer/HttpOutput.cpp - ${ORTHANC_ROOT}/Core/HttpServer/HttpServer.cpp - ${ORTHANC_ROOT}/Core/HttpServer/HttpStreamTranscoder.cpp - ${ORTHANC_ROOT}/Core/HttpServer/HttpToolbox.cpp - ${ORTHANC_ROOT}/Core/HttpServer/StringHttpOutput.cpp - ${ORTHANC_ROOT}/Core/RestApi/RestApi.cpp - ${ORTHANC_ROOT}/Core/RestApi/RestApiCall.cpp - ${ORTHANC_ROOT}/Core/RestApi/RestApiGetCall.cpp - ${ORTHANC_ROOT}/Core/RestApi/RestApiHierarchy.cpp - ${ORTHANC_ROOT}/Core/RestApi/RestApiOutput.cpp - ${ORTHANC_ROOT}/Core/RestApi/RestApiPath.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/BufferHttpSender.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/FilesystemHttpHandler.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/FilesystemHttpSender.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpContentNegociation.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpFileSender.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpOutput.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpServer.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpStreamTranscoder.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/HttpToolbox.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/HttpServer/StringHttpOutput.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApi.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApiCall.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApiGetCall.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApiHierarchy.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApiOutput.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/RestApi/RestApiPath.cpp ) endif() @@ -317,9 +317,9 @@ add_definitions(-DORTHANC_ENABLE_JPEG=1) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/Images/JpegErrorManager.cpp - ${ORTHANC_ROOT}/Core/Images/JpegReader.cpp - ${ORTHANC_ROOT}/Core/Images/JpegWriter.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/JpegErrorManager.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/JpegReader.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/JpegWriter.cpp ) endif() @@ -333,16 +333,16 @@ add_definitions(-DORTHANC_ENABLE_ZLIB=1) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/Compression/DeflateBaseCompressor.cpp - ${ORTHANC_ROOT}/Core/Compression/GzipCompressor.cpp - ${ORTHANC_ROOT}/Core/Compression/ZlibCompressor.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Compression/DeflateBaseCompressor.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Compression/GzipCompressor.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Compression/ZlibCompressor.cpp ) if (NOT ORTHANC_SANDBOXED) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/Compression/HierarchicalZipWriter.cpp - ${ORTHANC_ROOT}/Core/Compression/ZipWriter.cpp - ${ORTHANC_ROOT}/Core/FileStorage/StorageAccessor.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Compression/HierarchicalZipWriter.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Compression/ZipWriter.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/FileStorage/StorageAccessor.cpp ) endif() endif() @@ -365,8 +365,8 @@ add_definitions(-DORTHANC_ENABLE_PNG=1) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/Images/PngReader.cpp - ${ORTHANC_ROOT}/Core/Images/PngWriter.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/PngReader.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Images/PngWriter.cpp ) endif() @@ -380,8 +380,8 @@ add_definitions(-DORTHANC_ENABLE_LUA=1) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/Lua/LuaContext.cpp - ${ORTHANC_ROOT}/Core/Lua/LuaFunctionCall.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Lua/LuaContext.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Lua/LuaFunctionCall.cpp ) endif() @@ -475,39 +475,39 @@ endif() set(ORTHANC_DICOM_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/DicomParsing/DicomModification.cpp - ${ORTHANC_ROOT}/Core/DicomParsing/DicomWebJsonVisitor.cpp - ${ORTHANC_ROOT}/Core/DicomParsing/FromDcmtkBridge.cpp - ${ORTHANC_ROOT}/Core/DicomParsing/ParsedDicomDir.cpp - ${ORTHANC_ROOT}/Core/DicomParsing/ParsedDicomFile.cpp - ${ORTHANC_ROOT}/Core/DicomParsing/ToDcmtkBridge.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/DicomModification.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/DicomWebJsonVisitor.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/ParsedDicomDir.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/ParsedDicomFile.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/ToDcmtkBridge.cpp - ${ORTHANC_ROOT}/Core/DicomParsing/Internals/DicomFrameIndex.cpp - ${ORTHANC_ROOT}/Core/DicomParsing/Internals/DicomImageDecoder.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/Internals/DicomFrameIndex.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp ) if (NOT ORTHANC_SANDBOXED) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/DicomParsing/DicomDirWriter.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/DicomDirWriter.cpp ) endif() if (ENABLE_DCMTK_NETWORKING) add_definitions(-DORTHANC_ENABLE_DCMTK_NETWORKING=1) list(APPEND ORTHANC_DICOM_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/DicomNetworking/DicomAssociation.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/DicomAssociationParameters.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/DicomControlUserConnection.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/DicomFindAnswers.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/DicomServer.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/DicomStoreUserConnection.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/Internals/CommandDispatcher.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/Internals/FindScp.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/Internals/MoveScp.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/Internals/GetScp.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/Internals/StoreScp.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/RemoteModalityParameters.cpp - ${ORTHANC_ROOT}/Core/DicomNetworking/TimeoutDicomConnectionManager.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomAssociationParameters.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomFindAnswers.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomServer.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/Internals/FindScp.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/Internals/MoveScp.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/Internals/GetScp.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/Internals/StoreScp.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomNetworking/TimeoutDicomConnectionManager.cpp ) else() add_definitions(-DORTHANC_ENABLE_DCMTK_NETWORKING=0) @@ -517,9 +517,9 @@ if (ENABLE_DCMTK_TRANSCODING) add_definitions(-DORTHANC_ENABLE_DCMTK_TRANSCODING=1) list(APPEND ORTHANC_DICOM_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/DicomParsing/DcmtkTranscoder.cpp - ${ORTHANC_ROOT}/Core/DicomParsing/IDicomTranscoder.cpp - ${ORTHANC_ROOT}/Core/DicomParsing/MemoryBufferTranscoder.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/DcmtkTranscoder.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/IDicomTranscoder.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/DicomParsing/MemoryBufferTranscoder.cpp ) else() add_definitions(-DORTHANC_ENABLE_DCMTK_TRANSCODING=0) @@ -570,22 +570,22 @@ ) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/Cache/SharedArchive.cpp - ${ORTHANC_ROOT}/Core/FileBuffer.cpp - ${ORTHANC_ROOT}/Core/FileStorage/FilesystemStorage.cpp - ${ORTHANC_ROOT}/Core/MetricsRegistry.cpp - ${ORTHANC_ROOT}/Core/MultiThreading/RunnableWorkersPool.cpp - ${ORTHANC_ROOT}/Core/MultiThreading/Semaphore.cpp - ${ORTHANC_ROOT}/Core/MultiThreading/SharedMessageQueue.cpp - ${ORTHANC_ROOT}/Core/SharedLibrary.cpp - ${ORTHANC_ROOT}/Core/SystemToolbox.cpp - ${ORTHANC_ROOT}/Core/TemporaryFile.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Cache/SharedArchive.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/FileBuffer.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/FileStorage/FilesystemStorage.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/MetricsRegistry.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/MultiThreading/RunnableWorkersPool.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/MultiThreading/Semaphore.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/MultiThreading/SharedMessageQueue.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/SharedLibrary.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/SystemToolbox.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/TemporaryFile.cpp ) if (ENABLE_MODULE_JOBS) list(APPEND ORTHANC_CORE_SOURCES_INTERNAL - ${ORTHANC_ROOT}/Core/JobsEngine/JobsEngine.cpp - ${ORTHANC_ROOT}/Core/JobsEngine/JobsRegistry.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/JobsEngine.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/JobsEngine/JobsRegistry.cpp ) endif() endif() @@ -663,15 +663,15 @@ ${UUID_SOURCES} ${ZLIB_SOURCES} - ${ORTHANC_ROOT}/Resources/ThirdParty/md5/md5.c - ${ORTHANC_ROOT}/Resources/ThirdParty/base64/base64.cpp + ${ORTHANC_ROOT}/OrthancFramework/Resources/ThirdParty/md5/md5.c + ${ORTHANC_ROOT}/OrthancFramework/Resources/ThirdParty/base64/base64.cpp ) if (ENABLE_ZLIB AND NOT ORTHANC_SANDBOXED) list(APPEND ORTHANC_CORE_SOURCES_DEPENDENCIES # This is the minizip distribution to create ZIP files using zlib - ${ORTHANC_ROOT}/Resources/ThirdParty/minizip/ioapi.c - ${ORTHANC_ROOT}/Resources/ThirdParty/minizip/zip.c + ${ORTHANC_ROOT}/OrthancFramework/Resources/ThirdParty/minizip/ioapi.c + ${ORTHANC_ROOT}/OrthancFramework/Resources/ThirdParty/minizip/zip.c ) endif() @@ -681,7 +681,7 @@ EmbedResources( --namespace=Orthanc.FrameworkResources --target=OrthancFrameworkResources - --framework-path=${ORTHANC_ROOT}/Core + --framework-path=${ORTHANC_ROOT}/OrthancFramework/Sources ${LIBICU_RESOURCES} ${DCMTK_DICTIONARIES} ) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/CMake/UuidConfiguration.cmake --- a/OrthancFramework/Resources/CMake/UuidConfiguration.cmake Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/Resources/CMake/UuidConfiguration.cmake Wed Jun 10 21:27:31 2020 +0200 @@ -20,7 +20,7 @@ execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/e2fsprogs-1.44.5-apple.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/e2fsprogs-1.44.5-apple.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/Resources/VersionScriptPlugins.map --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OrthancFramework/Resources/VersionScriptPlugins.map Wed Jun 10 21:27:31 2020 +0200 @@ -0,0 +1,12 @@ +# This is a version-script for Orthanc plugins + +{ +global: + OrthancPluginInitialize; + OrthancPluginFinalize; + OrthancPluginGetName; + OrthancPluginGetVersion; + +local: + *; +}; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/BitbucketCACertificates.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OrthancFramework/UnitTestsSources/BitbucketCACertificates.h Wed Jun 10 21:27:31 2020 +0200 @@ -0,0 +1,25 @@ +#define BITBUCKET_CERTIFICATES \ +"-----BEGIN CERTIFICATE-----\n" \ +"MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs\n" \ +"MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3\n" \ +"d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j\n" \ +"ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL\n" \ +"MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3\n" \ +"LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug\n" \ +"RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm\n" \ +"+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW\n" \ +"PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM\n" \ +"xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB\n" \ +"Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3\n" \ +"hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg\n" \ +"EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF\n" \ +"MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA\n" \ +"FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec\n" \ +"nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z\n" \ +"eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF\n" \ +"hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2\n" \ +"Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe\n" \ +"vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep\n" \ +"+OkuE6N36B9K\n" \ +"-----END CERTIFICATE-----\n" \ +"\n" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/FrameworkTests.cpp --- a/OrthancFramework/UnitTestsSources/FrameworkTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/UnitTestsSources/FrameworkTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,22 +35,21 @@ # include #endif -#include "PrecompiledHeadersUnitTests.h" -#include "../Core/EnumerationDictionary.h" +#include "../Sources/EnumerationDictionary.h" #include "gtest/gtest.h" #include -#include "../Core/DicomFormat/DicomTag.h" -#include "../Core/FileBuffer.h" -#include "../Core/HttpServer/HttpToolbox.h" -#include "../Core/Logging.h" -#include "../Core/MetricsRegistry.h" -#include "../Core/OrthancException.h" -#include "../Core/SystemToolbox.h" -#include "../Core/TemporaryFile.h" -#include "../Core/Toolbox.h" +#include "../Sources/DicomFormat/DicomTag.h" +#include "../Sources/FileBuffer.h" +#include "../Sources/HttpServer/HttpToolbox.h" +#include "../Sources/Logging.h" +#include "../Sources/MetricsRegistry.h" +#include "../Sources/OrthancException.h" +#include "../Sources/SystemToolbox.h" +#include "../Sources/TemporaryFile.h" +#include "../Sources/Toolbox.h" using namespace Orthanc; @@ -824,7 +823,7 @@ } -#include "../Core/Endianness.h" +#include "../Sources/Endianness.h" static void ASSERT_EQ16(uint16_t a, uint16_t b) { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp --- a/OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/UnitTestsSources/ImageProcessingTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,15 +35,14 @@ # include #endif -#include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/Compatibility.h" -#include "../Core/DicomFormat/DicomImageInformation.h" -#include "../Core/Images/Image.h" -#include "../Core/Images/ImageProcessing.h" -#include "../Core/Images/ImageTraits.h" -#include "../Core/OrthancException.h" +#include "../Sources/Compatibility.h" +#include "../Sources/DicomFormat/DicomImageInformation.h" +#include "../Sources/Images/Image.h" +#include "../Sources/Images/ImageProcessing.h" +#include "../Sources/Images/ImageTraits.h" +#include "../Sources/OrthancException.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/JpegLosslessTests.cpp --- a/OrthancFramework/UnitTestsSources/JpegLosslessTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/UnitTestsSources/JpegLosslessTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,19 +35,18 @@ # include #endif -#include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/DicomParsing/Internals/DicomImageDecoder.h" +#include "../Sources/DicomParsing/Internals/DicomImageDecoder.h" #if ORTHANC_ENABLE_JPEG_LOSSLESS == 1 #include -#include "../Core/DicomParsing/ParsedDicomFile.h" -#include "../Core/OrthancException.h" -#include "../Core/Images/ImageBuffer.h" -#include "../Core/Images/PngWriter.h" +#include "../Sources/DicomParsing/ParsedDicomFile.h" +#include "../Sources/OrthancException.h" +#include "../Sources/Images/ImageBuffer.h" +#include "../Sources/Images/PngWriter.h" using namespace Orthanc; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/LoggingTests.cpp --- a/OrthancFramework/UnitTestsSources/LoggingTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/UnitTestsSources/LoggingTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,12 +35,11 @@ # include #endif -#include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" #include #include -#include "../Core/Logging.h" +#include "../Sources/Logging.h" using namespace Orthanc::Logging; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/PluginsTests.cpp --- a/OrthancFramework/UnitTestsSources/PluginsTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,121 +0,0 @@ -/** - * Orthanc - A Lightweight, RESTful DICOM Store - * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics - * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2020 Osimis S.A., Belgium - * - * This program is free software: you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * In addition, as a special exception, the copyright holders of this - * program give permission to link the code of its release with the - * OpenSSL project's "OpenSSL" library (or with modified versions of it - * that use the same license as the "OpenSSL" library), and distribute - * the linked executables. You must obey the GNU General Public License - * in all respects for all of the code used other than "OpenSSL". If you - * modify file(s) with this exception, you may extend this exception to - * your version of the file(s), but you are not obligated to do so. If - * you do not wish to do so, delete this exception statement from your - * version. If you delete this exception statement from all source files - * in the program, then also delete it here. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - **/ - - -#if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1 -# include -#endif - -#include "PrecompiledHeadersUnitTests.h" -#include "gtest/gtest.h" - -#include "../Core/OrthancException.h" -#include "../Plugins/Engine/PluginsManager.h" - -using namespace Orthanc; - - -#if ORTHANC_ENABLE_PLUGINS == 1 - -TEST(SharedLibrary, Enumerations) -{ - // The plugin engine cannot work if the size of an enumeration does - // not correspond to the size of "int32_t" - ASSERT_EQ(sizeof(int32_t), sizeof(OrthancPluginErrorCode)); -} - - -TEST(SharedLibrary, Basic) -{ -#if defined(_WIN32) - SharedLibrary l("kernel32.dll"); - ASSERT_THROW(l.GetFunction("world"), OrthancException); - ASSERT_TRUE(l.GetFunction("GetVersionExW") != NULL); - ASSERT_TRUE(l.HasFunction("GetVersionExW")); - ASSERT_FALSE(l.HasFunction("world")); - -#elif defined(__LSB_VERSION__) - // For Linux Standard Base, we use a low-level shared library coming - // with glibc: - // http://www.linuxfromscratch.org/lfs/view/6.5/chapter06/glibc.html - SharedLibrary l("libSegFault.so"); - ASSERT_THROW(l.GetFunction("world"), OrthancException); - ASSERT_FALSE(l.HasFunction("world")); - - /** - * On the Docker image "debian:buster-slim", the "libSegFault.so" - * library does exist, but does not contain any public symbol: - * - * $ sudo docker run -i -t --rm --entrypoint=bash debian:buster-slim - * # apt-get update && apt-get install -y binutils - * # nm -C /lib/x86_64-linux-gnu/libSegFault.so - * nm: /lib/x86_64-linux-gnu/libSegFault.so: no symbols - * - * As a consequence, this part of the test is disabled since Orthanc - * 1.5.1, until we locate another shared library that is widely - * spread. Reference: - * https://groups.google.com/d/msg/orthanc-users/v-QFzpOzgJY/4Hm5NgxKBwAJ - **/ - - //ASSERT_TRUE(l.GetFunction("_init") != NULL); - //ASSERT_TRUE(l.HasFunction("_init")); - -#elif defined(__linux__) || defined(__FreeBSD_kernel__) - SharedLibrary l("libdl.so"); - ASSERT_THROW(l.GetFunction("world"), OrthancException); - ASSERT_TRUE(l.GetFunction("dlopen") != NULL); - ASSERT_TRUE(l.HasFunction("dlclose")); - ASSERT_FALSE(l.HasFunction("world")); - -#elif defined(__FreeBSD__) || defined(__OpenBSD__) - // dlopen() in FreeBSD/OpenBSD is supplied by libc, libc.so is - // a ldscript, so we can't actually use it. Use thread - // library instead - if it works - dlopen() is good. - SharedLibrary l("libpthread.so"); - ASSERT_THROW(l.GetFunction("world"), OrthancException); - ASSERT_TRUE(l.GetFunction("pthread_create") != NULL); - ASSERT_TRUE(l.HasFunction("pthread_cancel")); - ASSERT_FALSE(l.HasFunction("world")); - -#elif defined(__APPLE__) && defined(__MACH__) - SharedLibrary l("libdl.dylib"); - ASSERT_THROW(l.GetFunction("world"), OrthancException); - ASSERT_TRUE(l.GetFunction("dlopen") != NULL); - ASSERT_TRUE(l.HasFunction("dlclose")); - ASSERT_FALSE(l.HasFunction("world")); - -#else -#error Support your platform here -#endif -} - -#endif diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/RestApiTests.cpp --- a/OrthancFramework/UnitTestsSources/RestApiTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/UnitTestsSources/RestApiTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,23 +35,22 @@ # include #endif -#include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" #include #include #include -#include "../Core/ChunkedBuffer.h" -#include "../Core/HttpClient.h" -#include "../Core/Logging.h" -#include "../Core/SystemToolbox.h" -#include "../Core/RestApi/RestApi.h" -#include "../Core/OrthancException.h" -#include "../Core/Compression/ZlibCompressor.h" -#include "../Core/RestApi/RestApiHierarchy.h" -#include "../Core/HttpServer/HttpContentNegociation.h" -#include "../Core/HttpServer/MultipartStreamReader.h" +#include "../Sources/ChunkedBuffer.h" +#include "../Sources/HttpClient.h" +#include "../Sources/Logging.h" +#include "../Sources/SystemToolbox.h" +#include "../Sources/RestApi/RestApi.h" +#include "../Sources/OrthancException.h" +#include "../Sources/Compression/ZlibCompressor.h" +#include "../Sources/RestApi/RestApiHierarchy.h" +#include "../Sources/HttpServer/HttpContentNegociation.h" +#include "../Sources/HttpServer/MultipartStreamReader.h" using namespace Orthanc; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/SQLiteChromiumTests.cpp --- a/OrthancFramework/UnitTestsSources/SQLiteChromiumTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/UnitTestsSources/SQLiteChromiumTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,13 +35,12 @@ # include #endif -#include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/Toolbox.h" -#include "../Core/SQLite/Connection.h" -#include "../Core/SQLite/Statement.h" -#include "../Core/SQLite/Transaction.h" +#include "../Sources/Toolbox.h" +#include "../Sources/SQLite/Connection.h" +#include "../Sources/SQLite/Statement.h" +#include "../Sources/SQLite/Transaction.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/SQLiteTests.cpp --- a/OrthancFramework/UnitTestsSources/SQLiteTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/UnitTestsSources/SQLiteTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,13 +35,12 @@ # include #endif -#include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/SystemToolbox.h" -#include "../Core/SQLite/Connection.h" -#include "../Core/SQLite/Statement.h" -#include "../Core/SQLite/Transaction.h" +#include "../Sources/SystemToolbox.h" +#include "../Sources/SQLite/Connection.h" +#include "../Sources/SQLite/Statement.h" +#include "../Sources/SQLite/Transaction.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/StreamTests.cpp --- a/OrthancFramework/UnitTestsSources/StreamTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/UnitTestsSources/StreamTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,17 +35,16 @@ # include #endif -#include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/SystemToolbox.h" -#include "../Core/Toolbox.h" -#include "../Core/OrthancException.h" -#include "../Core/HttpServer/BufferHttpSender.h" -#include "../Core/HttpServer/FilesystemHttpSender.h" -#include "../Core/HttpServer/HttpStreamTranscoder.h" -#include "../Core/Compression/ZlibCompressor.h" -#include "../Core/Compression/GzipCompressor.h" +#include "../Sources/SystemToolbox.h" +#include "../Sources/Toolbox.h" +#include "../Sources/OrthancException.h" +#include "../Sources/HttpServer/BufferHttpSender.h" +#include "../Sources/HttpServer/FilesystemHttpSender.h" +#include "../Sources/HttpServer/HttpStreamTranscoder.h" +#include "../Sources/Compression/ZlibCompressor.h" +#include "../Sources/Compression/GzipCompressor.h" using namespace Orthanc; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/ToolboxTests.cpp --- a/OrthancFramework/UnitTestsSources/ToolboxTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/UnitTestsSources/ToolboxTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,12 +35,11 @@ # include #endif -#include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/Compatibility.h" -#include "../Core/IDynamicObject.h" -#include "../Core/OrthancException.h" -#include "../Core/Toolbox.h" +#include "../Sources/Compatibility.h" +#include "../Sources/IDynamicObject.h" +#include "../Sources/OrthancException.h" +#include "../Sources/Toolbox.h" using namespace Orthanc; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancFramework/UnitTestsSources/ZipTests.cpp --- a/OrthancFramework/UnitTestsSources/ZipTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancFramework/UnitTestsSources/ZipTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,13 +35,12 @@ # include #endif -#include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/OrthancException.h" -#include "../Core/Compression/ZipWriter.h" -#include "../Core/Compression/HierarchicalZipWriter.h" -#include "../Core/Toolbox.h" +#include "../Sources/OrthancException.h" +#include "../Sources/Compression/ZipWriter.h" +#include "../Sources/Compression/HierarchicalZipWriter.h" +#include "../Sources/Toolbox.h" using namespace Orthanc; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/IPluginServiceProvider.h --- a/OrthancServer/Plugins/Engine/IPluginServiceProvider.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/IPluginServiceProvider.h Wed Jun 10 21:27:31 2020 +0200 @@ -37,7 +37,7 @@ #include "../Include/orthanc/OrthancCPlugin.h" -#include "../../Core/SharedLibrary.h" +#include "../../../OrthancFramework/Sources/SharedLibrary.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp --- a/OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/OrthancPluginDatabase.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -31,7 +31,7 @@ **/ -#include "../../OrthancServer/PrecompiledHeadersServer.h" +#include "../../Sources/PrecompiledHeadersServer.h" #include "OrthancPluginDatabase.h" #if ORTHANC_ENABLE_PLUGINS != 1 @@ -39,8 +39,8 @@ #endif -#include "../../Core/Logging.h" -#include "../../Core/OrthancException.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" #include "PluginsEnumerations.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/OrthancPluginDatabase.h --- a/OrthancServer/Plugins/Engine/OrthancPluginDatabase.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/OrthancPluginDatabase.h Wed Jun 10 21:27:31 2020 +0200 @@ -35,12 +35,12 @@ #if ORTHANC_ENABLE_PLUGINS == 1 -#include "../../Core/SharedLibrary.h" -#include "../../OrthancServer/Database/Compatibility/ICreateInstance.h" -#include "../../OrthancServer/Database/Compatibility/IGetChildrenMetadata.h" -#include "../../OrthancServer/Database/Compatibility/ILookupResources.h" -#include "../../OrthancServer/Database/Compatibility/ILookupResourceAndParent.h" -#include "../../OrthancServer/Database/Compatibility/ISetResourcesContent.h" +#include "../../../OrthancFramework/Sources/SharedLibrary.h" +#include "../../Sources/Database/Compatibility/ICreateInstance.h" +#include "../../Sources/Database/Compatibility/IGetChildrenMetadata.h" +#include "../../Sources/Database/Compatibility/ILookupResources.h" +#include "../../Sources/Database/Compatibility/ILookupResourceAndParent.h" +#include "../../Sources/Database/Compatibility/ISetResourcesContent.h" #include "../Include/orthanc/OrthancCDatabasePlugin.h" #include "PluginsErrorDictionary.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/OrthancPlugins.cpp --- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -31,7 +31,7 @@ **/ -#include "../../OrthancServer/PrecompiledHeadersServer.h" +#include "../../Sources/PrecompiledHeadersServer.h" #include "OrthancPlugins.h" #if ORTHANC_ENABLE_PLUGINS != 1 @@ -43,30 +43,30 @@ #endif -#include "../../Core/Compression/GzipCompressor.h" -#include "../../Core/Compression/ZlibCompressor.h" -#include "../../Core/DicomFormat/DicomArray.h" -#include "../../Core/DicomParsing/DicomWebJsonVisitor.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../../Core/DicomParsing/Internals/DicomImageDecoder.h" -#include "../../Core/DicomParsing/ToDcmtkBridge.h" -#include "../../Core/HttpServer/HttpToolbox.h" -#include "../../Core/Images/Image.h" -#include "../../Core/Images/ImageProcessing.h" -#include "../../Core/Images/JpegReader.h" -#include "../../Core/Images/JpegWriter.h" -#include "../../Core/Images/PngReader.h" -#include "../../Core/Images/PngWriter.h" -#include "../../Core/Logging.h" -#include "../../Core/MetricsRegistry.h" -#include "../../Core/OrthancException.h" -#include "../../Core/SerializationToolbox.h" -#include "../../Core/Toolbox.h" -#include "../../OrthancServer/OrthancConfiguration.h" -#include "../../OrthancServer/OrthancFindRequestHandler.h" -#include "../../OrthancServer/Search/HierarchicalMatcher.h" -#include "../../OrthancServer/ServerContext.h" -#include "../../OrthancServer/ServerToolbox.h" +#include "../../../OrthancFramework/Sources/Compression/GzipCompressor.h" +#include "../../../OrthancFramework/Sources/Compression/ZlibCompressor.h" +#include "../../../OrthancFramework/Sources/DicomFormat/DicomArray.h" +#include "../../../OrthancFramework/Sources/DicomParsing/DicomWebJsonVisitor.h" +#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.h" +#include "../../../OrthancFramework/Sources/DicomParsing/ToDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/HttpServer/HttpToolbox.h" +#include "../../../OrthancFramework/Sources/Images/Image.h" +#include "../../../OrthancFramework/Sources/Images/ImageProcessing.h" +#include "../../../OrthancFramework/Sources/Images/JpegReader.h" +#include "../../../OrthancFramework/Sources/Images/JpegWriter.h" +#include "../../../OrthancFramework/Sources/Images/PngReader.h" +#include "../../../OrthancFramework/Sources/Images/PngWriter.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/MetricsRegistry.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/Toolbox.h" +#include "../../Sources/OrthancConfiguration.h" +#include "../../Sources/OrthancFindRequestHandler.h" +#include "../../Sources/Search/HierarchicalMatcher.h" +#include "../../Sources/ServerContext.h" +#include "../../Sources/ServerToolbox.h" #include "PluginsEnumerations.h" #include "PluginsJob.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/OrthancPlugins.h --- a/OrthancServer/Plugins/Engine/OrthancPlugins.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/OrthancPlugins.h Wed Jun 10 21:27:31 2020 +0200 @@ -53,17 +53,17 @@ #else -#include "../../Core/DicomNetworking/IFindRequestHandlerFactory.h" -#include "../../Core/DicomNetworking/IMoveRequestHandlerFactory.h" -#include "../../Core/DicomNetworking/IWorklistRequestHandlerFactory.h" -#include "../../Core/DicomParsing/MemoryBufferTranscoder.h" -#include "../../Core/FileStorage/IStorageArea.h" -#include "../../Core/HttpServer/IHttpHandler.h" -#include "../../Core/HttpServer/IIncomingHttpRequestFilter.h" -#include "../../Core/JobsEngine/IJob.h" -#include "../../OrthancServer/IDicomImageDecoder.h" -#include "../../OrthancServer/IServerListener.h" -#include "../../OrthancServer/ServerJobs/IStorageCommitmentFactory.h" +#include "../../../OrthancFramework/Sources/DicomNetworking/IFindRequestHandlerFactory.h" +#include "../../../OrthancFramework/Sources/DicomNetworking/IMoveRequestHandlerFactory.h" +#include "../../../OrthancFramework/Sources/DicomNetworking/IWorklistRequestHandlerFactory.h" +#include "../../../OrthancFramework/Sources/DicomParsing/MemoryBufferTranscoder.h" +#include "../../../OrthancFramework/Sources/FileStorage/IStorageArea.h" +#include "../../../OrthancFramework/Sources/HttpServer/IHttpHandler.h" +#include "../../../OrthancFramework/Sources/HttpServer/IIncomingHttpRequestFilter.h" +#include "../../../OrthancFramework/Sources/JobsEngine/IJob.h" +#include "../../Sources/IDicomImageDecoder.h" +#include "../../Sources/IServerListener.h" +#include "../../Sources/ServerJobs/IStorageCommitmentFactory.h" #include "OrthancPluginDatabase.h" #include "PluginsManager.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/PluginsEnumerations.cpp --- a/OrthancServer/Plugins/Engine/PluginsEnumerations.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/PluginsEnumerations.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -31,7 +31,7 @@ **/ -#include "../../OrthancServer/PrecompiledHeadersServer.h" +#include "../../Sources/PrecompiledHeadersServer.h" #include "PluginsEnumerations.h" #if ORTHANC_ENABLE_PLUGINS != 1 @@ -39,7 +39,7 @@ #endif -#include "../../Core/OrthancException.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/PluginsEnumerations.h --- a/OrthancServer/Plugins/Engine/PluginsEnumerations.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/PluginsEnumerations.h Wed Jun 10 21:27:31 2020 +0200 @@ -43,7 +43,7 @@ **/ #include "../Include/orthanc/OrthancCPlugin.h" -#include "../../OrthancServer/Search/DatabaseConstraint.h" +#include "../../Sources/Search/DatabaseConstraint.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/PluginsErrorDictionary.cpp --- a/OrthancServer/Plugins/Engine/PluginsErrorDictionary.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/PluginsErrorDictionary.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -31,7 +31,7 @@ **/ -#include "../../OrthancServer/PrecompiledHeadersServer.h" +#include "../../Sources/PrecompiledHeadersServer.h" #include "PluginsErrorDictionary.h" #if ORTHANC_ENABLE_PLUGINS != 1 @@ -42,7 +42,7 @@ #include "PluginsEnumerations.h" #include "PluginsManager.h" -#include "../../Core/Logging.h" +#include "../../../OrthancFramework/Sources/Logging.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/PluginsErrorDictionary.h --- a/OrthancServer/Plugins/Engine/PluginsErrorDictionary.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/PluginsErrorDictionary.h Wed Jun 10 21:27:31 2020 +0200 @@ -36,8 +36,8 @@ #if ORTHANC_ENABLE_PLUGINS == 1 #include "../Include/orthanc/OrthancCPlugin.h" -#include "../../Core/OrthancException.h" -#include "../../Core/SharedLibrary.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../OrthancFramework/Sources/SharedLibrary.h" #include #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/PluginsJob.cpp --- a/OrthancServer/Plugins/Engine/PluginsJob.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/PluginsJob.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -31,7 +31,7 @@ **/ -#include "../../OrthancServer/PrecompiledHeadersServer.h" +#include "../../Sources/PrecompiledHeadersServer.h" #include "PluginsJob.h" #if ORTHANC_ENABLE_PLUGINS != 1 @@ -39,8 +39,8 @@ #endif -#include "../../Core/Logging.h" -#include "../../Core/OrthancException.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" #include #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/PluginsJob.h --- a/OrthancServer/Plugins/Engine/PluginsJob.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/PluginsJob.h Wed Jun 10 21:27:31 2020 +0200 @@ -35,7 +35,7 @@ #if ORTHANC_ENABLE_PLUGINS == 1 -#include "../../Core/JobsEngine/IJob.h" +#include "../../../OrthancFramework/Sources/JobsEngine/IJob.h" #include "../Include/orthanc/OrthancCPlugin.h" namespace Orthanc diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Engine/PluginsManager.cpp --- a/OrthancServer/Plugins/Engine/PluginsManager.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Engine/PluginsManager.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -31,17 +31,17 @@ **/ -#include "../../OrthancServer/PrecompiledHeadersServer.h" +#include "../../Sources/PrecompiledHeadersServer.h" #include "PluginsManager.h" #if ORTHANC_ENABLE_PLUGINS != 1 #error The plugin support is disabled #endif -#include "../../Core/HttpServer/HttpOutput.h" -#include "../../Core/Logging.h" -#include "../../Core/OrthancException.h" -#include "../../Core/Toolbox.h" +#include "../../../OrthancFramework/Sources/HttpServer/HttpOutput.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../OrthancFramework/Sources/Toolbox.h" #include #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Samples/Common/VersionScript.map --- a/OrthancServer/Plugins/Samples/Common/VersionScript.map Wed Jun 10 20:30:34 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -# This is a version-script for Orthanc plugins - -{ -global: - OrthancPluginInitialize; - OrthancPluginFinalize; - OrthancPluginGetName; - OrthancPluginGetVersion; - -local: - *; -}; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Samples/ConnectivityChecks/CMakeLists.txt --- a/OrthancServer/Plugins/Samples/ConnectivityChecks/CMakeLists.txt Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Samples/ConnectivityChecks/CMakeLists.txt Wed Jun 10 21:27:31 2020 +0200 @@ -5,8 +5,8 @@ SET(PLUGIN_NAME "connectivity-checks" CACHE STRING "Name of the plugin") SET(PLUGIN_VERSION "mainline" CACHE STRING "Version of the plugin") -include(${CMAKE_CURRENT_SOURCE_DIR}/../../../Resources/CMake/OrthancFrameworkParameters.cmake) -include(${CMAKE_CURRENT_SOURCE_DIR}/../../../Resources/CMake/OrthancFrameworkConfiguration.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/../../../../OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/../../../../OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake) include(JavaScriptLibraries.cmake) @@ -27,7 +27,7 @@ endif() EmbedResources( - --framework-path=${CMAKE_CURRENT_SOURCE_DIR}/../../../Core + --framework-path=${ORTHANC_ROOT}/OrthancFramework/Sources WEB_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/WebResources LIBRARIES ${JAVASCRIPT_LIBS_DIR} ) @@ -39,17 +39,17 @@ ) include_directories( - ${ORTHANC_ROOT}/Plugins/Include/ + ${ORTHANC_ROOT}/OrthancServer/Plugins/Include/ ) add_library(ConnectivityChecks SHARED ${ADDITIONAL_RESOURCES} ${AUTOGENERATED_SOURCES} ${ORTHANC_CORE_SOURCES_DEPENDENCIES} - ${ORTHANC_ROOT}/Core/Enumerations.cpp - ${ORTHANC_ROOT}/Core/Logging.cpp - ${ORTHANC_ROOT}/Core/SystemToolbox.cpp - ${ORTHANC_ROOT}/Core/Toolbox.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Enumerations.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Logging.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/SystemToolbox.cpp + ${ORTHANC_ROOT}/OrthancFramework/Sources/Toolbox.cpp Plugin.cpp ) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Samples/ConnectivityChecks/Plugin.cpp --- a/OrthancServer/Plugins/Samples/ConnectivityChecks/Plugin.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Samples/ConnectivityChecks/Plugin.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,8 +34,8 @@ #include #include -#include "../../../Core/OrthancException.h" -#include "../../../Core/SystemToolbox.h" +#include "../../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../../OrthancFramework/Sources/SystemToolbox.h" #define ROOT_URI "/connectivity-checks" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp --- a/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -19,7 +19,7 @@ **/ -#include "../../../Core/Compatibility.h" +#include "../../../../OrthancFramework/Sources/Compatibility.h" #include "../Common/OrthancPluginCppWrapper.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Resources/Samples/Tools/RecoverCompressedFile.cpp --- a/OrthancServer/Resources/Samples/Tools/RecoverCompressedFile.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Resources/Samples/Tools/RecoverCompressedFile.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -19,9 +19,9 @@ **/ -#include "../../../Core/Compression/ZlibCompressor.h" -#include "../../../Core/SystemToolbox.h" -#include "../../../Core/OrthancException.h" +#include "../../../../OrthancFramework/Sources/Compression/ZlibCompressor.h" +#include "../../../../OrthancFramework/Sources/SystemToolbox.h" +#include "../../../../OrthancFramework/Sources/OrthancException.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp --- a/OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #include "../../PrecompiledHeadersServer.h" #include "DatabaseLookup.h" -#include "../../../Core/OrthancException.h" +#include "../../../../OrthancFramework/Sources/OrthancException.h" #include "../../Search/DicomTagConstraint.h" #include "../../ServerToolbox.h" #include "SetOfResources.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Database/Compatibility/ICreateInstance.cpp --- a/OrthancServer/Sources/Database/Compatibility/ICreateInstance.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Database/Compatibility/ICreateInstance.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #include "../../PrecompiledHeadersServer.h" #include "ICreateInstance.h" -#include "../../../Core/OrthancException.h" +#include "../../../../OrthancFramework/Sources/OrthancException.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Database/Compatibility/ILookupResourceAndParent.cpp --- a/OrthancServer/Sources/Database/Compatibility/ILookupResourceAndParent.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Database/Compatibility/ILookupResourceAndParent.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #include "../../PrecompiledHeadersServer.h" #include "ILookupResourceAndParent.h" -#include "../../../Core/OrthancException.h" +#include "../../../../OrthancFramework/Sources/OrthancException.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Database/Compatibility/SetOfResources.cpp --- a/OrthancServer/Sources/Database/Compatibility/SetOfResources.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Database/Compatibility/SetOfResources.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #include "../../PrecompiledHeadersServer.h" #include "SetOfResources.h" -#include "../../../Core/OrthancException.h" +#include "../../../../OrthancFramework/Sources/OrthancException.h" namespace Orthanc diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Database/Compatibility/SetOfResources.h --- a/OrthancServer/Sources/Database/Compatibility/SetOfResources.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Database/Compatibility/SetOfResources.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../../Core/Compatibility.h" +#include "../../../../OrthancFramework/Sources/Compatibility.h" #include "../IDatabaseWrapper.h" #include "ILookupResources.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Database/IDatabaseWrapper.h --- a/OrthancServer/Sources/Database/IDatabaseWrapper.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Database/IDatabaseWrapper.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,10 +33,10 @@ #pragma once -#include "../../Core/DicomFormat/DicomMap.h" -#include "../../Core/FileStorage/FileInfo.h" -#include "../../Core/FileStorage/IStorageArea.h" -#include "../../Core/SQLite/ITransaction.h" +#include "../../../OrthancFramework/Sources/DicomFormat/DicomMap.h" +#include "../../../OrthancFramework/Sources/FileStorage/FileInfo.h" +#include "../../../OrthancFramework/Sources/FileStorage/IStorageArea.h" +#include "../../../OrthancFramework/Sources/SQLite/ITransaction.h" #include "../ExportedResource.h" #include "IDatabaseListener.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Database/ResourcesContent.h --- a/OrthancServer/Sources/Database/ResourcesContent.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Database/ResourcesContent.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../Core/DicomFormat/DicomMap.h" +#include "../../../OrthancFramework/Sources/DicomFormat/DicomMap.h" #include "../ServerEnumerations.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp --- a/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,9 +34,9 @@ #include "../PrecompiledHeadersServer.h" #include "SQLiteDatabaseWrapper.h" -#include "../../Core/DicomFormat/DicomArray.h" -#include "../../Core/Logging.h" -#include "../../Core/SQLite/Transaction.h" +#include "../../../OrthancFramework/Sources/DicomFormat/DicomArray.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/SQLite/Transaction.h" #include "../Search/ISqlLookupFormatter.h" #include "../ServerToolbox.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Database/SQLiteDatabaseWrapper.h --- a/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.h Wed Jun 10 21:27:31 2020 +0200 @@ -35,7 +35,7 @@ #include "IDatabaseWrapper.h" -#include "../../Core/SQLite/Connection.h" +#include "../../../OrthancFramework/Sources/SQLite/Connection.h" #include "Compatibility/ICreateInstance.h" #include "Compatibility/IGetChildrenMetadata.h" #include "Compatibility/ILookupResourceAndParent.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/DicomInstanceOrigin.cpp --- a/OrthancServer/Sources/DicomInstanceOrigin.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/DicomInstanceOrigin.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,8 +34,8 @@ #include "PrecompiledHeadersServer.h" #include "DicomInstanceOrigin.h" -#include "../Core/OrthancException.h" -#include "../Core/SerializationToolbox.h" +#include "../../OrthancFramework/Sources/OrthancException.h" +#include "../../OrthancFramework/Sources/SerializationToolbox.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/DicomInstanceOrigin.h --- a/OrthancServer/Sources/DicomInstanceOrigin.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/DicomInstanceOrigin.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../Core/RestApi/RestApiCall.h" +#include "../../OrthancFramework/Sources/RestApi/RestApiCall.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/DicomInstanceToStore.cpp --- a/OrthancServer/Sources/DicomInstanceToStore.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/DicomInstanceToStore.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,10 +34,10 @@ #include "PrecompiledHeadersServer.h" #include "DicomInstanceToStore.h" -#include "../Core/DicomParsing/FromDcmtkBridge.h" -#include "../Core/DicomParsing/ParsedDicomFile.h" -#include "../Core/Logging.h" -#include "../Core/OrthancException.h" +#include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/OrthancException.h" #include #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/DicomInstanceToStore.h --- a/OrthancServer/Sources/DicomInstanceToStore.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/DicomInstanceToStore.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,8 +33,8 @@ #pragma once -#include "../Core/DicomFormat/DicomInstanceHasher.h" -#include "../Core/DicomFormat/DicomMap.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomInstanceHasher.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomMap.h" #include "DicomInstanceOrigin.h" #include "ServerEnumerations.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/EmbeddedResourceHttpHandler.cpp --- a/OrthancServer/Sources/EmbeddedResourceHttpHandler.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/EmbeddedResourceHttpHandler.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,10 +34,10 @@ #include "PrecompiledHeadersServer.h" #include "EmbeddedResourceHttpHandler.h" -#include "../Core/HttpServer/HttpOutput.h" -#include "../Core/Logging.h" -#include "../Core/OrthancException.h" -#include "../Core/SystemToolbox.h" +#include "../../OrthancFramework/Sources/HttpServer/HttpOutput.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/OrthancException.h" +#include "../../OrthancFramework/Sources/SystemToolbox.h" namespace Orthanc diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/EmbeddedResourceHttpHandler.h --- a/OrthancServer/Sources/EmbeddedResourceHttpHandler.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/EmbeddedResourceHttpHandler.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../Core/HttpServer/IHttpHandler.h" +#include "../../OrthancFramework/Sources/HttpServer/IHttpHandler.h" #include // Autogenerated file #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ExportedResource.cpp --- a/OrthancServer/Sources/ExportedResource.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ExportedResource.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #include "PrecompiledHeadersServer.h" #include "ExportedResource.h" -#include "../Core/OrthancException.h" +#include "../../OrthancFramework/Sources/OrthancException.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ExportedResource.h --- a/OrthancServer/Sources/ExportedResource.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ExportedResource.h Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #pragma once #include "ServerEnumerations.h" -#include "../Core/Toolbox.h" +#include "../../OrthancFramework/Sources/Toolbox.h" #include #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/IDicomImageDecoder.h --- a/OrthancServer/Sources/IDicomImageDecoder.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/IDicomImageDecoder.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../Core/Images/ImageAccessor.h" +#include "../../OrthancFramework/Sources/Images/ImageAccessor.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/LuaScripting.cpp --- a/OrthancServer/Sources/LuaScripting.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/LuaScripting.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -38,9 +38,9 @@ #include "OrthancRestApi/OrthancRestApi.h" #include "ServerContext.h" -#include "../Core/HttpServer/StringHttpOutput.h" -#include "../Core/Logging.h" -#include "../Core/Lua/LuaFunctionCall.h" +#include "../../OrthancFramework/Sources/HttpServer/StringHttpOutput.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/Lua/LuaFunctionCall.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/LuaScripting.h --- a/OrthancServer/Sources/LuaScripting.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/LuaScripting.h Wed Jun 10 21:27:31 2020 +0200 @@ -37,8 +37,8 @@ #include "ServerIndexChange.h" #include "ServerJobs/LuaJobManager.h" -#include "../Core/MultiThreading/SharedMessageQueue.h" -#include "../Core/Lua/LuaContext.h" +#include "../../OrthancFramework/Sources/MultiThreading/SharedMessageQueue.h" +#include "../../OrthancFramework/Sources/Lua/LuaContext.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancConfiguration.cpp --- a/OrthancServer/Sources/OrthancConfiguration.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancConfiguration.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,12 +34,12 @@ #include "PrecompiledHeadersServer.h" #include "OrthancConfiguration.h" -#include "../Core/HttpServer/HttpServer.h" -#include "../Core/Logging.h" -#include "../Core/OrthancException.h" -#include "../Core/SystemToolbox.h" -#include "../Core/TemporaryFile.h" -#include "../Core/Toolbox.h" +#include "../../OrthancFramework/Sources/HttpServer/HttpServer.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/OrthancException.h" +#include "../../OrthancFramework/Sources/SystemToolbox.h" +#include "../../OrthancFramework/Sources/TemporaryFile.h" +#include "../../OrthancFramework/Sources/Toolbox.h" #include "ServerIndex.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancConfiguration.h --- a/OrthancServer/Sources/OrthancConfiguration.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancConfiguration.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,9 +33,9 @@ #pragma once -#include "../Core/Images/FontRegistry.h" -#include "../Core/WebServiceParameters.h" -#include "../Core/DicomNetworking/RemoteModalityParameters.h" +#include "../../OrthancFramework/Sources/Images/FontRegistry.h" +#include "../../OrthancFramework/Sources/WebServiceParameters.h" +#include "../../OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancFindRequestHandler.cpp --- a/OrthancServer/Sources/OrthancFindRequestHandler.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancFindRequestHandler.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,11 +34,11 @@ #include "PrecompiledHeadersServer.h" #include "OrthancFindRequestHandler.h" -#include "../Core/DicomFormat/DicomArray.h" -#include "../Core/DicomParsing/FromDcmtkBridge.h" -#include "../Core/Logging.h" -#include "../Core/Lua/LuaFunctionCall.h" -#include "../Core/MetricsRegistry.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h" +#include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/Lua/LuaFunctionCall.h" +#include "../../OrthancFramework/Sources/MetricsRegistry.h" #include "OrthancConfiguration.h" #include "Search/DatabaseLookup.h" #include "ServerContext.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancFindRequestHandler.h --- a/OrthancServer/Sources/OrthancFindRequestHandler.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancFindRequestHandler.h Wed Jun 10 21:27:31 2020 +0200 @@ -32,7 +32,7 @@ #pragma once -#include "../Core/DicomNetworking/IFindRequestHandler.h" +#include "../../OrthancFramework/Sources/DicomNetworking/IFindRequestHandler.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancGetRequestHandler.cpp --- a/OrthancServer/Sources/OrthancGetRequestHandler.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancGetRequestHandler.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -33,10 +33,10 @@ #include "PrecompiledHeadersServer.h" #include "OrthancGetRequestHandler.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../Core/DicomFormat/DicomArray.h" -#include "../Core/Logging.h" -#include "../Core/MetricsRegistry.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h" +#include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/MetricsRegistry.h" #include "OrthancConfiguration.h" #include "ServerContext.h" #include "ServerJobs/DicomModalityStoreJob.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancGetRequestHandler.h --- a/OrthancServer/Sources/OrthancGetRequestHandler.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancGetRequestHandler.h Wed Jun 10 21:27:31 2020 +0200 @@ -32,8 +32,8 @@ #pragma once -#include "../Core/DicomNetworking/IGetRequestHandler.h" -#include "../Core/DicomNetworking/RemoteModalityParameters.h" +#include "../../OrthancFramework/Sources/DicomNetworking/IGetRequestHandler.h" +#include "../../OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancHttpHandler.cpp --- a/OrthancServer/Sources/OrthancHttpHandler.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancHttpHandler.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #include "PrecompiledHeadersServer.h" #include "OrthancHttpHandler.h" -#include "../Core/OrthancException.h" +#include "../../OrthancFramework/Sources/OrthancException.h" namespace Orthanc diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancHttpHandler.h --- a/OrthancServer/Sources/OrthancHttpHandler.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancHttpHandler.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../Core/HttpServer/IHttpHandler.h" +#include "../../OrthancFramework/Sources/HttpServer/IHttpHandler.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancInitialization.cpp --- a/OrthancServer/Sources/OrthancInitialization.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancInitialization.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -40,10 +40,10 @@ #include "OrthancInitialization.h" -#include "../Core/DicomParsing/FromDcmtkBridge.h" -#include "../Core/FileStorage/FilesystemStorage.h" -#include "../Core/Logging.h" -#include "../Core/OrthancException.h" +#include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/FileStorage/FilesystemStorage.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/OrthancException.h" #include "Database/SQLiteDatabaseWrapper.h" #include "OrthancConfiguration.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancInitialization.h --- a/OrthancServer/Sources/OrthancInitialization.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancInitialization.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../Core/FileStorage/IStorageArea.h" +#include "../../OrthancFramework/Sources/FileStorage/IStorageArea.h" #include "Database/IDatabaseWrapper.h" namespace Orthanc diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancMoveRequestHandler.cpp --- a/OrthancServer/Sources/OrthancMoveRequestHandler.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancMoveRequestHandler.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,10 +34,11 @@ #include "PrecompiledHeadersServer.h" #include "OrthancMoveRequestHandler.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../Core/DicomFormat/DicomArray.h" -#include "../Core/Logging.h" -#include "../Core/MetricsRegistry.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h" +#include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/MetricsRegistry.h" + #include "OrthancConfiguration.h" #include "ServerContext.h" #include "ServerJobs/DicomModalityStoreJob.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancMoveRequestHandler.h --- a/OrthancServer/Sources/OrthancMoveRequestHandler.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancMoveRequestHandler.h Wed Jun 10 21:27:31 2020 +0200 @@ -32,7 +32,7 @@ #pragma once -#include "../Core/DicomNetworking/IMoveRequestHandler.h" +#include "../../OrthancFramework/Sources/DicomNetworking/IMoveRequestHandler.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp --- a/OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,9 +34,9 @@ #include "../PrecompiledHeadersServer.h" #include "OrthancRestApi.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../../Core/Logging.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../OrthancConfiguration.h" #include "../ServerContext.h" #include "../ServerJobs/MergeStudyJob.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp --- a/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,10 +34,10 @@ #include "../PrecompiledHeadersServer.h" #include "OrthancRestApi.h" -#include "../../Core/Compression/GzipCompressor.h" -#include "../../Core/Logging.h" -#include "../../Core/MetricsRegistry.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/Compression/GzipCompressor.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/MetricsRegistry.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../ServerContext.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancRestApi/OrthancRestApi.h --- a/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestApi.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,10 +33,10 @@ #pragma once -#include "../../Core/DicomParsing/DicomModification.h" -#include "../../Core/JobsEngine/SetOfCommandsJob.h" -#include "../../Core/MetricsRegistry.h" -#include "../../Core/RestApi/RestApi.h" +#include "../../../OrthancFramework/Sources/DicomParsing/DicomModification.h" +#include "../../../OrthancFramework/Sources/JobsEngine/SetOfCommandsJob.h" +#include "../../../OrthancFramework/Sources/MetricsRegistry.h" +#include "../../../OrthancFramework/Sources/RestApi/RestApi.h" #include "../ServerEnumerations.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancRestApi/OrthancRestArchive.cpp --- a/OrthancServer/Sources/OrthancRestApi/OrthancRestArchive.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestArchive.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,9 +34,9 @@ #include "../PrecompiledHeadersServer.h" #include "OrthancRestApi.h" -#include "../../Core/HttpServer/FilesystemHttpSender.h" -#include "../../Core/OrthancException.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/HttpServer/FilesystemHttpSender.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../OrthancConfiguration.h" #include "../ServerContext.h" #include "../ServerJobs/ArchiveJob.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp --- a/OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,12 +34,12 @@ #include "../PrecompiledHeadersServer.h" #include "OrthancRestApi.h" -#include "../../Core/Cache/SharedArchive.h" -#include "../../Core/DicomNetworking/DicomAssociation.h" -#include "../../Core/DicomNetworking/DicomControlUserConnection.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../../Core/Logging.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/Cache/SharedArchive.h" +#include "../../../OrthancFramework/Sources/DicomNetworking/DicomAssociation.h" +#include "../../../OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.h" +#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../OrthancConfiguration.h" #include "../QueryRetrieveHandler.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp --- a/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,16 +34,17 @@ #include "../PrecompiledHeadersServer.h" #include "OrthancRestApi.h" -#include "../../Core/Compression/GzipCompressor.h" -#include "../../Core/DicomFormat/DicomImageInformation.h" -#include "../../Core/DicomParsing/DicomWebJsonVisitor.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../../Core/DicomParsing/Internals/DicomImageDecoder.h" -#include "../../Core/HttpServer/HttpContentNegociation.h" -#include "../../Core/Images/Image.h" -#include "../../Core/Images/ImageProcessing.h" -#include "../../Core/Logging.h" -#include "../../Core/MultiThreading/Semaphore.h" +#include "../../../OrthancFramework/Sources/Compression/GzipCompressor.h" +#include "../../../OrthancFramework/Sources/DicomFormat/DicomImageInformation.h" +#include "../../../OrthancFramework/Sources/DicomParsing/DicomWebJsonVisitor.h" +#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.h" +#include "../../../OrthancFramework/Sources/HttpServer/HttpContentNegociation.h" +#include "../../../OrthancFramework/Sources/Images/Image.h" +#include "../../../OrthancFramework/Sources/Images/ImageProcessing.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/MultiThreading/Semaphore.h" + #include "../OrthancConfiguration.h" #include "../Search/DatabaseLookup.h" #include "../ServerContext.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/OrthancRestApi/OrthancRestSystem.cpp --- a/OrthancServer/Sources/OrthancRestApi/OrthancRestSystem.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestSystem.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,8 +34,8 @@ #include "../PrecompiledHeadersServer.h" #include "OrthancRestApi.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../../Core/MetricsRegistry.h" +#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/MetricsRegistry.h" #include "../../Plugins/Engine/OrthancPlugins.h" #include "../../Plugins/Engine/PluginsManager.h" #include "../OrthancConfiguration.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/PrecompiledHeadersServer.h --- a/OrthancServer/Sources/PrecompiledHeadersServer.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/PrecompiledHeadersServer.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../Core/PrecompiledHeaders.h" +#include "../../OrthancFramework/Sources/PrecompiledHeaders.h" #if ORTHANC_USE_PRECOMPILED_HEADERS == 1 diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/QueryRetrieveHandler.cpp --- a/OrthancServer/Sources/QueryRetrieveHandler.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/QueryRetrieveHandler.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -36,9 +36,9 @@ #include "OrthancConfiguration.h" -#include "../Core/DicomNetworking/DicomControlUserConnection.h" -#include "../Core/DicomParsing/FromDcmtkBridge.h" -#include "../Core/Logging.h" +#include "../../OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.h" +#include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/Logging.h" #include "LuaScripting.h" #include "ServerContext.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/QueryRetrieveHandler.h --- a/OrthancServer/Sources/QueryRetrieveHandler.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/QueryRetrieveHandler.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,8 +33,8 @@ #pragma once -#include "../Core/DicomNetworking/DicomFindAnswers.h" -#include "../Core/DicomNetworking/RemoteModalityParameters.h" +#include "../../OrthancFramework/Sources/DicomNetworking/DicomFindAnswers.h" +#include "../../OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Search/DatabaseConstraint.cpp --- a/OrthancServer/Sources/Search/DatabaseConstraint.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Search/DatabaseConstraint.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #include "../PrecompiledHeadersServer.h" #include "DatabaseConstraint.h" -#include "../../Core/OrthancException.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" namespace Orthanc diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Search/DatabaseConstraint.h --- a/OrthancServer/Sources/Search/DatabaseConstraint.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Search/DatabaseConstraint.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../Core/DicomFormat/DicomMap.h" +#include "../../../OrthancFramework/Sources/DicomFormat/DicomMap.h" #include "../ServerEnumerations.h" #define ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT 0 diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Search/DatabaseLookup.cpp --- a/OrthancServer/Sources/Search/DatabaseLookup.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Search/DatabaseLookup.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,10 +35,10 @@ #include "DatabaseLookup.h" #include "../ServerToolbox.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../../Core/DicomParsing/ToDcmtkBridge.h" -#include "../../Core/OrthancException.h" -#include "../../Core/Toolbox.h" +#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/DicomParsing/ToDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../OrthancFramework/Sources/Toolbox.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Search/DicomTagConstraint.cpp --- a/OrthancServer/Sources/Search/DicomTagConstraint.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Search/DicomTagConstraint.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -38,8 +38,8 @@ # include "../ServerToolbox.h" #endif -#include "../../Core/OrthancException.h" -#include "../../Core/Toolbox.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../OrthancFramework/Sources/Toolbox.h" #include "DatabaseConstraint.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Search/DicomTagConstraint.h --- a/OrthancServer/Sources/Search/DicomTagConstraint.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Search/DicomTagConstraint.h Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #pragma once #include "../ServerEnumerations.h" -#include "../../Core/DicomFormat/DicomMap.h" +#include "../../../OrthancFramework/Sources/DicomFormat/DicomMap.h" #include "DatabaseConstraint.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Search/HierarchicalMatcher.cpp --- a/OrthancServer/Sources/Search/HierarchicalMatcher.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Search/HierarchicalMatcher.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,10 +34,10 @@ #include "../PrecompiledHeadersServer.h" #include "HierarchicalMatcher.h" -#include "../../Core/Logging.h" -#include "../../Core/OrthancException.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../../Core/DicomParsing/ToDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/DicomParsing/ToDcmtkBridge.h" #include "../OrthancConfiguration.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Search/HierarchicalMatcher.h --- a/OrthancServer/Sources/Search/HierarchicalMatcher.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Search/HierarchicalMatcher.h Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #pragma once #include "DatabaseLookup.h" -#include "../../Core/DicomParsing/ParsedDicomFile.h" +#include "../../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h" class DcmItem; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Search/ISqlLookupFormatter.cpp --- a/OrthancServer/Sources/Search/ISqlLookupFormatter.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Search/ISqlLookupFormatter.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #include "../PrecompiledHeadersServer.h" #include "ISqlLookupFormatter.h" -#include "../../Core/OrthancException.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" #include "DatabaseConstraint.h" namespace Orthanc diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/Search/ISqlLookupFormatter.h --- a/OrthancServer/Sources/Search/ISqlLookupFormatter.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/Search/ISqlLookupFormatter.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../Core/Enumerations.h" +#include "../../../OrthancFramework/Sources/Enumerations.h" #include #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerContext.cpp --- a/OrthancServer/Sources/ServerContext.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerContext.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,16 +34,16 @@ #include "PrecompiledHeadersServer.h" #include "ServerContext.h" -#include "../Core/DicomParsing/Internals/DicomImageDecoder.h" -#include "../Core/Cache/SharedArchive.h" -#include "../Core/DicomParsing/DcmtkTranscoder.h" -#include "../Core/DicomParsing/FromDcmtkBridge.h" -#include "../Core/FileStorage/StorageAccessor.h" -#include "../Core/HttpServer/FilesystemHttpSender.h" -#include "../Core/HttpServer/HttpStreamTranscoder.h" -#include "../Core/JobsEngine/SetOfInstancesJob.h" -#include "../Core/Logging.h" -#include "../Core/MetricsRegistry.h" +#include "../../OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.h" +#include "../../OrthancFramework/Sources/Cache/SharedArchive.h" +#include "../../OrthancFramework/Sources/DicomParsing/DcmtkTranscoder.h" +#include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/FileStorage/StorageAccessor.h" +#include "../../OrthancFramework/Sources/HttpServer/FilesystemHttpSender.h" +#include "../../OrthancFramework/Sources/HttpServer/HttpStreamTranscoder.h" +#include "../../OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/MetricsRegistry.h" #include "../Plugins/Engine/OrthancPlugins.h" #include "OrthancConfiguration.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerContext.h --- a/OrthancServer/Sources/ServerContext.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerContext.h Wed Jun 10 21:27:31 2020 +0200 @@ -39,8 +39,8 @@ #include "ServerIndex.h" #include "ServerJobs/IStorageCommitmentFactory.h" -#include "../Core/Cache/MemoryCache.h" -#include "../Core/DicomParsing/IDicomTranscoder.h" +#include "../../OrthancFramework/Sources/Cache/MemoryCache.h" +#include "../../OrthancFramework/Sources/DicomParsing/IDicomTranscoder.h" namespace Orthanc diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerEnumerations.cpp --- a/OrthancServer/Sources/ServerEnumerations.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerEnumerations.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,10 +34,10 @@ #include "PrecompiledHeadersServer.h" #include "ServerEnumerations.h" -#include "../Core/OrthancException.h" -#include "../Core/EnumerationDictionary.h" -#include "../Core/Logging.h" -#include "../Core/Toolbox.h" +#include "../../OrthancFramework/Sources/OrthancException.h" +#include "../../OrthancFramework/Sources/EnumerationDictionary.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/Toolbox.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerEnumerations.h --- a/OrthancServer/Sources/ServerEnumerations.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerEnumerations.h Wed Jun 10 21:27:31 2020 +0200 @@ -35,8 +35,8 @@ #include #include -#include "../Core/Enumerations.h" -#include "../Core/DicomFormat/DicomTag.h" +#include "../../OrthancFramework/Sources/Enumerations.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomTag.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerIndex.cpp --- a/OrthancServer/Sources/ServerIndex.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerIndex.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -38,11 +38,11 @@ #define NOMINMAX #endif -#include "../Core/DicomFormat/DicomArray.h" -#include "../Core/DicomParsing/FromDcmtkBridge.h" -#include "../Core/DicomParsing/ParsedDicomFile.h" -#include "../Core/Logging.h" -#include "../Core/Toolbox.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h" +#include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/Toolbox.h" #include "Database/ResourcesContent.h" #include "DicomInstanceToStore.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerIndex.h --- a/OrthancServer/Sources/ServerIndex.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerIndex.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,8 +33,8 @@ #pragma once -#include "../Core/Cache/LeastRecentlyUsedIndex.h" -#include "../Core/DicomFormat/DicomMap.h" +#include "../../OrthancFramework/Sources/Cache/LeastRecentlyUsedIndex.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomMap.h" #include "Database/IDatabaseWrapper.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerIndexChange.h --- a/OrthancServer/Sources/ServerIndexChange.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerIndexChange.h Wed Jun 10 21:27:31 2020 +0200 @@ -34,8 +34,8 @@ #pragma once #include "ServerEnumerations.h" -#include "../Core/IDynamicObject.h" -#include "../Core/SystemToolbox.h" +#include "../../OrthancFramework/Sources/IDynamicObject.h" +#include "../../OrthancFramework/Sources/SystemToolbox.h" #include #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/ArchiveJob.cpp --- a/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,12 +34,12 @@ #include "../PrecompiledHeadersServer.h" #include "ArchiveJob.h" -#include "../../Core/Cache/SharedArchive.h" -#include "../../Core/Compression/HierarchicalZipWriter.h" -#include "../../Core/DicomParsing/DicomDirWriter.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../../Core/Logging.h" -#include "../../Core/OrthancException.h" +#include "../../../OrthancFramework/Sources/Cache/SharedArchive.h" +#include "../../../OrthancFramework/Sources/Compression/HierarchicalZipWriter.h" +#include "../../../OrthancFramework/Sources/DicomParsing/DicomDirWriter.h" +#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" #include "../OrthancConfiguration.h" #include "../ServerContext.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/ArchiveJob.h --- a/OrthancServer/Sources/ServerJobs/ArchiveJob.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,9 +33,9 @@ #pragma once -#include "../../Core/Compatibility.h" -#include "../../Core/JobsEngine/IJob.h" -#include "../../Core/TemporaryFile.h" +#include "../../../OrthancFramework/Sources/Compatibility.h" +#include "../../../OrthancFramework/Sources/JobsEngine/IJob.h" +#include "../../../OrthancFramework/Sources/TemporaryFile.h" #include #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/CleaningInstancesJob.cpp --- a/OrthancServer/Sources/ServerJobs/CleaningInstancesJob.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/CleaningInstancesJob.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #include "CleaningInstancesJob.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../ServerContext.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/CleaningInstancesJob.h --- a/OrthancServer/Sources/ServerJobs/CleaningInstancesJob.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/CleaningInstancesJob.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../Core/JobsEngine/SetOfInstancesJob.h" +#include "../../../OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp --- a/OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,10 +34,10 @@ #include "../PrecompiledHeadersServer.h" #include "DicomModalityStoreJob.h" -#include "../../Core/Compatibility.h" -#include "../../Core/DicomNetworking/DicomAssociation.h" -#include "../../Core/Logging.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/Compatibility.h" +#include "../../../OrthancFramework/Sources/DicomNetworking/DicomAssociation.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../ServerContext.h" #include "../StorageCommitmentReports.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.h --- a/OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,9 +33,9 @@ #pragma once -#include "../../Core/Compatibility.h" -#include "../../Core/JobsEngine/SetOfInstancesJob.h" -#include "../../Core/DicomNetworking/DicomStoreUserConnection.h" +#include "../../../OrthancFramework/Sources/Compatibility.h" +#include "../../../OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.h" +#include "../../../OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp --- a/OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/DicomMoveScuJob.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #include "DicomMoveScuJob.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../ServerContext.h" static const char* const LOCAL_AET = "LocalAet"; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/DicomMoveScuJob.h --- a/OrthancServer/Sources/ServerJobs/DicomMoveScuJob.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/DicomMoveScuJob.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,9 +33,9 @@ #pragma once -#include "../../Core/Compatibility.h" -#include "../../Core/DicomNetworking/DicomControlUserConnection.h" -#include "../../Core/JobsEngine/SetOfCommandsJob.h" +#include "../../../OrthancFramework/Sources/Compatibility.h" +#include "../../../OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.h" +#include "../../../OrthancFramework/Sources/JobsEngine/SetOfCommandsJob.h" #include "../QueryRetrieveHandler.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/LuaJobManager.cpp --- a/OrthancServer/Sources/ServerJobs/LuaJobManager.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/LuaJobManager.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -35,17 +35,17 @@ #include "LuaJobManager.h" #include "../OrthancConfiguration.h" -#include "../../Core/Logging.h" +#include "../../../OrthancFramework/Sources/Logging.h" -#include "../../Core/JobsEngine/Operations/LogJobOperation.h" +#include "../../../OrthancFramework/Sources/JobsEngine/Operations/LogJobOperation.h" #include "Operations/DeleteResourceOperation.h" #include "Operations/ModifyInstanceOperation.h" #include "Operations/StorePeerOperation.h" #include "Operations/StoreScuOperation.h" #include "Operations/SystemCallOperation.h" -#include "../../Core/JobsEngine/Operations/NullOperationValue.h" -#include "../../Core/JobsEngine/Operations/StringOperationValue.h" +#include "../../../OrthancFramework/Sources/JobsEngine/Operations/NullOperationValue.h" +#include "../../../OrthancFramework/Sources/JobsEngine/Operations/StringOperationValue.h" #include "Operations/DicomInstanceOperationValue.h" namespace Orthanc diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/LuaJobManager.h --- a/OrthancServer/Sources/ServerJobs/LuaJobManager.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/LuaJobManager.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,11 +33,11 @@ #pragma once -#include "../../Core/DicomNetworking/TimeoutDicomConnectionManager.h" -#include "../../Core/DicomParsing/DicomModification.h" -#include "../../Core/JobsEngine/JobsEngine.h" -#include "../../Core/JobsEngine/Operations/SequenceOfOperationsJob.h" -#include "../../Core/WebServiceParameters.h" +#include "../../../OrthancFramework/Sources/DicomNetworking/TimeoutDicomConnectionManager.h" +#include "../../../OrthancFramework/Sources/DicomParsing/DicomModification.h" +#include "../../../OrthancFramework/Sources/JobsEngine/JobsEngine.h" +#include "../../../OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h" +#include "../../../OrthancFramework/Sources/WebServiceParameters.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp --- a/OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/MergeStudyJob.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -33,9 +33,9 @@ #include "MergeStudyJob.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../../Core/Logging.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../ServerContext.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/MergeStudyJob.h --- a/OrthancServer/Sources/ServerJobs/MergeStudyJob.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/MergeStudyJob.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../Core/DicomFormat/DicomMap.h" +#include "../../../OrthancFramework/Sources/DicomFormat/DicomMap.h" #include "../DicomInstanceOrigin.h" #include "CleaningInstancesJob.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/Operations/DeleteResourceOperation.cpp --- a/OrthancServer/Sources/ServerJobs/Operations/DeleteResourceOperation.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/DeleteResourceOperation.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -37,8 +37,8 @@ #include "DicomInstanceOperationValue.h" #include "../../ServerContext.h" -#include "../../../Core/Logging.h" -#include "../../../Core/OrthancException.h" +#include "../../../../OrthancFramework/Sources/Logging.h" +#include "../../../../OrthancFramework/Sources/OrthancException.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/Operations/DeleteResourceOperation.h --- a/OrthancServer/Sources/ServerJobs/Operations/DeleteResourceOperation.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/DeleteResourceOperation.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../../Core/JobsEngine/Operations/IJobOperation.h" +#include "../../../../OrthancFramework/Sources/JobsEngine/Operations/IJobOperation.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/Operations/DicomInstanceOperationValue.h --- a/OrthancServer/Sources/ServerJobs/Operations/DicomInstanceOperationValue.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/DicomInstanceOperationValue.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../../Core/JobsEngine/Operations/JobOperationValue.h" +#include "../../../../OrthancFramework/Sources/JobsEngine/Operations/JobOperationValue.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.cpp --- a/OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -37,8 +37,8 @@ #include "DicomInstanceOperationValue.h" #include "../../ServerContext.h" -#include "../../../Core/Logging.h" -#include "../../../Core/SerializationToolbox.h" +#include "../../../../OrthancFramework/Sources/Logging.h" +#include "../../../../OrthancFramework/Sources/SerializationToolbox.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.h --- a/OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/ModifyInstanceOperation.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,9 +33,9 @@ #pragma once -#include "../../../Core/Compatibility.h" -#include "../../../Core/DicomParsing/DicomModification.h" -#include "../../../Core/JobsEngine/Operations/IJobOperation.h" +#include "../../../../OrthancFramework/Sources/Compatibility.h" +#include "../../../../OrthancFramework/Sources/DicomParsing/DicomModification.h" +#include "../../../../OrthancFramework/Sources/JobsEngine/Operations/IJobOperation.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/Operations/StorePeerOperation.cpp --- a/OrthancServer/Sources/ServerJobs/Operations/StorePeerOperation.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/StorePeerOperation.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -36,10 +36,10 @@ #include "DicomInstanceOperationValue.h" -#include "../../../Core/Logging.h" -#include "../../../Core/OrthancException.h" -#include "../../../Core/HttpClient.h" -#include "../../../Core/SerializationToolbox.h" +#include "../../../../OrthancFramework/Sources/Logging.h" +#include "../../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../../OrthancFramework/Sources/HttpClient.h" +#include "../../../../OrthancFramework/Sources/SerializationToolbox.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/Operations/StorePeerOperation.h --- a/OrthancServer/Sources/ServerJobs/Operations/StorePeerOperation.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/StorePeerOperation.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,8 +33,8 @@ #pragma once -#include "../../../Core/JobsEngine/Operations/IJobOperation.h" -#include "../../../Core/WebServiceParameters.h" +#include "../../../../OrthancFramework/Sources/JobsEngine/Operations/IJobOperation.h" +#include "../../../../OrthancFramework/Sources/WebServiceParameters.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.cpp --- a/OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -37,9 +37,9 @@ #include "DicomInstanceOperationValue.h" #include "../../ServerContext.h" -#include "../../../Core/Logging.h" -#include "../../../Core/OrthancException.h" -#include "../../../Core/SerializationToolbox.h" +#include "../../../../OrthancFramework/Sources/Logging.h" +#include "../../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../../OrthancFramework/Sources/SerializationToolbox.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.h --- a/OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/StoreScuOperation.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,8 +33,8 @@ #pragma once -#include "../../../Core/JobsEngine/Operations/IJobOperation.h" -#include "../../../Core/DicomNetworking/TimeoutDicomConnectionManager.h" +#include "../../../../OrthancFramework/Sources/JobsEngine/Operations/IJobOperation.h" +#include "../../../../OrthancFramework/Sources/DicomNetworking/TimeoutDicomConnectionManager.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/Operations/SystemCallOperation.cpp --- a/OrthancServer/Sources/ServerJobs/Operations/SystemCallOperation.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/SystemCallOperation.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -36,13 +36,13 @@ #include "DicomInstanceOperationValue.h" -#include "../../../Core/JobsEngine/Operations/StringOperationValue.h" -#include "../../../Core/Logging.h" -#include "../../../Core/OrthancException.h" -#include "../../../Core/SerializationToolbox.h" -#include "../../../Core/TemporaryFile.h" -#include "../../../Core/Toolbox.h" -#include "../../../Core/SystemToolbox.h" +#include "../../../../OrthancFramework/Sources/JobsEngine/Operations/StringOperationValue.h" +#include "../../../../OrthancFramework/Sources/Logging.h" +#include "../../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../../OrthancFramework/Sources/SerializationToolbox.h" +#include "../../../../OrthancFramework/Sources/TemporaryFile.h" +#include "../../../../OrthancFramework/Sources/Toolbox.h" +#include "../../../../OrthancFramework/Sources/SystemToolbox.h" #include "../../OrthancConfiguration.h" namespace Orthanc diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/Operations/SystemCallOperation.h --- a/OrthancServer/Sources/ServerJobs/Operations/SystemCallOperation.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/Operations/SystemCallOperation.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../../Core/JobsEngine/Operations/IJobOperation.h" +#include "../../../../OrthancFramework/Sources/JobsEngine/Operations/IJobOperation.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/OrthancJobUnserializer.cpp --- a/OrthancServer/Sources/ServerJobs/OrthancJobUnserializer.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/OrthancJobUnserializer.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,9 +34,9 @@ #include "../PrecompiledHeadersServer.h" #include "OrthancJobUnserializer.h" -#include "../../Core/Logging.h" -#include "../../Core/OrthancException.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../../Plugins/Engine/OrthancPlugins.h" #include "../ServerContext.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/OrthancJobUnserializer.h --- a/OrthancServer/Sources/ServerJobs/OrthancJobUnserializer.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/OrthancJobUnserializer.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../Core/JobsEngine/GenericJobUnserializer.h" +#include "../../../OrthancFramework/Sources/JobsEngine/GenericJobUnserializer.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp --- a/OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,8 +34,8 @@ #include "../PrecompiledHeadersServer.h" #include "OrthancPeerStoreJob.h" -#include "../../Core/Logging.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../ServerContext.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.h --- a/OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,9 +33,9 @@ #pragma once -#include "../../Core/Compatibility.h" -#include "../../Core/JobsEngine/SetOfInstancesJob.h" -#include "../../Core/HttpClient.h" +#include "../../../OrthancFramework/Sources/Compatibility.h" +#include "../../../OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.h" +#include "../../../OrthancFramework/Sources/HttpClient.h" namespace Orthanc diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp --- a/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,8 +34,8 @@ #include "../PrecompiledHeadersServer.h" #include "ResourceModificationJob.h" -#include "../../Core/Logging.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../ServerContext.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/ResourceModificationJob.h --- a/OrthancServer/Sources/ServerJobs/ResourceModificationJob.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/ResourceModificationJob.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../Core/DicomParsing/DicomModification.h" +#include "../../../OrthancFramework/Sources/DicomParsing/DicomModification.h" #include "../DicomInstanceOrigin.h" #include "CleaningInstancesJob.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp --- a/OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/SplitStudyJob.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -33,9 +33,9 @@ #include "SplitStudyJob.h" -#include "../../Core/DicomParsing/FromDcmtkBridge.h" -#include "../../Core/Logging.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../ServerContext.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/SplitStudyJob.h --- a/OrthancServer/Sources/ServerJobs/SplitStudyJob.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/SplitStudyJob.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../../Core/DicomFormat/DicomTag.h" +#include "../../../OrthancFramework/Sources/DicomFormat/DicomTag.h" #include "../DicomInstanceOrigin.h" #include "CleaningInstancesJob.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp --- a/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,10 +34,10 @@ #include "../PrecompiledHeadersServer.h" #include "StorageCommitmentScpJob.h" -#include "../../Core/DicomNetworking/DicomAssociation.h" -#include "../../Core/Logging.h" -#include "../../Core/OrthancException.h" -#include "../../Core/SerializationToolbox.h" +#include "../../../OrthancFramework/Sources/DicomNetworking/DicomAssociation.h" +#include "../../../OrthancFramework/Sources/Logging.h" +#include "../../../OrthancFramework/Sources/OrthancException.h" +#include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../OrthancConfiguration.h" #include "../ServerContext.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.h --- a/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,9 +33,9 @@ #pragma once -#include "../../Core/Compatibility.h" -#include "../../Core/DicomNetworking/RemoteModalityParameters.h" -#include "../../Core/JobsEngine/SetOfCommandsJob.h" +#include "../../../OrthancFramework/Sources/Compatibility.h" +#include "../../../OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.h" +#include "../../../OrthancFramework/Sources/JobsEngine/SetOfCommandsJob.h" #include "IStorageCommitmentFactory.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/ServerToolbox.cpp --- a/OrthancServer/Sources/ServerToolbox.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/ServerToolbox.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,11 +34,11 @@ #include "PrecompiledHeadersServer.h" #include "ServerToolbox.h" -#include "../Core/DicomFormat/DicomArray.h" -#include "../Core/DicomParsing/ParsedDicomFile.h" -#include "../Core/FileStorage/StorageAccessor.h" -#include "../Core/Logging.h" -#include "../Core/OrthancException.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h" +#include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h" +#include "../../OrthancFramework/Sources/FileStorage/StorageAccessor.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/OrthancException.h" #include "Database/IDatabaseWrapper.h" #include "Database/ResourcesContent.h" #include "ServerContext.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/SliceOrdering.cpp --- a/OrthancServer/Sources/SliceOrdering.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/SliceOrdering.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,8 +34,8 @@ #include "PrecompiledHeadersServer.h" #include "SliceOrdering.h" -#include "../Core/Logging.h" -#include "../Core/Toolbox.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/Toolbox.h" #include "ServerEnumerations.h" #include "ServerIndex.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/SliceOrdering.h --- a/OrthancServer/Sources/SliceOrdering.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/SliceOrdering.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../Core/DicomFormat/DicomMap.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomMap.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/StorageCommitmentReports.cpp --- a/OrthancServer/Sources/StorageCommitmentReports.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/StorageCommitmentReports.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,7 +34,7 @@ #include "PrecompiledHeadersServer.h" #include "StorageCommitmentReports.h" -#include "../Core/OrthancException.h" +#include "../../OrthancFramework/Sources/OrthancException.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/StorageCommitmentReports.h --- a/OrthancServer/Sources/StorageCommitmentReports.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/StorageCommitmentReports.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,7 +33,7 @@ #pragma once -#include "../Core/Cache/LeastRecentlyUsedIndex.h" +#include "../../OrthancFramework/Sources/Cache/LeastRecentlyUsedIndex.h" namespace Orthanc { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/Sources/main.cpp --- a/OrthancServer/Sources/main.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/Sources/main.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -36,15 +36,15 @@ #include -#include "../Core/Compatibility.h" -#include "../Core/DicomFormat/DicomArray.h" -#include "../Core/DicomNetworking/DicomAssociationParameters.h" -#include "../Core/DicomNetworking/DicomServer.h" -#include "../Core/DicomParsing/FromDcmtkBridge.h" -#include "../Core/HttpServer/FilesystemHttpHandler.h" -#include "../Core/HttpServer/HttpServer.h" -#include "../Core/Logging.h" -#include "../Core/Lua/LuaFunctionCall.h" +#include "../../OrthancFramework/Sources/Compatibility.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h" +#include "../../OrthancFramework/Sources/DicomNetworking/DicomAssociationParameters.h" +#include "../../OrthancFramework/Sources/DicomNetworking/DicomServer.h" +#include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/HttpServer/FilesystemHttpHandler.h" +#include "../../OrthancFramework/Sources/HttpServer/HttpServer.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/Lua/LuaFunctionCall.h" #include "../Plugins/Engine/OrthancPlugins.h" #include "EmbeddedResourceHttpHandler.h" #include "OrthancConfiguration.h" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/BitbucketCACertificates.h --- a/OrthancServer/UnitTestsSources/BitbucketCACertificates.h Wed Jun 10 20:30:34 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -#define BITBUCKET_CERTIFICATES \ -"-----BEGIN CERTIFICATE-----\n" \ -"MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs\n" \ -"MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3\n" \ -"d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j\n" \ -"ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL\n" \ -"MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3\n" \ -"LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug\n" \ -"RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm\n" \ -"+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW\n" \ -"PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM\n" \ -"xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB\n" \ -"Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3\n" \ -"hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg\n" \ -"EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF\n" \ -"MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA\n" \ -"FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec\n" \ -"nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z\n" \ -"eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF\n" \ -"hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2\n" \ -"Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe\n" \ -"vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep\n" \ -"+OkuE6N36B9K\n" \ -"-----END CERTIFICATE-----\n" \ -"\n" diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/DatabaseLookupTests.cpp --- a/OrthancServer/UnitTestsSources/DatabaseLookupTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/UnitTestsSources/DatabaseLookupTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,8 +34,8 @@ #include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../OrthancServer/Search/DatabaseLookup.h" -#include "../Core/OrthancException.h" +#include "../Sources/Search/DatabaseLookup.h" +#include "../../OrthancFramework/Sources/OrthancException.h" using namespace Orthanc; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/DicomMapTests.cpp --- a/OrthancServer/UnitTestsSources/DicomMapTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/UnitTestsSources/DicomMapTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,15 +34,15 @@ #include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/Compatibility.h" -#include "../Core/OrthancException.h" -#include "../Core/DicomFormat/DicomMap.h" -#include "../Core/DicomParsing/FromDcmtkBridge.h" -#include "../Core/DicomParsing/ToDcmtkBridge.h" -#include "../Core/DicomParsing/ParsedDicomFile.h" -#include "../Core/DicomParsing/DicomWebJsonVisitor.h" +#include "../../OrthancFramework/Sources/Compatibility.h" +#include "../../OrthancFramework/Sources/OrthancException.h" +#include "../../OrthancFramework/Sources/DicomFormat/DicomMap.h" +#include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/DicomParsing/ToDcmtkBridge.h" +#include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h" +#include "../../OrthancFramework/Sources/DicomParsing/DicomWebJsonVisitor.h" -#include "../OrthancServer/DicomInstanceToStore.h" +#include "../Sources/DicomInstanceToStore.h" #include #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/FileStorageTests.cpp --- a/OrthancServer/UnitTestsSources/FileStorageTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/UnitTestsSources/FileStorageTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -36,14 +36,14 @@ #include -#include "../Core/FileStorage/FilesystemStorage.h" -#include "../Core/FileStorage/StorageAccessor.h" -#include "../Core/HttpServer/BufferHttpSender.h" -#include "../Core/HttpServer/FilesystemHttpSender.h" -#include "../Core/Logging.h" -#include "../Core/OrthancException.h" -#include "../Core/Toolbox.h" -#include "../OrthancServer/ServerIndex.h" +#include "../../OrthancFramework/Sources/FileStorage/FilesystemStorage.h" +#include "../../OrthancFramework/Sources/FileStorage/StorageAccessor.h" +#include "../../OrthancFramework/Sources/HttpServer/BufferHttpSender.h" +#include "../../OrthancFramework/Sources/HttpServer/FilesystemHttpSender.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/OrthancException.h" +#include "../../OrthancFramework/Sources/Toolbox.h" +#include "../Sources/ServerIndex.h" using namespace Orthanc; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/FromDcmtkTests.cpp --- a/OrthancServer/UnitTestsSources/FromDcmtkTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/UnitTestsSources/FromDcmtkTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,24 +34,24 @@ #include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/Compatibility.h" -#include "../Core/DicomNetworking/DicomFindAnswers.h" -#include "../Core/DicomParsing/DicomModification.h" -#include "../Core/DicomParsing/DicomWebJsonVisitor.h" -#include "../Core/DicomParsing/FromDcmtkBridge.h" -#include "../Core/DicomParsing/Internals/DicomImageDecoder.h" -#include "../Core/DicomParsing/ToDcmtkBridge.h" -#include "../Core/Endianness.h" -#include "../Core/Images/Image.h" -#include "../Core/Images/ImageBuffer.h" -#include "../Core/Images/ImageProcessing.h" -#include "../Core/Images/PngReader.h" -#include "../Core/Images/PngWriter.h" -#include "../Core/OrthancException.h" -#include "../Core/SystemToolbox.h" -#include "../OrthancServer/ServerToolbox.h" +#include "../../OrthancFramework/Sources/Compatibility.h" +#include "../../OrthancFramework/Sources/DicomNetworking/DicomFindAnswers.h" +#include "../../OrthancFramework/Sources/DicomParsing/DicomModification.h" +#include "../../OrthancFramework/Sources/DicomParsing/DicomWebJsonVisitor.h" +#include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" +#include "../../OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.h" +#include "../../OrthancFramework/Sources/DicomParsing/ToDcmtkBridge.h" +#include "../../OrthancFramework/Sources/Endianness.h" +#include "../../OrthancFramework/Sources/Images/Image.h" +#include "../../OrthancFramework/Sources/Images/ImageBuffer.h" +#include "../../OrthancFramework/Sources/Images/ImageProcessing.h" +#include "../../OrthancFramework/Sources/Images/PngReader.h" +#include "../../OrthancFramework/Sources/Images/PngWriter.h" +#include "../../OrthancFramework/Sources/OrthancException.h" +#include "../../OrthancFramework/Sources/SystemToolbox.h" +#include "../Sources/ServerToolbox.h" #include "../Plugins/Engine/PluginsEnumerations.h" -#include "../Resources/EncodingTests.h" +#include "../../OrthancFramework/Resources/CodeGeneration/EncodingTests.h" #include #include @@ -1929,8 +1929,8 @@ #if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1 -#include "../Core/DicomNetworking/DicomStoreUserConnection.h" -#include "../Core/DicomParsing/DcmtkTranscoder.h" +#include "../../OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.h" +#include "../../OrthancFramework/Sources/DicomParsing/DcmtkTranscoder.h" TEST(Toto, DISABLED_Transcode3) { diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/ImageTests.cpp --- a/OrthancServer/UnitTestsSources/ImageTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/UnitTestsSources/ImageTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,19 +34,19 @@ #include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/Images/Font.h" -#include "../Core/Images/Image.h" -#include "../Core/Images/ImageProcessing.h" -#include "../Core/Images/JpegReader.h" -#include "../Core/Images/JpegWriter.h" -#include "../Core/Images/PngReader.h" -#include "../Core/Images/PngWriter.h" -#include "../Core/Images/PamReader.h" -#include "../Core/Images/PamWriter.h" -#include "../Core/SystemToolbox.h" -#include "../Core/Toolbox.h" -#include "../Core/TemporaryFile.h" -#include "../OrthancServer/OrthancConfiguration.h" // For the FontRegistry +#include "../../OrthancFramework/Sources/Images/Font.h" +#include "../../OrthancFramework/Sources/Images/Image.h" +#include "../../OrthancFramework/Sources/Images/ImageProcessing.h" +#include "../../OrthancFramework/Sources/Images/JpegReader.h" +#include "../../OrthancFramework/Sources/Images/JpegWriter.h" +#include "../../OrthancFramework/Sources/Images/PngReader.h" +#include "../../OrthancFramework/Sources/Images/PngWriter.h" +#include "../../OrthancFramework/Sources/Images/PamReader.h" +#include "../../OrthancFramework/Sources/Images/PamWriter.h" +#include "../../OrthancFramework/Sources/SystemToolbox.h" +#include "../../OrthancFramework/Sources/Toolbox.h" +#include "../../OrthancFramework/Sources/TemporaryFile.h" +#include "../Sources/OrthancConfiguration.h" // For the FontRegistry #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/LuaTests.cpp --- a/OrthancServer/UnitTestsSources/LuaTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/UnitTestsSources/LuaTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -38,9 +38,9 @@ #include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/OrthancException.h" -#include "../Core/Toolbox.h" -#include "../Core/Lua/LuaFunctionCall.h" +#include "../../OrthancFramework/Sources/OrthancException.h" +#include "../../OrthancFramework/Sources/Toolbox.h" +#include "../../OrthancFramework/Sources/Lua/LuaFunctionCall.h" #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/MemoryCacheTests.cpp --- a/OrthancServer/UnitTestsSources/MemoryCacheTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/UnitTestsSources/MemoryCacheTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -39,12 +39,12 @@ #include #include -#include "../Core/Cache/MemoryCache.h" -#include "../Core/Cache/MemoryStringCache.h" -#include "../Core/Cache/SharedArchive.h" -#include "../Core/IDynamicObject.h" -#include "../Core/Logging.h" -#include "../OrthancServer/StorageCommitmentReports.h" +#include "../../OrthancFramework/Sources/Cache/MemoryCache.h" +#include "../../OrthancFramework/Sources/Cache/MemoryStringCache.h" +#include "../../OrthancFramework/Sources/Cache/SharedArchive.h" +#include "../../OrthancFramework/Sources/IDynamicObject.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../Sources/StorageCommitmentReports.h" TEST(LRU, Basic) diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/MultiThreadingTests.cpp --- a/OrthancServer/UnitTestsSources/MultiThreadingTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/UnitTestsSources/MultiThreadingTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,39 +34,39 @@ #include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/Compatibility.h" -#include "../Core/FileStorage/MemoryStorageArea.h" -#include "../Core/JobsEngine/JobsEngine.h" -#include "../Core/Logging.h" -#include "../Core/MultiThreading/SharedMessageQueue.h" -#include "../Core/OrthancException.h" -#include "../Core/SerializationToolbox.h" -#include "../Core/SystemToolbox.h" -#include "../Core/Toolbox.h" -#include "../OrthancServer/Database/SQLiteDatabaseWrapper.h" -#include "../OrthancServer/ServerContext.h" -#include "../OrthancServer/ServerJobs/LuaJobManager.h" -#include "../OrthancServer/ServerJobs/OrthancJobUnserializer.h" +#include "../../OrthancFramework/Sources/Compatibility.h" +#include "../../OrthancFramework/Sources/FileStorage/MemoryStorageArea.h" +#include "../../OrthancFramework/Sources/JobsEngine/JobsEngine.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/MultiThreading/SharedMessageQueue.h" +#include "../../OrthancFramework/Sources/OrthancException.h" +#include "../../OrthancFramework/Sources/SerializationToolbox.h" +#include "../../OrthancFramework/Sources/SystemToolbox.h" +#include "../../OrthancFramework/Sources/Toolbox.h" +#include "../Sources/Database/SQLiteDatabaseWrapper.h" +#include "../Sources/ServerContext.h" +#include "../Sources/ServerJobs/LuaJobManager.h" +#include "../Sources/ServerJobs/OrthancJobUnserializer.h" -#include "../Core/JobsEngine/Operations/JobOperationValues.h" -#include "../Core/JobsEngine/Operations/NullOperationValue.h" -#include "../Core/JobsEngine/Operations/StringOperationValue.h" -#include "../OrthancServer/ServerJobs/Operations/DicomInstanceOperationValue.h" +#include "../../OrthancFramework/Sources/JobsEngine/Operations/JobOperationValues.h" +#include "../../OrthancFramework/Sources/JobsEngine/Operations/NullOperationValue.h" +#include "../../OrthancFramework/Sources/JobsEngine/Operations/StringOperationValue.h" +#include "../Sources/ServerJobs/Operations/DicomInstanceOperationValue.h" -#include "../Core/JobsEngine/Operations/LogJobOperation.h" -#include "../OrthancServer/ServerJobs/Operations/DeleteResourceOperation.h" -#include "../OrthancServer/ServerJobs/Operations/ModifyInstanceOperation.h" -#include "../OrthancServer/ServerJobs/Operations/StorePeerOperation.h" -#include "../OrthancServer/ServerJobs/Operations/StoreScuOperation.h" -#include "../OrthancServer/ServerJobs/Operations/SystemCallOperation.h" +#include "../../OrthancFramework/Sources/JobsEngine/Operations/LogJobOperation.h" +#include "../Sources/ServerJobs/Operations/DeleteResourceOperation.h" +#include "../Sources/ServerJobs/Operations/ModifyInstanceOperation.h" +#include "../Sources/ServerJobs/Operations/StorePeerOperation.h" +#include "../Sources/ServerJobs/Operations/StoreScuOperation.h" +#include "../Sources/ServerJobs/Operations/SystemCallOperation.h" -#include "../OrthancServer/ServerJobs/ArchiveJob.h" -#include "../OrthancServer/ServerJobs/DicomModalityStoreJob.h" -#include "../OrthancServer/ServerJobs/DicomMoveScuJob.h" -#include "../OrthancServer/ServerJobs/MergeStudyJob.h" -#include "../OrthancServer/ServerJobs/OrthancPeerStoreJob.h" -#include "../OrthancServer/ServerJobs/ResourceModificationJob.h" -#include "../OrthancServer/ServerJobs/SplitStudyJob.h" +#include "../Sources/ServerJobs/ArchiveJob.h" +#include "../Sources/ServerJobs/DicomModalityStoreJob.h" +#include "../Sources/ServerJobs/DicomMoveScuJob.h" +#include "../Sources/ServerJobs/MergeStudyJob.h" +#include "../Sources/ServerJobs/OrthancPeerStoreJob.h" +#include "../Sources/ServerJobs/ResourceModificationJob.h" +#include "../Sources/ServerJobs/SplitStudyJob.h" using namespace Orthanc; diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/PluginsTests.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OrthancServer/UnitTestsSources/PluginsTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -0,0 +1,117 @@ +/** + * Orthanc - A Lightweight, RESTful DICOM Store + * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics + * Department, University Hospital of Liege, Belgium + * Copyright (C) 2017-2020 Osimis S.A., Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * In addition, as a special exception, the copyright holders of this + * program give permission to link the code of its release with the + * OpenSSL project's "OpenSSL" library (or with modified versions of it + * that use the same license as the "OpenSSL" library), and distribute + * the linked executables. You must obey the GNU General Public License + * in all respects for all of the code used other than "OpenSSL". If you + * modify file(s) with this exception, you may extend this exception to + * your version of the file(s), but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source files + * in the program, then also delete it here. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + **/ + + +#include "PrecompiledHeadersUnitTests.h" +#include "gtest/gtest.h" + +#include "../../OrthancFramework/Sources/OrthancException.h" +#include "../Plugins/Engine/PluginsManager.h" + +using namespace Orthanc; + + +#if ORTHANC_ENABLE_PLUGINS == 1 + +TEST(SharedLibrary, Enumerations) +{ + // The plugin engine cannot work if the size of an enumeration does + // not correspond to the size of "int32_t" + ASSERT_EQ(sizeof(int32_t), sizeof(OrthancPluginErrorCode)); +} + + +TEST(SharedLibrary, Basic) +{ +#if defined(_WIN32) + SharedLibrary l("kernel32.dll"); + ASSERT_THROW(l.GetFunction("world"), OrthancException); + ASSERT_TRUE(l.GetFunction("GetVersionExW") != NULL); + ASSERT_TRUE(l.HasFunction("GetVersionExW")); + ASSERT_FALSE(l.HasFunction("world")); + +#elif defined(__LSB_VERSION__) + // For Linux Standard Base, we use a low-level shared library coming + // with glibc: + // http://www.linuxfromscratch.org/lfs/view/6.5/chapter06/glibc.html + SharedLibrary l("libSegFault.so"); + ASSERT_THROW(l.GetFunction("world"), OrthancException); + ASSERT_FALSE(l.HasFunction("world")); + + /** + * On the Docker image "debian:buster-slim", the "libSegFault.so" + * library does exist, but does not contain any public symbol: + * + * $ sudo docker run -i -t --rm --entrypoint=bash debian:buster-slim + * # apt-get update && apt-get install -y binutils + * # nm -C /lib/x86_64-linux-gnu/libSegFault.so + * nm: /lib/x86_64-linux-gnu/libSegFault.so: no symbols + * + * As a consequence, this part of the test is disabled since Orthanc + * 1.5.1, until we locate another shared library that is widely + * spread. Reference: + * https://groups.google.com/d/msg/orthanc-users/v-QFzpOzgJY/4Hm5NgxKBwAJ + **/ + + //ASSERT_TRUE(l.GetFunction("_init") != NULL); + //ASSERT_TRUE(l.HasFunction("_init")); + +#elif defined(__linux__) || defined(__FreeBSD_kernel__) + SharedLibrary l("libdl.so"); + ASSERT_THROW(l.GetFunction("world"), OrthancException); + ASSERT_TRUE(l.GetFunction("dlopen") != NULL); + ASSERT_TRUE(l.HasFunction("dlclose")); + ASSERT_FALSE(l.HasFunction("world")); + +#elif defined(__FreeBSD__) || defined(__OpenBSD__) + // dlopen() in FreeBSD/OpenBSD is supplied by libc, libc.so is + // a ldscript, so we can't actually use it. Use thread + // library instead - if it works - dlopen() is good. + SharedLibrary l("libpthread.so"); + ASSERT_THROW(l.GetFunction("world"), OrthancException); + ASSERT_TRUE(l.GetFunction("pthread_create") != NULL); + ASSERT_TRUE(l.HasFunction("pthread_cancel")); + ASSERT_FALSE(l.HasFunction("world")); + +#elif defined(__APPLE__) && defined(__MACH__) + SharedLibrary l("libdl.dylib"); + ASSERT_THROW(l.GetFunction("world"), OrthancException); + ASSERT_TRUE(l.GetFunction("dlopen") != NULL); + ASSERT_TRUE(l.HasFunction("dlclose")); + ASSERT_FALSE(l.HasFunction("world")); + +#else +#error Support your platform here +#endif +} + +#endif diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/PrecompiledHeadersUnitTests.h --- a/OrthancServer/UnitTestsSources/PrecompiledHeadersUnitTests.h Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/UnitTestsSources/PrecompiledHeadersUnitTests.h Wed Jun 10 21:27:31 2020 +0200 @@ -33,9 +33,9 @@ #pragma once -#include "../OrthancServer/PrecompiledHeadersServer.h" +#include "../Sources/PrecompiledHeadersServer.h" #if ORTHANC_USE_PRECOMPILED_HEADERS == 1 -#include "../Core/EnumerationDictionary.h" +#include "../../OrthancFramework/Sources/EnumerationDictionary.h" #include #endif diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/ServerIndexTests.cpp --- a/OrthancServer/UnitTestsSources/ServerIndexTests.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/UnitTestsSources/ServerIndexTests.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -34,14 +34,14 @@ #include "PrecompiledHeadersUnitTests.h" #include "gtest/gtest.h" -#include "../Core/Compatibility.h" -#include "../Core/FileStorage/FilesystemStorage.h" -#include "../Core/FileStorage/MemoryStorageArea.h" -#include "../Core/Logging.h" -#include "../OrthancServer/Database/SQLiteDatabaseWrapper.h" -#include "../OrthancServer/Search/DatabaseLookup.h" -#include "../OrthancServer/ServerContext.h" -#include "../OrthancServer/ServerToolbox.h" +#include "../../OrthancFramework/Sources/Compatibility.h" +#include "../../OrthancFramework/Sources/FileStorage/FilesystemStorage.h" +#include "../../OrthancFramework/Sources/FileStorage/MemoryStorageArea.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../Sources/Database/SQLiteDatabaseWrapper.h" +#include "../Sources/Search/DatabaseLookup.h" +#include "../Sources/ServerContext.h" +#include "../Sources/ServerToolbox.h" #include #include diff -r d25f4c0fa160 -r 05b8fd21089c OrthancServer/UnitTestsSources/UnitTestsMain.cpp --- a/OrthancServer/UnitTestsSources/UnitTestsMain.cpp Wed Jun 10 20:30:34 2020 +0200 +++ b/OrthancServer/UnitTestsSources/UnitTestsMain.cpp Wed Jun 10 21:27:31 2020 +0200 @@ -32,16 +32,16 @@ #include "PrecompiledHeadersUnitTests.h" -#include "../Core/EnumerationDictionary.h" +#include "../../OrthancFramework/Sources/EnumerationDictionary.h" #include "gtest/gtest.h" -#include "../Core/Logging.h" -#include "../Core/Toolbox.h" -#include "../Core/OrthancException.h" +#include "../../OrthancFramework/Sources/Logging.h" +#include "../../OrthancFramework/Sources/Toolbox.h" +#include "../../OrthancFramework/Sources/OrthancException.h" -#include "../OrthancServer/OrthancInitialization.h" -#include "../OrthancServer/ServerEnumerations.h" +#include "../Sources/OrthancInitialization.h" +#include "../Sources/ServerEnumerations.h" using namespace Orthanc;