--- a/Framework/Outputs/MultiframeDicomWriter.cpp	Tue Nov 14 07:03:25 2023 +0100
+++ b/Framework/Outputs/MultiframeDicomWriter.cpp	Wed Nov 22 07:49:49 2023 +0100
@@ -224,7 +224,7 @@
        * Generate a shared SOP Instance UID that corresponds to the
        * main instance containing all the instances. This main
        * instance is purely "virtual", as it is never generated.
-       * https://bugs.orthanc-server.com/show_bug.cgi?id=145
+       * https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=145
        * http://dicom.nema.org/medical/dicom/2020d/output/chtml/part03/figures/PS3.3_C.7.6.16-1a.svg
        **/
       DicomToolbox::SetStringTag(sharedTags_, DCM_SOPInstanceUIDOfConcatenationSource,

--- a/README	Tue Nov 14 07:03:25 2023 +0100
+++ b/README	Wed Nov 22 07:49:49 2023 +0100
@@ -52,10 +52,10 @@
 ----------------------
 
 Build instructions are similar to that of Orthanc:
-http://book.orthanc-server.com/faq/compiling.html
+https://orthanc.uclouvain.be/book/faq/compiling.html
 
 Usage details are available as part of the Orthanc Book:
-http://book.orthanc-server.com/plugins/wsi.html
+https://orthanc.uclouvain.be/book/plugins/wsi.html
 
 The two command-line tools can be found in folder "Applications".
 They come with an extensive "--help" option.
@@ -72,7 +72,7 @@
 
 Instructions for contributing to the Orthanc project are included in
 the Orthanc Book:
-https://book.orthanc-server.com/developers/repositories.html
+https://orthanc.uclouvain.be/book/developers/repositories.html
 
 
 

--- a/Resources/CMake/LibTiffConfiguration.cmake	Tue Nov 14 07:03:25 2023 +0100
+++ b/Resources/CMake/LibTiffConfiguration.cmake	Wed Nov 22 07:49:49 2023 +0100
@@ -22,7 +22,7 @@
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_LIBTIFF)
   SET(LIBTIFF_SOURCES_DIR ${CMAKE_BINARY_DIR}/tiff-4.2.0)
-  SET(LIBTIFF_URL "https://orthanc.uclouvain.be/third-party-downloads/tiff-4.2.0.tar.gz")
+  SET(LIBTIFF_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/tiff-4.2.0.tar.gz")
   SET(LIBTIFF_MD5 "2bbf6db1ddc4a59c89d6986b368fc063")
 
   DownloadPackage(${LIBTIFF_MD5} ${LIBTIFF_URL} "${LIBTIFF_SOURCES_DIR}")

--- a/Resources/CMake/OpenJpegConfiguration.cmake	Tue Nov 14 07:03:25 2023 +0100
+++ b/Resources/CMake/OpenJpegConfiguration.cmake	Wed Nov 22 07:49:49 2023 +0100
@@ -20,7 +20,7 @@
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENJPEG)
   SET(OPENJPEG_SOURCES_DIR ${CMAKE_BINARY_DIR}/openjpeg-2.4.0)
-  SET(OPENJPEG_URL "https://orthanc.uclouvain.be/third-party-downloads/openjpeg-2.4.0.tar.gz")
+  SET(OPENJPEG_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/openjpeg-2.4.0.tar.gz")
   SET(OPENJPEG_MD5 "4d388298335947367e91f1d100468af1")
 
   if (IS_DIRECTORY "${OPENJPEG_SOURCES_DIR}")

--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Nov 14 07:03:25 2023 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Wed Nov 22 07:49:49 2023 +0100
@@ -168,21 +168,27 @@
       #
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df")
         # DICOMweb 1.1 (framework pre-1.6.0)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f")
         # Stone Web viewer 1.0 (framework pre-1.8.1)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4a3ba4bf4ba7")
         # PostgreSQL 3.3 (framework pre-1.8.2)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "2d82bddf06f9cfe82095495cb3b8abde")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "23ad1b9c7800")
         # For "Toolbox::ReadJson()" and "Toolbox::Write{...}Json()" (pre-1.9.0)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "9af92080e57c60dd288eba46ce606c00")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "b2e08d83e21d")
         # WSI 1.1 (framework pre-1.10.0), to remove "-std=c++11"
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "2eaa073cbb4b44ffba199ad93393b2b1")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "daf4807631c5")
         # DICOMweb 1.15 (framework pre-1.12.2)
+        set(ORTHANC_FRAMEWORK_PRE_RELEASE ON)
         set(ORTHANC_FRAMEWORK_MD5 "c644aff2817306b3207c98c92e43f35f")
       endif()
     endif()
@@ -320,7 +326,11 @@
   else()
     # Default case: Download from the official Web site
     set(ORTHANC_FRAMEMORK_FILENAME Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz)
-    set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/third-party-downloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}")
+    if (ORTHANC_FRAMEWORK_PRE_RELEASE)
+      set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/orthanc-framework/${ORTHANC_FRAMEMORK_FILENAME}")
+    else()
+      set(ORTHANC_FRAMEWORK_URL "https://orthanc.uclouvain.be/downloads/sources/orthanc/${ORTHANC_FRAMEMORK_FILENAME}")
+    endif()
   endif()
 
   set(ORTHANC_FRAMEWORK_ARCHIVE "${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/${ORTHANC_FRAMEMORK_FILENAME}")

--- a/TODO	Tue Nov 14 07:03:25 2023 +0100
+++ b/TODO	Wed Nov 22 07:49:49 2023 +0100
@@ -17,7 +17,7 @@
 -------
 
 * Integration tests for photometric interpretations
-  (https://bugs.orthanc-server.com/show_bug.cgi?id=144) => all
+  (https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=144) => all
   possibilities (2x2x3) with "--rencode", "--pyramid", "--compression"
   X all possible input photometric interpretations (6 = PNG, JPEG, PNG
   grayscale, TIFF RGB, TIFF YCbCr, TIFF grayscale)

--- a/ViewerPlugin/CMakeLists.txt	Tue Nov 14 07:03:25 2023 +0100
+++ b/ViewerPlugin/CMakeLists.txt	Wed Nov 22 07:49:49 2023 +0100
@@ -145,7 +145,7 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENLAYERS)
   DownloadPackage(
     "77e57aad873c2d4deea8bb1446e9b87a"
-    "https://orthanc.uclouvain.be/third-party-downloads/openlayers-3.19.0-dist.zip"
+    "https://orthanc.uclouvain.be/downloads/third-party-downloads/openlayers-3.19.0-dist.zip"
     "v3.19.0-dist")
   
   set(OPENLAYERS_RESOURCES