Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v diff -u -r1.189.2.185 -r1.189.2.186 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 28 Jul 2024 16:27:54 -0000 1.189.2.185 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 28 Jul 2024 17:41:05 -0000 1.189.2.186 @@ -4214,7 +4214,6 @@ # Keys in resource_info: # # "resourceDir" is the absolute path in the filesystem - # "resourceUrl" is the URL path provided to the request processor # "versionSegment" is the optional version-specific element both in the # URL and in the filesystem. # Index: openacs-4/packages/boomerang/tcl/boomerang-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/boomerang/tcl/boomerang-procs.tcl,v diff -u -r1.13.2.35 -r1.13.2.36 --- openacs-4/packages/boomerang/tcl/boomerang-procs.tcl 28 Jul 2024 12:15:00 -0000 1.13.2.35 +++ openacs-4/packages/boomerang/tcl/boomerang-procs.tcl 28 Jul 2024 17:41:06 -0000 1.13.2.36 @@ -515,17 +515,16 @@ # Provide paths for loading either via resources or CDN # set resourceDir [acs_package_root_dir boomerang/www/resources] - set resourceUrl /resources/boomerang set cdnHost cdnjs.cloudflare.com set cdn //$cdnHost/ajax/libs if {[file exists $resourceDir/boomerang-$version.js]} { # # Local version is installed # - set prefix $resourceUrl + set prefix /resources/boomerang set cdnHost "" - set cspMap "" + set cspMap "" } else { # # So far, there is no CDN form boomerang, we distribute Index: openacs-4/packages/bootstrap-icons/tcl/resource-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bootstrap-icons/tcl/resource-procs.tcl,v diff -u -r1.1.2.13 -r1.1.2.14 --- openacs-4/packages/bootstrap-icons/tcl/resource-procs.tcl 28 Jul 2024 12:15:01 -0000 1.1.2.13 +++ openacs-4/packages/bootstrap-icons/tcl/resource-procs.tcl 28 Jul 2024 17:41:06 -0000 1.1.2.14 @@ -47,15 +47,14 @@ # Setup variables for access via CDN vs. local resources. # set resourceDir [acs_package_root_dir bootstrap-icons/www/resources] - set resourceUrl /resources/bootstrap-icons set cdnHost cdnjs.cloudflare.com set cdn //$cdnHost/ if {[file exists $resourceDir/bootstrap-icons-$version]} { # # Local version is installed # - set prefix $resourceUrl/bootstrap-icons-$version + set prefix /resources/bootstrap-icons/bootstrap-icons-$version set cdnHost "" set cspMap "" } else { Index: openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl,v diff -u -r1.12.2.14 -r1.12.2.15 --- openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl 28 Jul 2024 16:27:54 -0000 1.12.2.14 +++ openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl 28 Jul 2024 17:41:06 -0000 1.12.2.15 @@ -302,7 +302,6 @@ # Provide paths for loading either via resources or CDN # # "resourceDir" is the absolute path in the filesystem - # "resourceUrl" is the URL path provided to the request processor # "versionSegment" is the version-specific element both in the # URL and in the filesystem. Index: openacs-4/packages/fa-icons/tcl/resource-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fa-icons/tcl/resource-procs.tcl,v diff -u -r1.1.2.9 -r1.1.2.10 --- openacs-4/packages/fa-icons/tcl/resource-procs.tcl 28 Jul 2024 12:15:01 -0000 1.1.2.9 +++ openacs-4/packages/fa-icons/tcl/resource-procs.tcl 28 Jul 2024 17:41:06 -0000 1.1.2.10 @@ -46,15 +46,14 @@ # Setup variables for access via CDN vs. local resources. # set resourceDir [acs_package_root_dir fa-icons/www/resources] - set resourceUrl /resources/fa-icons set cdnHost cdnjs.cloudflare.com set cdn //$cdnHost/ if {[file exists $resourceDir/fontawesome-free-$version-web/css]} { # # Local version is installed # - set prefix $resourceUrl/fontawesome-free-$version-web/css + set prefix /resources/fa-icons/fontawesome-free-$version-web/css set cdnHost "" set cspMap "" } else { Index: openacs-4/packages/highcharts/tcl/resource-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/highcharts/tcl/resource-procs.tcl,v diff -u -r1.1.2.15 -r1.1.2.16 --- openacs-4/packages/highcharts/tcl/resource-procs.tcl 28 Jul 2024 16:27:54 -0000 1.1.2.15 +++ openacs-4/packages/highcharts/tcl/resource-procs.tcl 28 Jul 2024 17:41:06 -0000 1.1.2.16 @@ -48,15 +48,14 @@ # Setup variables for access via CDN vs. local resources. # set resourceDir [acs_package_root_dir highcharts/www/resources] - set resourceUrl /resources/highcharts/$version set cdnHost cdnjs.cloudflare.com set cdn //$cdnHost/ if {[file exists $resourceDir/$version]} { # # Local version is installed # - set prefix $resourceUrl/code + set prefix /resources/highcharts/$version/code set cdnHost "" set cspMap "" } else { Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl,v diff -u -r1.5.2.9 -r1.5.2.10 --- openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 25 Jul 2024 14:24:26 -0000 1.5.2.9 +++ openacs-4/packages/openacs-bootstrap3-theme/tcl/init-procs.tcl 28 Jul 2024 17:41:06 -0000 1.5.2.10 @@ -15,12 +15,11 @@ # Provide paths for loading either via resources or CDN # set resourceDir [acs_package_root_dir openacs-bootstrap3-theme/www/resources/bootstrap] - set resourceUrl /resources/openacs-bootstrap3-theme/bootstrap - set cdn "//maxcdn.bootstrapcdn.com/bootstrap" + set cdn //maxcdn.bootstrapcdn.com/bootstrap set version $openacs_bootstrap3_theme::bootstrap_version if {[file exists $resourceDir/$version]} { - set prefix $resourceUrl/$version + set prefix /resources/openacs-bootstrap3-theme/bootstrap/$version set cdnHost "" } else { set prefix $cdn/$version Index: openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl,v diff -u -r1.1.2.16 -r1.1.2.17 --- openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl 28 Jul 2024 16:27:54 -0000 1.1.2.16 +++ openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl 28 Jul 2024 17:41:06 -0000 1.1.2.17 @@ -24,18 +24,15 @@ # Provide paths for loading either via /resources/ or CDN # # "resourceDir" is the absolute path in the filesystem - # "resourceUrl" is the URL path provided to the request processor # "versionSegment" is the version-specific element both in the # URL and in the filesystem. # - set resourceDir [acs_package_root_dir openacs-bootstrap5-theme/www/resources/bootstrap] - set resourceUrl /resources/openacs-bootstrap5-theme/bootstrap - - set versionSegment $version - set cdn //cdnjs.cloudflare.com/ajax/libs/bootstrap + set resourceDir [acs_package_root_dir openacs-bootstrap5-theme/www/resources/bootstrap] + set versionSegment $version + set cdn //cdnjs.cloudflare.com/ajax/libs/bootstrap if {[file exists $resourceDir/$versionSegment]} { - set prefix $resourceUrl/$version + set prefix /resources/openacs-bootstrap5-theme/bootstrap/$version set cdnHost "" } else { # Index: openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl,v diff -u -r1.14.2.30 -r1.14.2.31 --- openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 28 Jul 2024 12:15:01 -0000 1.14.2.30 +++ openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 28 Jul 2024 17:41:06 -0000 1.14.2.31 @@ -231,15 +231,11 @@ # Setup variables for access via CDN vs. local resources. # set resourceDir [acs_package_root_dir richtext-ckeditor4/www/resources] - set resourceUrl /resources/richtext-ckeditor4 set cdn //cdn.ckeditor.com set suffix $version/$ck_package/ckeditor.js - #ns_log notice "CKeditor4: check for locally installed file" \ - $resourceDir/$version/$ck_package -> \ - [file exists $resourceDir/$version/$ck_package] if {[file exists $resourceDir/$version/$ck_package]} { - set prefix $resourceUrl/$version + set prefix /resources/richtext-ckeditor4/$version set cdnHost "" } else { set prefix $cdn/$version Index: openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl,v diff -u -r1.4.2.5 -r1.4.2.6 --- openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl 28 Jul 2024 12:15:01 -0000 1.4.2.5 +++ openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl 28 Jul 2024 17:41:06 -0000 1.4.2.6 @@ -169,11 +169,10 @@ # Setup variables for access via CDN vs. local resources. # set resourceDir [acs_package_root_dir richtext-xinha/www/resources] - set resourceUrl /resources/richtext-xinha set cdn //s3-us-west-1.amazonaws.com/xinha if {[file exists $resourceDir/$version]} { - set prefix $resourceUrl/$version/xinha + set prefix /resources/richtext-xinha/$version/xinha set cdnHost "" } else { set prefix $cdn/xinha-$version Index: openacs-4/packages/xowiki/tcl/resource-info-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/resource-info-procs.tcl,v diff -u -r1.1.2.7 -r1.1.2.8 --- openacs-4/packages/xowiki/tcl/resource-info-procs.tcl 25 Jul 2024 14:24:26 -0000 1.1.2.7 +++ openacs-4/packages/xowiki/tcl/resource-info-procs.tcl 28 Jul 2024 17:41:06 -0000 1.1.2.8 @@ -20,11 +20,10 @@ # Setup variables for access via CDN vs. local resources. # set resourceDir [acs_package_root_dir xowiki/www/resources/bootstrap-treeview] - set resourceUrl /resources/xowiki/bootstrap-treeview set cdn //cdnjs.cloudflare.com/ajax/libs/bootstrap-treeview if {[file exists $resourceDir/$version/bootstrap-treeview.min.css]} { - set prefix $resourceUrl/$version + set prefix /resources/xowiki/bootstrap-treeview/$version set cdnHost "" } else { set prefix $cdn/$version