Changeset 2209

Timestamp:

04/22/09 04:22:32 (4 years ago)

Author:

lmajano

Message:

Ticket #711
Handler registration is out of sequence, now fixed so interceptors can actually use events also.

Location:

coldbox/trunk

Files:

• system/Coldbox.cfc (modified) (2 diffs)
• system/plugins/BeanFactory.cfc (modified) (2 diffs)
• system/remote/ColdboxProxy.cfc (modified) (1 diff)
• system/services/HandlerService.cfc (modified) (2 diffs)
• system/services/LoaderService.cfc (modified) (3 diffs)
• system/services/PluginService.cfc (modified) (2 diffs)
• system/testing/BaseTestCase.cfc (modified) (1 diff)
• system/util/collections/BaseDictionary.cfc (moved) (moved from coldbox/trunk/system/util/BaseDictionary.cfc)
• testing/cases/interceptors/securityTest.cfc (modified) (6 diffs)
• testing/cases/services/loaderserviceTest.cfc (modified) (2 diffs)
• testing/cases/util/collections (added)
• testing/cases/util/collections/BaseDictionaryTest.cfc (moved) (moved from coldbox/trunk/testing/cases/util/BaseDictionaryTest.cfc) (1 diff)

coldbox/trunk/system/Coldbox.cfc

@@ -63 +63 @@
                         application[COLDBOX_APP_KEY] = CreateObject("component","coldbox.system.Controller").init(COLDBOX_APP_ROOT_PATH);
                         /* Setup the Framework And Application */
-                        application[COLDBOX_APP_KEY].getLoaderService().setupCalls(COLDBOX_CONFIG_FILE);                        
+                        application[COLDBOX_APP_KEY].getLoaderService().configLoader(COLDBOX_CONFIG_FILE);                      
                 </cfscript>
         </cffunction>
@@ -85 +85 @@
                                         <cflock type="exclusive" name="#getAppHash()#" timeout="#getLockTimeout()#" throwontimeout="true">
                                                 <cfset application[COLDBOX_APP_KEY].setAppStartHandlerFired(false)>
-                                                <cfset application[COLDBOX_APP_KEY].getLoaderService().setupCalls(COLDBOX_CONFIG_FILE)>
+                                                <cfset application[COLDBOX_APP_KEY].getLoaderService().configLoader(COLDBOX_CONFIG_FILE)>
                                         </cflock>
                                 <cfelse>

coldbox/trunk/system/plugins/BeanFactory.cfc

@@ -35 +35 @@
                         
                         /* Setup the Autowire DI Dictionary */
-                        setDICacheDictionary(CreateObject("component","coldbox.system.util.BaseDictionary").init('DIMetadata'));
+                        setDICacheDictionary(CreateObject("component","coldbox.system.util.collections.BaseDictionary").init('DIMetadata'));
                         /* Model Mappings */
                         instance.modelMappings = structnew();
@@ -952 +952 @@
 
         <!--- Get Set DI CACHE Dictionary --->
-        <cffunction name="getDICacheDictionary" access="private" output="false" returntype="coldbox.system.util.BaseDictionary" hint="Get DICacheDictionary">
+        <cffunction name="getDICacheDictionary" access="private" output="false" returntype="coldbox.system.util.collections.BaseDictionary" hint="Get DICacheDictionary">
                 <cfreturn instance.DICacheDictionary/>
         </cffunction>
         <cffunction name="setDICacheDictionary" access="private" output="false" returntype="void" hint="Set DICacheDictionary">
-                <cfargument name="DICacheDictionary" type="coldbox.system.util.BaseDictionary" required="true"/>
+                <cfargument name="DICacheDictionary" type="coldbox.system.util.collections.BaseDictionary" required="true"/>
                 <cfset instance.DICacheDictionary = arguments.DICacheDictionary/>
         </cffunction>

coldbox/trunk/system/remote/ColdboxProxy.cfc

@@ -306 +306 @@
                                         application[COLDBOX_APP_KEY] = cbController;
                                         /* Setup Calls */
-                                        cbController.getLoaderService().setupCalls(arguments.configLocation);                                   
+                                        cbController.getLoaderService().configLoader(arguments.configLocation);                                 
                                 }                               
                                 </cfscript>

coldbox/trunk/system/services/HandlerService.cfc

@@ -22 +22 @@
                         setController(arguments.controller);
                         /* Setup the Event Handler Cache Dictionary */
-                        setHandlerCacheDictionary(CreateObject("component","coldbox.system.util.BaseDictionary").init('HandlersMetadata'));
+                        setHandlerCacheDictionary(CreateObject("component","coldbox.system.util.collections.BaseDictionary").init('HandlersMetadata'));
                         /* Setup the Event Cache Dictionary */
-                        setEventCacheDictionary(CreateObject("component","coldbox.system.util.BaseDictionary").init('EventCache'));
+                        setEventCacheDictionary(CreateObject("component","coldbox.system.util.collections.BaseDictionary").init('EventCache'));
                         
                         /* Return Service */                    
