Continued with rewrites:

[core.git] / framework / loader / class_ClassLoader.php

diff --git a/framework/loader/class_ClassLoader.php b/framework/loader/class_ClassLoader.php
index 0560362015876308c5d86c846d46d652bb4f3634..bc37b2ad05579cc79c992a33d66c0d9219c1fd2d 100644 (file)
--- a/framework/loader/class_ClassLoader.php
+++ b/framework/loader/class_ClassLoader.php
@@ -4,7 +4,6 @@ namespace CoreFramework\Loader;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
-use CoreFramework\EntryPoint\ApplicationEntryPoint;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 // Import SPL stuff
@@ -217,8 +216,8 @@ class ClassLoader {
 
                        // Generate full path from it
                        $pathName = realpath(sprintf(
-                               '%s/framework/main/%s/',
-                               $cfg->getConfigEntry('base_path'),
+                               '%smain/%s/',
+                               $cfg->getConfigEntry('framework_base_path'),
                                $shortPath
                        ));
 
@@ -265,7 +264,7 @@ class ClassLoader {
                        // Create path name
                        $pathName = realpath(sprintf(
                                '%s/%s/%s',
-                               $cfg->getConfigEntry('application_path'),
+                               $cfg->getConfigEntry('application_base_path'),
                                $cfg->getConfigEntry('app_name'),
                                $shortPath
                        ));
@@ -304,7 +303,7 @@ class ClassLoader {
                        // Create path name
                        $pathName = realpath(sprintf(
                                '%s/%s',
-                               $cfg->getConfigEntry('base_path'),
+                               $cfg->getConfigEntry('framework_base_path'),
                                $shortPath
                        ));
 
@@ -374,7 +373,7 @@ class ClassLoader {
        /**
         * Scans recursively a local path for class files which must have a prefix and a suffix as given by $this->suffix and $this->prefix
         *
-        * @param       $basePath               The relative base path to 'base_path' constant for all classes
+        * @param       $basePath               The relative base path to 'framework_base_path' constant for all classes
         * @param       $ignoreList             An optional list (array forced) of directory and file names which shall be ignored
         * @return      void
         */
@@ -465,7 +464,7 @@ class ClassLoader {
                $this->prefix = 'config-';
 
                // Set base directory
-               $basePath = $this->configInstance->getConfigEntry('base_path') . 'framework/config/';
+               $basePath = $this->configInstance->getConfigEntry('framework_base_path') . 'config/';
 
                // Load all classes from the config directory
                $this->scanClassPath($basePath);
@@ -489,8 +488,8 @@ class ClassLoader {
 
                // Construct the FQFN for the cache
                if (!defined('DEVELOPER')) {
-                       $this->listCacheFQFN  = $this->configInstance->getConfigEntry('local_db_path') . 'list-' . $this->configInstance->getConfigEntry('app_name') . '.cache';
-                       $this->classCacheFQFN = $this->configInstance->getConfigEntry('local_db_path') . 'class-' . $this->configInstance->getConfigEntry('app_name') . '.cache';
+                       $this->listCacheFQFN  = $this->configInstance->getConfigEntry('local_database_path') . 'list-' . $this->configInstance->getConfigEntry('app_name') . '.cache';
+                       $this->classCacheFQFN = $this->configInstance->getConfigEntry('local_database_path') . 'class-' . $this->configInstance->getConfigEntry('app_name') . '.cache';
                } // END - if
 
                // Set suffix and prefix from configuration