0
@@ -62,7 +62,7 @@ class midcom_core_component_loader
0
         {        
0
             // No component directory
0
             $this->tried_to_load[$component] = false;
0
-
0
+            
0
             throw new OutOfRangeException("Component {$component} directory not found.");
0
         }
0
         

0
@@ -5,4 +5,10 @@ enable_included_list: false
0
 date_formats:
0
     short: '%d/%m/%Y'
0
     long: '%x %X'
0
-default_timezone: UTC
0
\ No newline at end of file
0
+default_timezone: UTC
0
+routes:
0
+    page_edit:
0
+        controller: midcom_core_controllers_page
0
+        action: edit
0
+        route: /__midcom/edit
0
+        content_entry_point: midcom-edit-page
0
\ No newline at end of file

0
@@ -20,6 +20,8 @@ interface midcom_core_services_dispatcher
0
     
0
     public function populate_environment_data();
0
     
0
+    public function get_routes();
0
+    
0
     public function initialize($component);
0
     
0
     public function dispatch();    

0
@@ -61,6 +61,14 @@ class midcom_core_services_dispatcher_manual implements midcom_core_services_dis
0
         }
0
     }
0
     
0
+    public function get_routes()
0
+    {
0
+        $core_routes = $_MIDCOM->configuration->get('routes');
0
+        $component_routes = $_MIDCOM->context->component_instance->configuration->get('routes');
0
+        
0
+        return array_merge($core_routes, $component_routes);
0
+    }
0
+    
0
     public function set_page(midgard_page $page)
0
     {
0
         $this->page = $page;
0
@@ -129,7 +137,7 @@ class midcom_core_services_dispatcher_manual implements midcom_core_services_dis
0
         {
0
             $_MIDCOM->timer->setMarker("MidCOM dispatcher::dispatch::{$this->component_name}");
0
         }
0
-        $route_definitions = $_MIDCOM->context->component_instance->configuration->get('routes');
0
+        $route_definitions = $this->get_routes();
0
 
0
         $selected_route_configuration = $route_definitions[$this->route_id];
0
 

0
@@ -77,6 +77,14 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
         $this->component_name = $component;
0
         $_MIDCOM->context->component_instance = $_MIDCOM->componentloader->load($this->component_name, $page);
0
     }
0
+    
0
+    public function get_routes()
0
+    {
0
+        $core_routes = $_MIDCOM->configuration->get('routes');
0
+        $component_routes = $_MIDCOM->context->component_instance->configuration->get('routes');
0
+        
0
+        return array_merge($core_routes, $component_routes);
0
+    }
0
 
0
     /**
0
      * Load a component and dispatch the request to it
0
@@ -87,7 +95,7 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
         {
0
             $_MIDCOM->timer->setMarker('MidCOM dispatcher::dispatch');
0
         }
0
-        $route_definitions = $_MIDCOM->context->component_instance->configuration->get('routes');
0
+        $route_definitions = $this->get_routes();
0
 
0
         $route_id_map = array();
0
         foreach ($route_definitions as $route_id => $route_configuration)

0
@@ -17,9 +17,10 @@ if (count($argv) != 2)
0
 }
0
 $conffile = $argv[1];
0
 
0
-if (!extension_loaded('midgard2'))
0
+if (   !extension_loaded('midgard')
0
+    && !extension_loaded('midgard2'))
0
 {
0
-    die("Midgard 2 extension is not available\n");
0
+    die("Midgard extension is not available\n");
0
 }
0
 
0
 // Start up a Midgard connection
0
@@ -35,23 +36,30 @@ echo "Loading all components and their routes\n\n";
0
 // Go through the installed components
0
 foreach ($_MIDCOM->componentloader->manifests as $component_name => $manifest)
0
 {
0
+    // Enter new context
0
+    $_MIDCOM->context->create();
0
     $_MIDCOM->dispatcher->initialize($component_name);
0
+    
0
+    if (!$_MIDCOM->context->component_instance)
0
+    {
0
+        echo "Skipping {$component_name}: component failed to load\n\n";
0
+        $_MIDCOM->context->delete();
0
+        continue;
0
+    }
0
 
0
-    if (!$_MIDCOM->dispatcher->component_instance->configuration->exists('routes'))
0
+    if (!$_MIDCOM->context->component_instance->configuration->exists('routes'))
0
     {
0
         // No routes in this component, skip
0
         echo "Skipping {$component_name}: no routes\n\n";
0
+        $_MIDCOM->context->delete();
0
         continue;
0
     }
0
     
0
     echo "Running {$component_name}...\n";
0
     
0
-    $routes = $_MIDCOM->dispatcher->component_instance->configuration->get('routes');
0
+    $routes = $_MIDCOM->dispatcher->get_routes();
0
     foreach ($routes as $route_id => $route_configuration)
0
     {
0
-        // Enter new context
0
-        $_MIDCOM->context->create();
0
-    
0
         // Generate fake arguments
0
         preg_match_all('/\{\$(.+?)\}/', $route_configuration['route'], $route_path_matches);
0
         $route_string = $route_configuration['route'];
0
@@ -83,10 +91,9 @@ foreach ($_MIDCOM->componentloader->manifests as $component_name => $manifest)
0
         {
0
             echo "        returned no data\n";
0
         }
0
-        
0
-        // Delete the context
0
-        $_MIDCOM->context->delete();
0
     }
0
+    // Delete the context
0
+    $_MIDCOM->context->delete();
0
     echo "\n";
0
 }
0