@@ -324 +324 @@
         
         <!--- Handler Cache Dictionary --->
-        <cffunction name="getHandlerCacheDictionary" access="public" returntype="coldbox.system.util.BaseDictionary" output="false">
+        <cffunction name="getHandlerCacheDictionary" access="public" returntype="coldbox.system.util.collections.BaseDictionary" output="false">
                 <cfreturn instance.HandlerCacheDictionary>
         </cffunction>
         <cffunction name="setHandlerCacheDictionary" access="public" returntype="void" output="false">
-                <cfargument name="HandlerCacheDictionary" type="coldbox.system.util.BaseDictionary" required="true">
+                <cfargument name="HandlerCacheDictionary" type="coldbox.system.util.collections.BaseDictionary" required="true">
                 <cfset instance.HandlerCacheDictionary = arguments.HandlerCacheDictionary>
         </cffunction>
         
         <!--- Event Cache Dictionary --->
-        <cffunction name="getEventCacheDictionary" access="public" returntype="coldbox.system.util.BaseDictionary" output="false">
+        <cffunction name="getEventCacheDictionary" access="public" returntype="coldbox.system.util.collections.BaseDictionary" output="false">
                 <cfreturn instance.EventCacheDictionary>
         </cffunction>
         <cffunction name="setEventCacheDictionary" access="public" returntype="void" output="false">
-                <cfargument name="EventCacheDictionary" type="coldbox.system.util.BaseDictionary" required="true">
+                <cfargument name="EventCacheDictionary" type="coldbox.system.util.collections.BaseDictionary" required="true">
                 <cfset instance.EventCacheDictionary = arguments.EventCacheDictionary>
         </cffunction>

coldbox/trunk/system/services/LoaderService.cfc

@@ -27 +27 @@
 <!------------------------------------------- PUBLIC ------------------------------------------->
 
-        <!--- Setup Calls --->
-        <cffunction name="setupCalls" returntype="void" access="public" hint="I execute the framework and application loading scripts" output="false">
-                <!--- ************************************************************* --->
-                <cfargument name="overrideConfigFile" type="string" required="false" default="" hint="Only used for unit testing or reparsing of a specific coldbox config file.">
-                <cfargument name="overrideAppMapping" type="string" required="false" default="" hint="Only used for unit testing or reparsing of a specific coldbox config file."/>
-                <!--- ************************************************************* --->
-                <cfscript>
-                        //execute the configLoader
-                        configLoader(argumentCollection=arguments);
-                        //execute the handler registrations after configurations loaded
-                        getController().getHandlerService().registerHandlers();
-                </cfscript>
-        </cffunction>
-
         <!--- Config Loader Method --->
         <cffunction name="configLoader" returntype="void" access="Public" hint="I Load the configurations only, init the framework variables and more." output="false">
                 <!--- ************************************************************* --->
                 <cfargument name="overrideConfigFile" required="false" type="string" default="" hint="Only used for unit testing or reparsing of a specific coldbox config file.">
-                <cfargument name="overrideAppMapping" type="string" required="false" default="" hint="Only used for unit testing or reparsing of a specific coldbox config file."/>
+                <cfargument name="overrideAppMapping" required="false" type="string" default="" hint="Only used for unit testing or reparsing of a specific coldbox config file."/>
                 <!--- ************************************************************* --->
                 <cfscript>
@@ -58 +44 @@
                         controller.getHandlerService().clearDictionaries();
                         
-                        //Prepare Parser
+                        /* Prepare Parser */
                         XMLParser = controller.getPlugin("XMLParser");
                         
-                        //Load Coldbox Config Settings Structure
+                        /* Load Coldbox Config Settings Structure */
                         FrameworkSettings = XMLParser.loadFramework(arguments.overrideConfigFile);
                         controller.setColdboxSettings(FrameworkSettings);
                         
-                        //Create the Cache Config Bean with data from the framework's settings.xml
+                        /* Create the Cache Config Bean with data from the framework's settings.xml */
                         CacheConfigBean.populate(FrameworkSettings);
-                        //Configure the Object Cache for first usage.
+                        /* Configure the Object Cache for first usage. */
                         controller.getColdboxOCM().configure(CacheConfigBean);
                         
-                        //Load Application Config Settings Now that framework has been loaded.
+                        /* Load Application Config Settings Now that framework has been loaded. */
                         ConfigSettings = XMLParser.parseConfig(arguments.overrideAppMapping);
                         controller.setConfigSettings(ConfigSettings);
                         
-                        //Check for Cache OVerride Settings in Config
+                        /* Check for Cache OVerride Settings in Config */
                         if ( ConfigSettings.CacheSettings.OVERRIDE ){
                                 //Recreate the Config Bean
@@ -88 +74 @@
                         }
                         
