Separate out Application from Distribution

Molajo · Feb 16, 2014 · 601a068 · 601a068
1 parent e81544b
commit 601a068
Show file tree

Hide file tree

Showing 402 changed files with 150 additions and 5,458 deletions.
diff --git a/Autoload.php b/Autoload.php
@@ -39,10 +39,13 @@ function readJsonFile($file_name)
 require_once $base_folder . '/vendor/molajo/ioc/Source/StandardServiceProvider.php';
 require_once $base_folder . '/vendor/molajo/ioc/Source/Container.php';
 require_once $base_folder . '/vendor/molajo/ioc/Source/ServiceProviderAdapter.php';
+require_once $base_folder . '/vendor/molajo/application/Service/Runtimedata/RuntimedataServiceProvider.php';
+require_once $base_folder . '/vendor/molajo/application/Service/Plugindata/PlugindataServiceProvider.php';
+require_once $base_folder . '/vendor/molajo/resource/Service/Resource/ResourceServiceProvider.php';
 
-require_once $base_folder . '/vendor/molajo/framework/Source/Resource/Api/ConfigurationDataInterface.php';
-require_once $base_folder . '/vendor/molajo/framework/Source/Resource/Api/ConfigurationInterface.php';
-require_once $base_folder . '/vendor/molajo/framework/Source/Resource/Api/RegistryInterface.php';
+require_once $base_folder . '/vendor/molajo/application/Source/Resource/Api/ConfigurationDataInterface.php';
+require_once $base_folder . '/vendor/molajo/application/Source/Resource/Api/ConfigurationInterface.php';
+require_once $base_folder . '/vendor/molajo/application/Source/Resource/Api/RegistryInterface.php';
 
 require_once $base_folder . '/vendor/commonapi/resource/ClassHandlerInterface.php';
 require_once $base_folder . '/vendor/commonapi/resource/ClassMapInterface.php';
@@ -79,11 +82,11 @@ function readJsonFile($file_name)
 $class                            = 'Molajo\\Resource\\Scheme';
 $scheme                           = new $class($file);
 $class                            = 'Molajo\\Resource\\Adapter';
-$class_loader                     = new $class($scheme, $handler_instance);
+$resource_adapter                     = new $class($scheme, $handler_instance);
 
 include __DIR__ . '/SetNamespace.php';
 
-$hold_class_loader = $class_loader;
+$hold_resource_adapter = $resource_adapter;
 
 /** Resource Map */
 if (is_file($resource_map_filename . 'vvvvvvvvvvvvvvvvvvv')) {
@@ -93,7 +96,7 @@ function readJsonFile($file_name)
 
     $class = 'Molajo\\Resource\\ResourceMap';
 
-    $class_loader = new $class (
+    $resource_adapter = new $class (
         $base_folder,
         $resource_map_filename = $base_folder . '/vendor/molajo/resource/Source/Files/Output/ResourceMap.json',
         $interface_map_filename = $base_folder . '/vendor/molajo/resource/Source/Files/Output/ClassMap.json',
@@ -102,7 +105,7 @@ function readJsonFile($file_name)
 
     include __DIR__ . '/SetNamespace.php';
 
-    $class_loader->createMap();
+    $resource_adapter->createMap();
 
     require_once $base_folder . '/vendor/molajo/resource/Source/ClassMap.php';
 

diff --git a/DM-SQL-Server.pdf b/DM-SQL-Server.pdf
diff --git a/Index.php b/Index.php
@@ -84,7 +84,8 @@
  *  VI. Fire off FrontController
  */
 require_once __DIR__ . '/Services.php';
-require_once BASE_FOLDER . '/vendor/molajo/framework/Source/Controller/FrontController.php';
+require_once BASE_FOLDER . '/vendor/commonapi/controller/FrontControllerInterface.php';
+require_once BASE_FOLDER . '/vendor/molajo/application/Source/Controller/FrontController.php';
 $front_controller_class = 'Molajo\\Controller\\FrontController';
 $front_controller       = new $front_controller_class ($ioc_container, $services);
 

diff --git a/Services.php b/Services.php
@@ -1,11 +1,12 @@
 <?php
 /**
- * Services used in Frontpage Initialize
+ * Service Provider input to FrontController Initialise
  *
  * @package    Molajo
  * @copyright  2014 Amy Stephen. All rights reserved.
  * @license    http://www.opensource.org/licenses/mit-license.html MIT License
  */
+
 $services   = array();
 $services[] = 'Runtimedata';
 $services[] = 'Plugindata';

diff --git a/SetNamespace.php b/SetNamespace.php
diff --git a/Sites/2/Cache/Extensions b/Sites/2/Cache/Extensions
diff --git a/Sites/2/Public/Js/jquery.js b/Sites/2/Public/Js/jquery.js
@@ -2787,7 +2787,7 @@
 // Always assume duplicates if they aren't passed to the comparison function
         support.detectDuplicates = hasDuplicate;
 
-// Initialize against the default document
+// Initialise against the default document
         setDocument();
 
 // Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)