1 files changed, 46 insertions, 12 deletions

diff --git a/mod/mod-repository-root.cxx b/mod/mod-repository-root.cxx
index ed170c9..34b4007 100644
--- a/mod/mod-repository-root.cxx
+++ b/mod/mod-repository-root.cxx
@@ -1,5 +1,4 @@
 // file      : mod/mod-repository-root.cxx -*- C++ -*-
-// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
 #include <mod/mod-repository-root.hxx>
@@ -9,15 +8,15 @@
 #include <cmark-gfm-core-extensions.h>
 
 #include <sstream>
-#include <algorithm> // find()
 
-#include <web/module.hxx>
+#include <web/server/module.hxx>
 
 #include <mod/module.hxx>
-#include <mod/options.hxx>
+#include <mod/module-options.hxx>
 
 #include <mod/mod-ci.hxx>
 #include <mod/mod-submit.hxx>
+#include <mod/mod-upload.hxx>
 #include <mod/mod-builds.hxx>
 #include <mod/mod-packages.hxx>
 #include <mod/mod-build-log.hxx>
@@ -109,24 +108,42 @@ namespace brep
   //
   repository_root::
   repository_root ()
-      : packages_ (make_shared<packages> ()),
+      :
+        //
+        // Only create and populate the tenant service map in the examplar
+        // passing a reference to it to all the sub-handler exemplars. Note
+        // that we dispatch the tenant service callbacks to the examplar
+        // without creating a new instance for each callback (thus the
+        // callbacks are const).
+        //
+        tenant_service_map_ (make_shared<tenant_service_map> ()),
+        packages_ (make_shared<packages> ()),
         package_details_ (make_shared<package_details> ()),
         package_version_details_ (make_shared<package_version_details> ()),
         repository_details_ (make_shared<repository_details> ()),
-        build_task_ (make_shared<build_task> ()),
-        build_result_ (make_shared<build_result> ()),
-        build_force_ (make_shared<build_force> ()),
+        build_task_ (make_shared<build_task> (*tenant_service_map_)),
+        build_result_ (make_shared<build_result> (*tenant_service_map_)),
+        build_force_ (make_shared<build_force> (*tenant_service_map_)),
         build_log_ (make_shared<build_log> ()),
         builds_ (make_shared<builds> ()),
         build_configs_ (make_shared<build_configs> ()),
         submit_ (make_shared<submit> ()),
-        ci_ (make_shared<ci> ())
+#ifdef BREP_CI_TENANT_SERVICE
+        ci_ (make_shared<ci> (*tenant_service_map_)),
+#else
+        ci_ (make_shared<ci> ()),
+#endif
+        upload_ (make_shared<upload> ())
   {
   }
 
   repository_root::
   repository_root (const repository_root& r)
       : handler (r),
+        tenant_service_map_ (
+          r.initialized_
+          ? r.tenant_service_map_
+          : make_shared<tenant_service_map> ()),
         //
         // Deep/shallow-copy sub-handlers depending on whether this is an
         // exemplar/handler.
@@ -151,15 +168,15 @@ namespace brep
         build_task_ (
           r.initialized_
           ? r.build_task_
-          : make_shared<build_task> (*r.build_task_)),
+          : make_shared<build_task> (*r.build_task_, *tenant_service_map_)),
         build_result_ (
           r.initialized_
           ? r.build_result_
-          : make_shared<build_result> (*r.build_result_)),
+          : make_shared<build_result> (*r.build_result_, *tenant_service_map_)),
         build_force_ (
           r.initialized_
           ? r.build_force_
-          : make_shared<build_force> (*r.build_force_)),
+          : make_shared<build_force> (*r.build_force_, *tenant_service_map_)),
         build_log_ (
           r.initialized_
           ? r.build_log_
@@ -179,7 +196,15 @@ namespace brep
         ci_ (
           r.initialized_
           ? r.ci_
+#ifdef BREP_CI_TENANT_SERVICE
+          : make_shared<ci> (*r.ci_, *tenant_service_map_)),
+#else
           : make_shared<ci> (*r.ci_)),
+#endif
+        upload_ (
+          r.initialized_
+          ? r.upload_
+          : make_shared<upload> (*r.upload_)),
         options_ (
           r.initialized_
           ? r.options_
@@ -206,6 +231,7 @@ namespace brep
     append (r, build_configs_->options ());
     append (r, submit_->options ());
     append (r, ci_->options ());
+    append (r, upload_->options ());
     return r;
   }
 
@@ -251,6 +277,7 @@ namespace brep
     sub_init (*build_configs_, "build_configs");
     sub_init (*submit_, "submit");
     sub_init (*ci_, "ci");
+    sub_init (*upload_, "upload");
 
     // Parse own configuration options.
     //
@@ -446,6 +473,13 @@ namespace brep
 
           return handle ("ci", param);
         }
+        else if (func == "upload")
+        {
+          if (handler_ == nullptr)
+            handler_.reset (new upload (*upload_));
+
+          return handle ("upload", param);
+        }
         else
           return nullopt;
       };