-                        /* Populate Debugger with settings from the framework */
-                        DebuggerConfigBean.populate(FrameworkSettings);
-                        
                         /* Check for Debugger Override, if true, then overpopulate with configuration settings overriding framework settings. */
                         if( ConfigSettings.DebuggerSettings.OVERRIDE ){
                                 DebuggerConfigBean.populate(ConfigSettings.DebuggerSettings);
                         }
+                        else{
+                                /* Populate Debugger with settings from the framework */
+                                DebuggerConfigBean.populate(FrameworkSettings);
+                        }
                         
-                        /* Configure the Debugger with framework wide settings.*/
+                        /* Configure the Debugger For Usage*/
                         controller.getDebuggerService().setDebuggerConfigBean(DebuggerConfigBean);
+                        
+                        /* execute the handler registrations after configurations loaded */
+                        controller.getHandlerService().registerHandlers();
                         
                         /* Register The Interceptors */

coldbox/trunk/system/services/PluginService.cfc

@@ -27 +27 @@
                         /* Set Service Properties */
                         setColdBoxPluginsPath('coldbox.system.plugins');
-                        setCacheDictionary(CreateObject("component","coldbox.system.util.BaseDictionary").init('PluginMetadata'));
+                        setCacheDictionary(CreateObject("component","coldbox.system.util.collections.BaseDictionary").init('PluginMetadata'));
                         
                         /* Return instance */
@@ -167 +167 @@
         <cffunction name="setcacheDictionary" access="private" output="false" returntype="void" hint="Set the plugin cache dictionary. NOT EXPOSED to avoid screwups">
                 <!--- ************************************************************* --->
-                <cfargument name="cacheDictionary" type="coldbox.system.util.BaseDictionary" required="true"/>
+                <cfargument name="cacheDictionary" type="coldbox.system.util.collections.BaseDictionary" required="true"/>
                 <!--- ************************************************************* --->
                 <cfset instance.cacheDictionary = arguments.cacheDictionary/>

coldbox/trunk/system/testing/BaseTestCase.cfc

@@ -52 +52 @@
                         }
                         /* Setup */
-                        instance.controller.getLoaderService().setupCalls(instance.ConfigMapping,instance.AppMapping);
+                        instance.controller.getLoaderService().configLoader(instance.ConfigMapping,instance.AppMapping);
                 }
                 

coldbox/trunk/testing/cases/interceptors/securityTest.cfc

@@ -88 +88 @@
                         
                         //resetup
-                        getController().getLoaderService().setupCalls(getConfigMapping(),getAppMapping());
+                        getController().getLoaderService().configLoader(getConfigMapping(),getAppMapping());
                 </cfscript>
                 <!--- Login a user --->
@@ -121 +121 @@
                 
                 //resetup
-                getController().getLoaderService().setupCalls(getConfigMapping(),getAppMapping());
+                getController().getLoaderService().configLoader(getConfigMapping(),getAppMapping());
         
                 </cfscript>
@@ -136 +136 @@
                 
                 //resetup
-                getController().getLoaderService().setupCalls(getConfigMapping(),getAppMapping());
+                getController().getLoaderService().configLoader(getConfigMapping(),getAppMapping());
                                 
                 </cfscript>
@@ -151 +151 @@
                 
                 //resetup
-                getController().getLoaderService().setupCalls(getConfigMapping(),getAppMapping());
+                getController().getLoaderService().configLoader(getConfigMapping(),getAppMapping());
                                 
                 </cfscript>
@@ -166 +166 @@
                 
                 //resetup
-                getController().getLoaderService().setupCalls(getConfigMapping(),getAppMapping());
+                getController().getLoaderService().configLoader(getConfigMapping(),getAppMapping());
                 
                 /* Place rules on OCM */
@@ -204 +204 @@
                 
                 //resetup
-                getController().getLoaderService().setupCalls(getConfigMapping(),getAppMapping());
+                getController().getLoaderService().configLoader(getConfigMapping(),getAppMapping());
                 
                 /* Test */

coldbox/trunk/testing/cases/services/loaderserviceTest.cfc

@@ -22 +22 @@
         </cffunction>
         
-        <cffunction name="testSetupCalls" access="public" returntype="void" output="false">
+        <cffunction name="testconfigLoader" access="public" returntype="void" output="false">
                 <cfscript>
                 var service = getController().getservice("loader");
@@ -29 +29 @@
                 getController().setSetting("dummyVar", true);
                 
-                service.setupCalls(getConfigMapping(),getAppMapping());
+                service.configLoader(getConfigMapping(),getAppMapping());
                 
                 AssertFalse( getController().settingExists("dummyVar") );               

coldbox/trunk/testing/cases/util/collections/BaseDictionaryTest.cfc

@@ -4 +4 @@
         <cffunction name="setup" output="false" access="public" returntype="any" hint="">
                 <cfscript>
-                        dictionary = CreateObject("component","coldbox.system.util.baseDictionary").init('MyTest');
+                        dictionary = CreateObject("component","coldbox.system.util.collections.BaseDictionary").init('MyTest');
                 </cfscript>
         </cffunction>