Changeset 2457

Timestamp:

07/20/09 23:31:09 (4 years ago)

Author:

lmajano

Message:

you can now override almost all elements in a per-environment file if you declare it.
At last some xml parsing refactoring.

Location:

coldbox/trunk/system

Files:

• includes/Debug.cfm (modified) (4 diffs)
• interceptors/EnvironmentControl.cfc (modified) (5 diffs)
• plugins/Webservices.cfc (modified) (3 diffs)
• plugins/XMLParser.cfc (modified) (29 diffs)
• services/DebuggerService.cfc (modified) (3 diffs)

coldbox/trunk/system/includes/Debug.cfm

@@ -10 +10 @@
 Date     :      September 25, 2005
 Description :
-        Debugging template for the application
-
-Modification History:
-10/13/2005 - Moved reqCollection from session to request.
-12/23/2005 - Eliminated ConfigStruct Dump
-01/06/2006 - Eliminated controller references.
-01/16/2006 - Added support for child applications.
-06/08/2006 - Updated for coldbox.
-06/09/2006 - Changed isDefined to StructkeyExists
-07/12/2006 - Tracer now shows first expanded.
-02/01/2007 - Updated context references
+        The ColdBox debugger
 ----------------------------------------------------------------------->
 <cfoutput>
@@ -119 +109 @@
                 <div class="fw_debugContentCell">
                 <cfif Event.getCurrentView() eq ""><span class="fw_redText">N/A</span><cfelse>#Event.getCurrentView()#</cfif>
+                </div>
+                
+                <div class="fw_debugTitleCell">
+                  LogBox Appenders:
+                </div>
+                <div class="fw_debugContentCell">#controller.getLogBox().getCurrentAppenders()#</div>
+                <div class="fw_debugTitleCell">
+                  RootLogger Levels:
+                </div>
+                <div class="fw_debugContentCell">
+                        #controller.getLogBox().logLevels.lookup(controller.getLogBox().getRootLogger().getLevelMin())# - 
+                        #controller.getLogBox().logLevels.lookup(controller.getLogBox().getRootLogger().getLevelMax())# 
                 </div>
                 
@@ -189 +191 @@
 <!--- **************************************************************--->
         <cfif controller.getSetting("EnableDumpVar")>
-                <cfset dumpList = Event.getValue("dumpvar",0)>
-                <cfif dumplist neq 0>
+                <cfif structKeyExists(rc,"dumpvar")>
                 <!--- Dump Var --->
-                <div class="fw_titles" onClick="fw_toggle('fw_dumpvar')">
-                &nbsp;Dumpvar 
-                </div>
+                <div class="fw_titles" onClick="fw_toggle('fw_dumpvar')">&nbsp;Dumpvar</div>
                 <div class="fw_debugContent" id="fw_dumpvar">
-                        <cfloop list="#dumplist#" index="i">
+                        <cfloop list="#rc.dumpvar#" index="i">
                                 <cfif isDefined("#i#")>
                                         <cfdump var="#evaluate(i)#" label="#i#" expand="false">
                                 <cfelseif event.valueExists(i)>
-                                        <cfset _tmpvar = event.getValue(i)>
-                                        <cfdump var="#_tmpvar#" label="#i#" expand="false">
+                                        <cfdump var="#event.getValue(i)#" label="#i#" expand="false">
                                 </cfif>
                         </cfloop>
@@ -222 +220 @@
                   <cfset varVal = requestCollection[vars]>
                   <tr>
-                        <td align="right" width="15%" class="fw_debugTablesTitles">#lcase(vars)#:</td>
+                        <td align="right" width="15%" class="fw_debugTablesTitles"><strong>#lcase(vars)#:</strong></td>
                         <td  class="fw_debugTablesCells">
                         <cfif isSimpleValue(varVal) >

coldbox/trunk/system/interceptors/EnvironmentControl.cfc

@@ -32 +32 @@
                         var configFile = "";
                         
-                        /* Verify that the configFile propety is set */
+                        // Regex for JSON
+                        instance.jsonRegex = "^(\{|\[)(.)*(\}|\])$";
+                
+                        // Verify that the configFile propety is set
                         if( not propertyExists('configFile') ){
                                 $throw("Config File property does not exist. Please declare it.",'','interceptors.EnvironmentControl.configFilePropertyNotDefined');
                         }
-                        /* Try to locate the path */
+                        // Try to locate the path
                         configFile = locateFilePath(getProperty('configFile'));
-                        /* Validate it */
+                        // Validate it
                         if( len(configFile) eq 0 ){
                                 $throw('Config File could not be located: #getProperty('configFile')#. Please check again.','','interceptors.EnvironmentControl.configFileNotFound');
                         }
+                        // Save Config File
+                        setConfigFile(configFile);                      
                         
-                        /* execute check */
+                        // Completed Flag
                         setProperty('interceptorCompleted',false);
-                        
-                        //Verified, set it
-                        setConfigFile(configFile);                      
                         
                         //Verify the fireOnInit flag
@@ -53 +55 @@
                                 setProperty('fireOnInit',true);
                         }
+                        
                         //Check if we need to fire the interception at configuration
                         if( getProperty('fireOnInit') ){
@@ -92 +95 @@
                         var environmentsArray = ArrayNew(1);
                         var SettingsArray = ArrayNew(1);
-                        var settingsLength = 0;
+                        var environmentXML = "";
                         var i = 1;
-                        var ENVIRONMENT = "";
+                        var environment = "";
                         var oXML = "";
                         var configSettings = getController().getConfigSettings();
@@ -100 +103 @@
                         var oUtilities = getPlugin("Utilities");
                         var oJSON = getPlugin("JSON");
+                        var oXMLParser = getPlugin("XMLParser");
                 
                         //Parse it
@@ -106 +110 @@
                         //Search and test for environments
                         environmentsArray = xmlSearch(oXML, '/environmentcontrol/environment');
-                        
                         if( arrayLen(environmentsArray) eq 0){
                                 $throw("No environment elements found.","Please check your environment file again","interceptors.EnvironmentControl.elementException");
                         }
-                        /* Detect the environment */
-                        ENVIRONMENT = detectEnvironment(environmentsArray);
+                        // Detect the environment
+                        environment = detectEnvironment(environmentsArray);
+                        // If no overrides found, then just exit out.
+                        if( len(trim(environment)) eq 0 ){ return; }
                         
-                        //Search for ENVIRONMENT settings.
-                        SettingsArray = xmlSearch( oXML , "/environmentcontrol/environment[@name='#ENVIRONMENT#']/Setting");
-                        settingsLength = ArrayLen(SettingsArray);
-                        //Check if settings for ENVIRONMENT found, else do nothing.
-                        if (settingsLength gt 0){
-                                //Loop And set
-                                for ( i=1; i lte settingsLength; i=i+1){
-                                        thisValue = trim(SettingsArray[i].xmlAttributes.value);
-                                        /* Replace ${setting} */
-                                        thisValue = oUtilities.placeHolderReplacer(trim(thisValue),configSettings);
-                                        /* json decoding */
-                                        if ( (left(thisValue,1) eq "[" AND right(thisValue,1) eq "]") OR
-                                             (left(thisValue,1) eq "{" AND right(thisValue,1) eq "}") ){
-                                                thisValue = oJSON.decode(replace(thisValue,"'","""","all"));
-                                        }
-                                        
-                                        /* Check if overriding a set setting */
-                                        if( settingExists(trim(SettingsArray[i].xmlAttributes.name)) ){
-                                                setSetting( trim(SettingsArray[i].xmlAttributes.name) , thisValue );
-                                        }
-                                        else{
-                                                /* Do a full set */
-                                                "configSettings.#trim(SettingsArray[i].xmlAttributes.name)#" = thisValue;
-                                        }                                       
+                        //Parse Settings
+                        SettingsArray = xmlSearch( oXML , "/environmentcontrol/environment[@name='#environment#']/Setting");
+                        //Insert Your Settings to Config Struct
+                        for (i=1; i lte ArrayLen(SettingsArray); i=i+1){
+                                // Get Setting value with PlaceHolding replacements
+                                thisValue = oUtilities.placeHolderReplacer(trim(SettingsArray[i].XMLAttributes["value"]),configSettings);
+                                //Test for JSON
+                                if( reFindNocase(instance.jsonRegex,thisValue) ){
+                                        thisValue = oJSON.decode(replace(thisValue,"'","""","all"));
                                 }
-                        }       
+                                // Check if overriding or new one?
+                                if( settingExists(trim(SettingsArray[i].xmlAttributes.name)) ){
+                                        setSetting( trim(SettingsArray[i].xmlAttributes.name) , thisValue );
+                                }
+                                else{
+                                        // Do a full set
+                                        "configSettings.#trim(SettingsArray[i].xmlAttributes.name)#" = thisValue;
+                                }
+                        }
+                        
+                        // Parse Other Sections Available in the environment config.
+                        environmentXML = xmlSearch( oXML , "/environmentcontrol/environment[@name='#environment#']");
+                        // Mail Settings
+                        oXMLParser.parseMailSettings(environmentXML[1],configSettings,oUtilities,true);         
+                        // i18N
+                        oXMLParser.parseLocalization(environmentXML[1],configSettings,oUtilities,true);
+                        // Bug Tracers
+                        oXMLParser.parseBugTracers(environmentXML[1],configSettings,oUtilities,true);
+                        // Web Services
+                        oXMLParser.parseWebservices(environmentXML[1],configSettings,oUtilities,true);
+                        // Parse Datasources
+                        oXMLParser.parseDatasources(environmentXML[1],configSettings,oUtilities,true);
+                        // Parse Debugger Settings
+                        oXMLParser.parseDebuggerSettings(environmentXML[1],configSettings,oUtilities,true);
+                        // Reload Debugger Configuration
+                        controller.getDebuggerService().getDebuggerConfig().populate(configSettings.DebuggerSettings);
+                        // Parse Interceptors
+                        oXMLParser.parseInterceptors(environmentXML[1],configSettings,oUtilities,true); 
+                        // Parse LogBox
+                        oXMLParser.parseLogBox(environmentXML[1],configSettings,oUtilities,true);
+                        // Reconfigure LogBox
+                        if( NOT structIsEmpty(configSettings["LogBoxConfig"]) ){
+                                controller.getLogBox().configure(controller.getLogBox().getConfig());
+                                controller.setLogger(controller.getLogBox().getLogger("coldbox.system.Controller"));
+                        }                               
                 </cfscript>
         </cffunction>

coldbox/trunk/system/plugins/Webservices.cfc

@@ -12 +12 @@
         Macromedia/Adobe.  dstanten@adobe.com
 
-
-Modification History:
-02/08/2006 - Updated refresws to look for the webservice in the configstruct first.
-06/08/2006 - Updated for coldbox
-07/29/2006 - Exception is thrown if web service is not found in the configuration structure.
 ----------------------------------------------------------------------->
 <cfcomponent name="Webservices"
@@ -30 +25 @@
                 <cfscript>
                         super.Init(arguments.controller);
+                        
                         setpluginName("Web Services");
                         setpluginVersion("1.0");
@@ -43 +39 @@
 
         <cffunction name="getWS" returntype="any" access="Public" hint="Get a web service's wsdl url from the configStruct according to which environment you are on." output="false">
-        <!--- ************************************************************* --->
                 <cfargument name="name" hint="The name of the web service. If the web service is not found an exception is thrown." type="string" required="Yes">
-        <!--- ************************************************************* --->
-                <cfif getController().getSetting("Environment") eq "DEVELOPMENT">
-                        <cfif structKeyExists(getController().getSetting("Webservices").DEV , arguments.name)>
-                                <cfreturn getController().getSetting("Webservices").DEV[arguments.name]>
-                        </cfif>
-                <cfelse>
-                        <cfif structKeyExists(getController().getSetting("Webservices").PRO , arguments.name)>
-                                <cfreturn getController().getSetting("Webservices").PRO[arguments.name]>
-                        </cfif>
+                <cfset var webservices = getSetting("Webservices")>
+                
+                <cfif structKeyExists(webservices , arguments.name)>
+                        <cfreturn webservices[arguments.name]>
                 </cfif>
-                <cfthrow type="ColdBox.plugins.Webservices.WebServiceNotFoundException" message="The webservice #arguments.name# was not found in the configuration structure.">
+                
+                <cfthrow type="Webservices.WebServiceNotFoundException" message="The webservice #arguments.name# was not found in the configuration structure.">
         </cffunction>
 
         <cffunction name="getWSobj" access="Public"     hint="Get a reference to a webservice obj according to which environment you are on." output="false" returntype="any">
-        <!--- ************************************************************* --->
                 <cfargument name="name" hint="The name of the web service. If the web service is not found an exception is thrown" type="string" required="Yes">
-        <!--- ************************************************************* --->
-                <cfif getController().getSetting("Environment") eq "DEVELOPMENT">
-                        <cfif structKeyExists(getController().getSetting("Webservices").DEV , arguments.name)>
-                                <cfreturn CreateObject("webservice", getController().getSetting("Webservices").DEV[arguments.name] )>
-                        </cfif>
-                <cfelse>
-                        <cfif structKeyExists(getController().getSetting("Webservices").PRO , arguments.name)>
-                                <cfreturn CreateObject("webservice", getController().getSetting("Webservices").PRO[arguments.name] )>
-                        </cfif>
-                </cfif>
-                <cfthrow type="ColdBox.plugins.Webservices.WebServiceNotFoundException" message="The webservice #arguments.name# was not found in the configuration structure.">
+                
+                <cfreturn createObject("webservice", getWS(arguments.name) )>
+        
         </cffunction>
 
         <cffunction name="refreshWS" access="Public" hint="Refresh a web service stub object" output="false" returntype="void">
-        <!--- ************************************************************* --->
                 <cfargument name="webservice" hint="The name or wsdl URL of the web service to refresh" type="string" required="Yes">
-        <!--- ************************************************************* --->
                 <!--- Get the Webservice from the configStruct --->
                 <cfset var ws = getWS(arguments.webservice)>

coldbox/trunk/system/plugins/XMLParser.cfc

@@ -10 +10 @@
         This is a utility function for the framework. It includes any methods
         that will be called from the framework for XML parsing.
-
-Modification History:
-10/05/2005 - Fix for Dev URL beign blank
-10/06/2005 - Added support for XSD Validation, added this.ConfigFileLocation to be localized.
-10/10/2005 - Added Fix for xsd url in error message for validation.
-12/16/2005 - Changed to variables scope.
-12/18/2006 - Updated MailSettings, owneremail, controller reload.
-01/16/2006 - Added coding to use in child apps, added ApplicationPath,
-                         FrameworkPath, ChildApp, ParentAppPath, DistanceToParent to fwsetttings.
-02/07/2006 - FrameworkPluginsPath added.
-02/16/2006-  Added DebugPassword code.
-06/08/2006 - Updated for Coldbox - Added support for writing the CFMX mapping with . or with /, MessageboxStyleClass
-06/21/2006 - Finished i18N support, file based.
-07/28/2006 - Datasources support, var scope additions.
-08/10/2006 - Child References Eliminated. No longer in use.
-08/20/2006 - i18n Support completed for new plugins.
-10/10/2006 - Mail server settings setup.
-12/20/2006 - new settings: ReinitPassword, InvalidEventHandler
-01/17/2007 - fixed Bug #83, failure to set handler invocation path if / as first char
-01/18/2007 - Preparing for new event registration system.
-01/26/2007 - Datasource Alias and error checking Ticket #88, #89
 ----------------------------------------------------------------------->
 <cfcomponent name="XMLParser"
@@ -52 +31 @@
                         setpluginVersion("2.0");
                         setpluginDescription("I am the framework's XML parser");
-        
-                        //Search Patterns for Config file
-                        instance.searchSettings = "//Settings/Setting";
-                        instance.searchYourSettings = "//YourSettings/Setting";
-                        instance.searchBugTracer = "//BugTracerReports/BugEmail";
-                        instance.searchWS = "//WebServices/WebService";
-                        instance.searchLayouts = "//Layouts/Layout";
-                        instance.searchDefaultLayout = "//Layouts/DefaultLayout";
-                        instance.searchDefaultView = "//Layouts/DefaultView";
-                        instance.searchMailSettings = "//MailServerSettings";
-                        instance.searchi18NSettings = "//i18N";
-                        instance.searchDatasources = "//Datasources/Datasource";
-                        instance.searchCache = "//Cache";
-                        instance.searchInterceptorCustomPoints = "//Interceptors/CustomInterceptionPoints";
-                        instance.searchInterceptors = "//Interceptors/Interceptor";
-                        instance.searchInterceptorBase = "//Interceptors";
-                        instance.searchDebuggerSettings = "//DebuggerSettings";
-                        
-                        //Search patterns for fw xml
-                        instance.searchConventions = "//Conventions";
-        
+                                
                         //ColdBox Properties
                         instance.FileSeparator = createObject("java","java.lang.System").getProperty("file.separator");
@@ -78 +37 @@
                         instance.FrameworkConfigXSDFile = ExpandPath("/coldbox/system/config/config.xsd");
                         
-                        /* Regex for JSON */
+                        // Regex for JSON
                         instance.jsonRegex = "^(\{|\[)(.)*(\}|\])$";
                         
@@ -90 +49 @@
         <cffunction name="loadFramework" access="public" hint="Load the framework's configuration xml." output="false" returntype="struct">
                 <!--- ************************************************************* --->
-                <cfargument name="overrideConfigFile" required="false" type="string" default="" 
-                                        hint="Only used for unit testing or reparsing of a specific coldbox config file.">
+                <cfargument name="overrideConfigFile" required="false" type="string" default="" hint="Only used for unit testing or reparsing of a specific coldbox config file.">
                 <!--- ************************************************************* --->
                 <cfscript>
@@ -112 +70 @@
                         //verify Framework settings File
                         if ( not fileExists(instance.FrameworkConfigFile) ){
-                                $throw("Error finding settings.xml configuration file. The file #instance.FrameworkConfigFile# cannot be found.","","ColdBox.plugins.XMLParser.ColdBoxSettingsNotFoundException");
+                                $throw("Error finding settings.xml configuration file. The file #instance.FrameworkConfigFile# cannot be found.","","XMLParser.ColdBoxSettingsNotFoundException");
                         }                       
                         //Setup the ColdBox CFML Engine Info
@@ -145 +103 @@
                 
                         //Get SettingNodes From Config
-                        SettingNodes = XMLSearch(fwXML, instance.searchSettings);
+                        SettingNodes = XMLSearch(fwXML,"//Settings/Setting");
                         //Insert Settings to Config Struct
                         for (i=1; i lte ArrayLen(SettingNodes); i=i+1)
@@ -154 +112 @@
 
                         //Conventions Parsing
-                        conventions = XMLSearch(fwXML,instance.searchConventions);
+                        conventions = XMLSearch(fwXML,"//Conventions");
                         StructInsert(settingsStruct, "HandlersConvention", conventions[1].handlerLocation.xmltext);
                         StructInsert(settingsStruct, "pluginsConvention", conventions[1].pluginsLocation.xmltext);
@@ -177 +135 @@
                                 //Validate the findings
                                 if( not configFileFound )
-                                        $throw("ColdBox Application Configuration File can't be found.","The accepted files are: #ConfigXMLFilePath#","ColdBox.plugins.XMLParser.ConfigXMLFileNotFoundException");
+                                        $throw("ColdBox Application Configuration File can't be found.","The accepted files are: #ConfigXMLFilePath#","XMLParser.ConfigXMLFileNotFoundException");
                                 //Insert the correct config file location.
                                 StructInsert(settingsStruct, "ConfigFileLocation", ConfigXMLFilePath);
@@ -207 +165 @@
                 }
                 catch( Any Exception ){
-                        $throw("Error Loading Framework Configuration.","#Exception.Message# #Exception.Detail#","ColdBox.plugins.XMLParser.ColdboxSettingsParsingException");
+                        $throw("Error Loading Framework Configuration.","#Exception.Message# #Exception.Detail#","XMLParser.ColdboxSettingsParsingException");
                 }
                 </cfscript>
@@ -219 +177 @@
                 <!--- ************************************************************* --->
                 <cfscript>
-                var Collections = createObject("java", "java.util.Collections"); 
                 //Create Config Structure
                 var ConfigStruct = StructNew();
@@ -225 +182 @@
                 var ConfigFileLocation = fwSettingsStruct["ConfigFileLocation"];
                 var configXML = "";
-                //Nodes
-                var SettingNodes = "";
-                var YourSettingNodes = "";
-                var MailSettingsNodes = "";
-                //i18n
-                var i18NSettingNodes = "";
-                var DefaultLocale = "";
-                //BugEmail
-                var BugEmailNodes = "";
-                var BugEmails = "";
-                //WebServices
-                var WebServiceNodes = "";
-                var WebServicesStruct = StructNew();
-                var DevWS = StructNew();
-                var ProWS = StructNew();
-                //Layouts
-                var DefaultView = "";
-                var LayoutNodes = "";
-                var DefaultLayout = "";
-                var     LayoutViewStruct = Collections.synchronizedMap(CreateObject("java","java.util.LinkedHashMap").init());
-                var     LayoutFolderStruct = Collections.synchronizedMap(CreateObject("java","java.util.LinkedHashMap").init());
-                //Datasources.
-                var DatasourcesNodes = "";
-                var DSNStruct = StructNew();
-                var DatasourcesStruct = Structnew();
-                //Cache
-                var CacheSettingNodes = "";
-                var DebuggerSettingNodes = "";
-                //Interceptors
-                var InterceptorBase = "";
-                var InterceptorNodes = "";
-                var CustomInterceptionPoints = "";
-                var InterceptorStruct = structnew();
-                var InterceptorProperties = "";
-                var tempProperty = "";
-                //Conventions
-                var Conventions = "";
-                //loopers
-                var i = 0;
-                var j = 0;
                 //Appmapping Variables
                 var webPath = "";
@@ -272 +189 @@
                 var oUtilities = getPlugin("Utilities");
                 //Testers
-                var tester = "";
                 var xmlvalidation = "";
                 var errorDetails = "";
+                var i = 1;
                 
                 try{
-                        
                         /* ::::::::::::::::::::::::::::::::::::::::: CONFIG FILE PARSING & VALIDATION :::::::::::::::::::::::::::::::::::::::::::: */
-                        
                         //Validate File, just in case.
                         if ( not fileExists(ConfigFileLocation) ){
-                                $throw("The Config File: #ConfigFileLocation# can't be found.","","ColdBox.plugins.XMLParser.ConfigXMLFileNotFoundException");
-                        }
-                        
-                        //Determine Parse Type
+                                $throw("The Config File: #ConfigFileLocation# can't be found.","","XMLParser.ConfigXMLFileNotFoundException");
+                        }                       
+                        //Determine Parse Type AND Parse Configuration File
                         if ( not fwSettingsStruct["xmlParseActive"] ){
                                 configXML = xmlParse(readFile(ConfigFileLocation,false,"utf-8"));
@@ -292 +206 @@
                                 configXML = xmlParse(ConfigFileLocation);
                         }
-
-                        //Validate the config
+                        //Validate the config element
                         if ( not structKeyExists(configXML, "config")  )
-                                $throw("No Config element found in the configuration file","","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
-
-                        /* ::::::::::::::::::::::::::::::::::::::::: APP MAPPING CALCULATIONS :::::::::::::::::::::::::::::::::::::::::::: */
-                        
-                        //Setup the Application Path
+                                $throw("No Config element found in the configuration file","","XMLParser.ConfigXMLParsingException");
+
+                        /* ::::::::::::::::::::::::::::::::::::::::: APP LOCATION CALCULATIONS :::::::::::::::::::::::::::::::::::::::::::: */
+                        
+                        //Setup the Application Path with an Override
                         if( arguments.overrideAppMapping neq "" ){
-                                StructInsert(ConfigStruct, "ApplicationPath", ExpandPath(arguments.overrideAppMapping));
+                                ConfigStruct.ApplicationPath = ExpandPath(arguments.overrideAppMapping);
                                 if( right(ConfigStruct.ApplicationPath,1) neq "/"){
                                         ConfigStruct.ApplicationPath = ConfigStruct.ApplicationPath & "/";
@@ -307 +220 @@
                         }
                         else{
-                                StructInsert(ConfigStruct, "ApplicationPath", controller.getAppRootPath());
-                        }
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: APP MAPPING CALCULATIONS :::::::::::::::::::::::::::::::::::::::::::: */
+                                // Setup Default App Path from main controller
+                                ConfigStruct.ApplicationPath = controller.getAppRootPath();
+                        }
                         
                         //Calculate AppMapping if not set in the config, else auto-calculate
@@ -317 +229 @@
                                 localPath = getDirectoryFromPath(replacenocase(getTemplatePath(),"\","/","all"));
                                 PathLocation = findnocase(webPath, localPath);
+                                
                                 if ( PathLocation neq 0)
                                         ConfigStruct.AppMapping = mid(localPath,PathLocation,len(webPath));
@@ -335 +248 @@
                         }
                         
-                        /* ::::::::::::::::::::::::::::::::::::::::: GET SETTINGS  :::::::::::::::::::::::::::::::::::::::::::: */
-                        
-                        //Get SettingNodes
-                        SettingNodes = XMLSearch(configXML, instance.searchSettings);
+                        /* ::::::::::::::::::::::::::::::::::::::::: GET COLDBOX SETTINGS  :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseColdboxSettings(configXML,configStruct,oUtilities,arguments.overrideAppMapping);
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: YOUR SETTINGS LOADING :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseYourSettings(configXML,configStruct,oUtilities);   
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: YOUR CONVENTIONS LOADING :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseConventions(configXML,configStruct,oUtilities);
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: HANDLER-MODELS-PLUGIN INVOCATION PATHS :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseInvocationPaths(configXML,configStruct,oUtilities);
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: EXTERNAL LAYOUTS/VIEWS LOCATION :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseExternalLocations(configXML,configStruct,oUtilities);
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: MAIL SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseMailSettings(configXML,configStruct,oUtilities);   
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: I18N SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseLocalization(configXML,configStruct,oUtilities);                   
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: BUG MAIL SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseBugTracers(configXML,configStruct,oUtilities);                     
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: ENVIRONMENT SETTING :::::::::::::::::::::::::::::::::::::::::::: */
+                        ConfigStruct.Environment = "PRODUCTION";
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: WS SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseWebservices(configXML,configStruct,oUtilities);                    
+
+                        /* ::::::::::::::::::::::::::::::::::::::::: DATASOURCES SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseDatasources(configXML,configStruct,oUtilities);
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: LAYOUT VIEW FOLDER SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseLayoutsViews(configXML,configStruct,oUtilities);                   
+                        
+                        /* :::::::::::::::::::::::::::::::::::::::::  CACHE SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseCacheSettings(configXML,configStruct,oUtilities);
+                                                
+                        /* ::::::::::::::::::::::::::::::::::::::::: DEBUGGER SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseDebuggerSettings(configXML,configStruct,oUtilities);                       
+                                                
+                        /* ::::::::::::::::::::::::::::::::::::::::: INTERCEPTOR SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseInterceptors(configXML,configStruct,oUtilities);
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: LOGBOX Configuration :::::::::::::::::::::::::::::::::::::::::::: */
+                        parseLogBox(configXML,configStruct,oUtilities);
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: CONFIG FILE LAST MODIFIED SETTING :::::::::::::::::::::::::::::::::::::::::::: */
+                        ConfigStruct.ConfigTimeStamp = oUtilities.FileLastModified(ConfigFileLocation);
+                        
+                        /* ::::::::::::::::::::::::::::::::::::::::: XSD VALIDATION :::::::::::::::::::::::::::::::::::::::::::: */
+                
+                }
+                catch( Any Exception ){
+                        $throw("#Exception.Message# & #Exception.Detail#",Exception.tagContext.toString(), "XMLParser.ConfigXMLParsingException");
+                }
+                        
+                //Determine which CF version for XML Parsing method
+                if ( fwSettingsStruct["xmlValidateActive"] ){
+                        //Finally Validate With XSD
+                        xmlvalidation = XMLValidate(configXML, fwSettingsStruct["ConfigFileSchemaLocation"]);
+                        //Validate Errors
+                        if(NOT xmlvalidation.status){
+                                for(i = 1; i lte ArrayLen(xmlvalidation.errors); i = i + 1){
+                                        errorDetails = errorDetails & xmlvalidation.errors[i] & chr(10) & chr(13);
+                                }
+                                //Throw the error.
+                                $throw("<br>The config.xml file does not validate with the framework's schema.","The error details are:<br/> #errorDetails#","XMLParser.ConfigXMLParsingException");
+                        }// if invalid status
+                }//if xml validation is on
+                        
+                
+                //finish
+                return ConfigStruct;
+                </cfscript>
+        </cffunction>
+        
+        <!--- parseColdboxSettings --->
+        <cffunction name="parseColdboxSettings" output="false" access="public" returntype="void" hint="Parse ColdBox Settings">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfargument name="overrideAppMapping" type="string" required="false" default="" hint="Only used for unit testing or reparsing of a specific coldbox config file."/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        var fwSettingsStruct = controller.getColdBoxSettings();
+                        var SettingNodes = XMLSearch(arguments.xml,"//Settings/Setting");
+                        var i=1;
+                        
                         if ( ArrayLen(SettingNodes) eq 0 )
-                                $throw("No Setting elements could be found in the configuration file.","","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
+                                $throw("No Setting elements could be found in the configuration file.","","XMLParser.ConfigXMLParsingException");
                         //Insert  ColdBox Settings to Config Struct
                         for (i=1; i lte ArrayLen(SettingNodes); i=i+1){
-                                ConfigStruct[trim(SettingNodes[i].XMLAttributes["name"])] = oUtilities.placeHolderReplacer(trim(SettingNodes[i].XMLAttributes["value"]),ConfigStruct);
-                        }
-                        //Check for AppName or throw
-                        if ( not StructKeyExists(ConfigStruct, "AppName") )
-                                $throw("There was no 'AppName' setting defined. This is required by the framework.","","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
+                                ConfigStruct[trim(SettingNodes[i].XMLAttributes["name"])] = arguments.utility.placeHolderReplacer(trim(SettingNodes[i].XMLAttributes["value"]),ConfigStruct);
+                        }
                         //overrideAppMapping if passed in.
                         if ( arguments.overrideAppMapping neq "" ){
                                 ConfigStruct["AppMapping"] = arguments.overrideAppMapping;
                         }
-                        /* Clean the first / if found */
+                        // Clean the first / if found
                         if( len(ConfigStruct.AppMapping) eq 1 ){
-                                ConfigStruct.AppMapping = "";
+                                ConfigStruct["AppMapping"] = "";
                         }
                         
                         /* ::::::::::::::::::::::::::::::::::::::::: COLDBOX SETTINGS VALIDATION :::::::::::::::::::::::::::::::::::::::::::: */
-                        
+                        //Check for AppName or throw
+                        if ( not StructKeyExists(ConfigStruct, "AppName") )
+                                $throw("There was no 'AppName' setting defined. This is required by the framework.","","XMLParser.ConfigXMLParsingException");
                         //Check for Default Event
                         if ( not StructKeyExists(ConfigStruct, "DefaultEvent") )
-                                $throw("There was no 'DefaultEvent' setting defined. This is required by the framework.","","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
-                
+                                $throw("There was no 'DefaultEvent' setting defined. This is required by the framework.","","XMLParser.ConfigXMLParsingException");
                         //Check for Event Name
                         if ( not StructKeyExists(ConfigStruct, "EventName") )
                                 ConfigStruct["EventName"] = fwSettingsStruct["EventName"] ;
-                        
                         //Check for Request Start Handler
                         if ( not StructKeyExists(ConfigStruct, "ApplicationStartHandler") )
                                 ConfigStruct["ApplicationStartHandler"] = "";
-                        
                         //Check for Request End Handler
                         if ( not StructKeyExists(ConfigStruct, "RequestStartHandler") )
                                 ConfigStruct["RequestStartHandler"] = "";
-                        
                         //Check for Application Start Handler
                         if ( not StructKeyExists(ConfigStruct, "RequestEndHandler") )
                                 ConfigStruct["RequestEndHandler"] = "";
-                                
                         //Check for Session Start Handler
                         if ( not StructKeyExists(ConfigStruct, "SessionStartHandler") )
                                 ConfigStruct["SessionStartHandler"] = "";
-                                
                         //Check for Session End Handler
                         if ( not StructKeyExists(ConfigStruct, "SessionEndHandler") )
                                 ConfigStruct["SessionEndHandler"] = "";
-                
                         //Check for InvalidEventHandler
                         if ( not StructKeyExists(ConfigStruct, "onInvalidEvent") )
                                 ConfigStruct["onInvalidEvent"] = "";
-
                         //Check For DebugMode in settings
                         if ( not structKeyExists(ConfigStruct, "DebugMode") or not isBoolean(ConfigStruct.DebugMode) )
                                 ConfigStruct["DebugMode"] = "false";
-                
                         //Check for DebugPassword in settings, else leave blank.
                         if ( not structKeyExists(ConfigStruct, "DebugPassword") )
                                 ConfigStruct["DebugPassword"] = "";
-                
                         //Check for ReinitPassword
                         if ( not structKeyExists(ConfigStruct, "ReinitPassword") )
                                 ConfigStruct["ReinitPassword"] = "";
-
                         //Check For Owner Email or Throw
                         if ( not StructKeyExists(ConfigStruct, "OwnerEmail") )
                                 ConfigStruct["OwnerEmail"] = "";
-                
                         //Check For EnableDumpvar or set to true
                         if ( not StructKeyExists(ConfigStruct, "EnableDumpVar") or not isBoolean(ConfigStruct.EnableDumpVar))
                                 ConfigStruct["EnableDumpVar"] = "true";
-                
                         //Check For EnableBugReports Active or set to true
                         if ( not StructKeyExists(ConfigStruct, "EnableBugReports") or not isBoolean(ConfigStruct.EnableBugReports))
                                 ConfigStruct["EnableBugReports"] = "true";
-
                         //Check For UDFLibraryFile
                         if ( not StructKeyExists(ConfigStruct, "UDFLibraryFile") )
                                 ConfigStruct["UDFLibraryFile"] = "";
-                
                         //Check For CustomErrorTemplate
                         if ( not StructKeyExists(ConfigStruct, "CustomErrorTemplate") )
                                 ConfigStruct["CustomErrorTemplate"] = "";
-                        
                         //Check for CustomEmailBugReport
                         if ( not StructKeyExists(ConfigStruct, "CustomEmailBugReport") )
                                 ConfigStruct["CustomEmailBugReport"] = "";      
-                        
                         //Check for MessageboxStyleOverride if found, default = false
                         if ( not structkeyExists(ConfigStruct, "MessageboxStyleOverride") or not isBoolean(ConfigStruct.MessageboxStyleOverride) )
                                 ConfigStruct["MessageboxStyleOverride"] = "false";
-
                         //Check for HandlersIndexAutoReload, default = false
                         if ( not structkeyExists(ConfigStruct, "HandlersIndexAutoReload") or not isBoolean(ConfigStruct.HandlersIndexAutoReload) )
                                 ConfigStruct["HandlersIndexAutoReload"] = false;
-                        
                         //Check for ConfigAutoReload
                         if ( not structKeyExists(ConfigStruct, "ConfigAutoReload") or not isBoolean(ConfigStruct.ConfigAutoReload) )
                                 ConfigStruct["ConfigAutoReload"] = false;
-
                         //Check for ExceptionHandler if found
                         if ( not structkeyExists(ConfigStruct, "ExceptionHandler") )
                                 ConfigStruct["ExceptionHandler"] = "";
-
                         //Check for PluginsExternalLocation if found
                         if ( not structkeyExists(ConfigStruct, "PluginsExternalLocation") )
                                 ConfigStruct["PluginsExternalLocation"] = "";
-
                         //Check for Handler Caching
                         if ( not structKeyExists(ConfigStruct, "HandlerCaching") or not isBoolean(ConfigStruct.HandlerCaching) )
                                 ConfigStruct["HandlerCaching"] = true;
-                        
                         //Check for Event Caching
                         if ( not structKeyExists(ConfigStruct, "EventCaching") or not isBoolean(ConfigStruct.EventCaching) )
                                 ConfigStruct["EventCaching"] = true;
-
                         //Check for IOC Framework & Settings
                         if ( not structKeyExists(ConfigStruct, "IOCFramework") )
@@ -464 +438 @@
                         if ( not structKeyExists(ConfigStruct, "IOCObjectCaching") or not isBoolean(ConfigStruct.IOCObjectCaching) )
                                 ConfigStruct["IOCObjectCaching"] = false;
-                                
                         //RequestContextDecorator
                         if ( not structKeyExists(ConfigStruct, "RequestContextDecorator") or len(ConfigStruct["RequestContextDecorator"]) eq 0 ){
                                 ConfigStruct["RequestContextDecorator"] = "";
                         }
-                        
                         //Check for ProxyReturnCollection
                         if ( not structKeyExists(ConfigStruct, "ProxyReturnCollection") or not isBoolean(ConfigStruct.ProxyReturnCollection) )
                                 ConfigStruct["ProxyReturnCollection"] = false;
-                        
                         //Check for External Handlers Location
                         if ( not structKeyExists(ConfigStruct, "HandlersExternalLocation") or len(ConfigStruct["HandlersExternalLocation"]) eq 0 )
                                 ConfigStruct["HandlersExternalLocation"] = "";
-                        
                         //Check for Models External Location
                         if ( not structKeyExists(ConfigStruct, "ModelsExternalLocation") or len(ConfigStruct["ModelsExternalLocation"]) eq 0 )
@@ -504 +474 @@
                                 fwSettingsStruct["FlashURLPersistScope"] = ConfigStruct["FlashURLPersistScope"];
                         }
-                        
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: YOUR SETTINGS LOADING :::::::::::::::::::::::::::::::::::::::::::: */
-                        
-                        //Your Settings To Load
-                        YourSettingNodes = XMLSearch(configXML, instance.searchYourSettings);
-                        if ( ArrayLen(YourSettingNodes) ){
-                                //Insert Your Settings to Config Struct
-                                for (i=1; i lte ArrayLen(YourSettingNodes); i=i+1){
-                                        /* Get Setting with PlaceHolding */
-                                        tester = oUtilities.placeHolderReplacer(trim(YourSettingNodes[i].XMLAttributes["value"]),ConfigStruct);
-                                        //Test for JSON
-                                        if( reFindNocase(instance.jsonRegex,tester) ){
-                                                StructInsert(ConfigStruct, YourSettingNodes[i].XMLAttributes["name"], getPlugin("JSON").decode(replace(tester,"'","""","all")) );
-                                        }
-                                        else
-                                                StructInsert( ConfigStruct, YourSettingNodes[i].XMLAttributes["name"], tester);
-                                }
-                        }
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: YOUR CONVENTIONS LOADING :::::::::::::::::::::::::::::::::::::::::::: */
-                        
-                        conventions = XMLSearch(configXML,instance.searchConventions);
+                </cfscript>
+        </cffunction>
+        
+        <!--- parseInvocationPaths --->
+        <cffunction name="parseInvocationPaths" output="false" access="public" returntype="void" hint="Parse Invocation paths">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        var fwSettingsStruct = controller.getColdBoxSettings();
+                        
+                        //Set the Handlers External Configuration Paths
+                        if( configStruct["HandlersExternalLocation"] neq "" ){
+                                //Expand the external location to get a registration path
+                                configStruct["HandlersExternalLocationPath"] = ExpandPath("/" & replace(ConfigStruct["HandlersExternalLocation"],".","/","all"));
+                        }
+                        else{
+                                configStruct["HandlersExternalLocationPath"] = "";
+                        }
+                        
+                        //Set the Handlers,Models, & Custom Plugin Invocation & Physical Path for this Application
+                        if( ConfigStruct["AppMapping"] neq ""){
+                                
+                                //Parse out the first / to create invocation Path
+                                if ( left(ConfigStruct["AppMapping"],1) eq "/" ){
+                                        ConfigStruct["AppMapping"] = removeChars(ConfigStruct["AppMapping"],1,1);
+                                }
+                                
+                                //Set the Invocation Path
+                                ConfigStruct["HandlersInvocationPath"] = replace(ConfigStruct["AppMapping"],"/",".","all") & ".#fwSettingsStruct.handlersConvention#";
+                                ConfigStruct["MyPluginsInvocationPath"] = replace(ConfigStruct["AppMapping"],"/",".","all") & ".#fwSettingsStruct.pluginsConvention#";
+                                ConfigStruct["ModelsInvocationPath"] = replace(ConfigStruct["AppMapping"],"/",".","all") & ".#fwSettingsStruct.ModelsConvention#";
+                                
+                                //Set the Location Path
+                                ConfigStruct["HandlersPath"] = ConfigStruct["AppMapping"];
+                                ConfigStruct["MyPluginsPath"] = ConfigStruct["AppMapping"];
+                                ConfigStruct["ModelsPath"] = ConfigStruct["AppMapping"];
+                                
+                                //Set the physical path according to system.
+                                ConfigStruct["HandlersPath"] = "/" & ConfigStruct["HandlersPath"] & "/#fwSettingsStruct.handlersConvention#";
+                                ConfigStruct["MyPluginsPath"] = "/" & ConfigStruct["MyPluginsPath"] & "/#fwSettingsStruct.pluginsConvention#";
+                                ConfigStruct["ModelsPath"] = "/" & ConfigStruct["ModelsPath"] & "/#fwSettingsStruct.ModelsConvention#";
+                                
+                                //Set the Handlerspath expanded.
+                                ConfigStruct["HandlersPath"] = ExpandPath(ConfigStruct["HandlersPath"]);
+                                ConfigStruct["MyPluginsPath"] = ExpandPath(ConfigStruct["MyPluginsPath"]);
+                                ConfigStruct["ModelsPath"] = ExpandPath(ConfigStruct["ModelsPath"]);
+                                        
+                        }
+                        else{
+                                //Parse out the first / to create the invocation Path
+                                if ( left(ConfigStruct["AppMapping"],1) eq "/" ){
+                                        ConfigStruct["AppMapping"] = removeChars(ConfigStruct["AppMapping"],1,1);
+                                }
+                                
+                                /* Handler Registration */
+                                ConfigStruct["HandlersInvocationPath"] = "#fwSettingsStruct.handlersConvention#";
+                                ConfigStruct["HandlersPath"] = controller.getAppRootPath() & "#fwSettingsStruct.handlersConvention#";
+
+                                /* Custom Plugins Registration */
+                                ConfigStruct["MyPluginsInvocationPath"] = "#fwSettingsStruct.pluginsConvention#";
+                                ConfigStruct["MyPluginsPath"] = controller.getAppRootPath() & "#fwSettingsStruct.pluginsConvention#";
+                                
+                                /* Models Registration */
+                                ConfigStruct["ModelsInvocationPath"] = "#fwSettingsStruct.ModelsConvention#";
+                                ConfigStruct["ModelsPath"] = controller.getAppRootPath() & "#fwSettingsStruct.ModelsConvention#";
+                        }
+                </cfscript>
+        </cffunction>
+        
+        <!--- parseExternalLocations --->
+        <cffunction name="parseExternalLocations" output="false" access="public" returntype="void" hint="Parse External locations">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        
+                        // check for ViewsExternalLocation 
+                        if( structKeyExists(configStruct,"ViewsExternalLocation") and configStruct["ViewsExternalLocation"] neq "" ){
+                                // Verify the locations, do relative to the app mapping first 
+                                if( directoryExists(controller.getAppRootPath() & configStruct["ViewsExternalLocation"]) ){
+                                        configStruct["ViewsExternalLocation"] = "/" & ConfigStruct["AppMapping"] & "/" & configStruct["ViewsExternalLocation"];
+                                }
+                                else if( not directoryExists(expandPath(configStruct["ViewsExternalLocation"])) ){
+                                        $throw("ViewsExternalLocation could not be found.","The directories tested was relative and expanded using #configStruct['ViewsExternalLocation']#. Please verify your setting.","XMLParser.ConfigXMLParsingException");
+                                }
+                                // Cleanup 
+                                if ( right(configStruct["ViewsExternalLocation"],1) eq "/" ){
+                                         configStruct["ViewsExternalLocation"] = left(configStruct["ViewsExternalLocation"],len(configStruct["ViewsExternalLocation"])-1);
+                                }
+                        }else{
+                                configStruct["ViewsExternalLocation"] = "";
+                        }
+                        
+                        // check for LayoutsExternalLocation
+                        if( structKeyExists(configStruct,"LayoutsExternalLocation") and configStruct["LayoutsExternalLocation"] neq "" ){
+                                // Verify the locations, do relative to the app mapping first
+                                if( directoryExists(controller.getAppRootPath() & configStruct["LayoutsExternalLocation"]) ){
+                                        configStruct["LayoutsExternalLocation"] = "/" & ConfigStruct["AppMapping"] & "/" & configStruct["LayoutsExternalLocation"];
+                                }
+                                else if( not directoryExists(expandPath(configStruct["LayoutsExternalLocation"])) ){
+                                        $throw("LayoutsExternalLocation could not be found.","The directories tested was relative and expanded using #configStruct['LayoutsExternalLocation']#. Please verify your setting.","XMLParser.ConfigXMLParsingException");
+                                }
+                                // Cleanup
+                                if ( right(configStruct["LayoutsExternalLocation"],1) eq "/" ){
+                                         configStruct["LayoutsExternalLocation"] = left(configStruct["LayoutsExternalLocation"],len(configStruct["LayoutsExternalLocation"])-1);
+                                }
+                        }else{
+                                configStruct["LayoutsExternalLocation"] = "";
+                        }
+                </cfscript>
+        </cffunction>
+        
+        <!--- parseConventions --->
+        <cffunction name="parseConventions" output="false" access="public" returntype="void" hint="Parse Conventions">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        var conventions = XMLSearch(arguments.xml,"//Conventions");
+                        var fwSettingsStruct = controller.getColdboxSettings();
+                        
                         if( ArrayLen(conventions) ){
                                 /* Override conventions on a per found basis. */
@@ -536 +608 @@
                                 if( structKeyExists(conventions[1],"modelsLocation") ){ fwSettingsStruct["ModelsConvention"] = trim(conventions[1].modelsLocation.xmltext); }
                         }
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: HANDLER-MODELS-PLUGIN INVOCATION PATHS :::::::::::::::::::::::::::::::::::::::::::: */
-                        
-                        //Set the Handlers External Configuration Paths
-                        if( configStruct["HandlersExternalLocation"] neq "" ){
-                                //Expand the external location to get a registration path
-                                configStruct["HandlersExternalLocationPath"] = ExpandPath("/" & replace(ConfigStruct["HandlersExternalLocation"],".","/","all"));
-                        }
-                        else{
-                                configStruct["HandlersExternalLocationPath"] = "";
-                        }
-                        
-                        //Set the Handlers,Models, & Custom Plugin Invocation & Physical Path for this Application
-                        if( ConfigStruct["AppMapping"] neq ""){
-                                
-                                //Parse out the first / to create invocation Path
-                                if ( left(ConfigStruct["AppMapping"],1) eq "/" ){
-                                        ConfigStruct["AppMapping"] = removeChars(ConfigStruct["AppMapping"],1,1);
-                                }
-                                
-                                //Set the Invocation Path
-                                ConfigStruct["HandlersInvocationPath"] = replace(ConfigStruct["AppMapping"],"/",".","all") & ".#fwSettingsStruct.handlersConvention#";
-                                ConfigStruct["MyPluginsInvocationPath"] = replace(ConfigStruct["AppMapping"],"/",".","all") & ".#fwSettingsStruct.pluginsConvention#";
-                                ConfigStruct["ModelsInvocationPath"] = replace(ConfigStruct["AppMapping"],"/",".","all") & ".#fwSettingsStruct.ModelsConvention#";
-                                
-                                //Set the Location Path
-                                ConfigStruct["HandlersPath"] = ConfigStruct["AppMapping"];
-                                ConfigStruct["MyPluginsPath"] = ConfigStruct["AppMapping"];
-                                ConfigStruct["ModelsPath"] = ConfigStruct["AppMapping"];
-                                
-                                //Set the physical path according to system.
-                                ConfigStruct["HandlersPath"] = "/" & ConfigStruct["HandlersPath"] & "/#fwSettingsStruct.handlersConvention#";
-                                ConfigStruct["MyPluginsPath"] = "/" & ConfigStruct["MyPluginsPath"] & "/#fwSettingsStruct.pluginsConvention#";
-                                ConfigStruct["ModelsPath"] = "/" & ConfigStruct["ModelsPath"] & "/#fwSettingsStruct.ModelsConvention#";
-                                
-                                //Set the Handlerspath expanded.
-                                ConfigStruct["HandlersPath"] = ExpandPath(ConfigStruct["HandlersPath"]);
-                                ConfigStruct["MyPluginsPath"] = ExpandPath(ConfigStruct["MyPluginsPath"]);
-                                ConfigStruct["ModelsPath"] = ExpandPath(ConfigStruct["ModelsPath"]);
-                                        
-                        }
-                        else{
-                                //Parse out the first / to create the invocation Path
-                                if ( left(ConfigStruct["AppMapping"],1) eq "/" ){
-                                        ConfigStruct["AppMapping"] = removeChars(ConfigStruct["AppMapping"],1,1);
-                                }
-                                
-                                /* Handler Registration */
-                                ConfigStruct["HandlersInvocationPath"] = "#fwSettingsStruct.handlersConvention#";
-                                ConfigStruct["HandlersPath"] = controller.getAppRootPath() & "#fwSettingsStruct.handlersConvention#";
-
-                                /* Custom Plugins Registration */
-                                ConfigStruct["MyPluginsInvocationPath"] = "#fwSettingsStruct.pluginsConvention#";
-                                ConfigStruct["MyPluginsPath"] = controller.getAppRootPath() & "#fwSettingsStruct.pluginsConvention#";
-                                
-                                /* Models Registration */
-                                ConfigStruct["ModelsInvocationPath"] = "#fwSettingsStruct.ModelsConvention#";
-                                ConfigStruct["ModelsPath"] = controller.getAppRootPath() & "#fwSettingsStruct.ModelsConvention#";
-                        }
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: EXTERNAL VIEWS LOCATION :::::::::::::::::::::::::::::::::::::::::::: */
-                        
-                        /* check for ViewsExternalLocation */
-                        if( structKeyExists(configStruct,"ViewsExternalLocation") and configStruct["ViewsExternalLocation"] neq "" ){
-                                /* Verify the locations, do relative to the app mapping first */
-                                if( directoryExists(controller.getAppRootPath() & configStruct["ViewsExternalLocation"]) ){
-                                        configStruct["ViewsExternalLocation"] = "/" & ConfigStruct["AppMapping"] & "/" & configStruct["ViewsExternalLocation"];
-                                }
-                                else if( not directoryExists(expandPath(configStruct["ViewsExternalLocation"])) ){
-                                        $throw("ViewsExternalLocation could not be found.","The directories tested was relative and expanded using #configStruct['ViewsExternalLocation']#. Please verify your setting.","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
-                                }
-                                /* Cleanup */
-                                if ( right(configStruct["ViewsExternalLocation"],1) eq "/" ){
-                                         configStruct["ViewsExternalLocation"] = left(configStruct["ViewsExternalLocation"],len(configStruct["ViewsExternalLocation"])-1);
-                                }
-                        }else{
-                                configStruct["ViewsExternalLocation"] = "";
-                        }
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: EXTERNAL LAYOUTS LOCATION :::::::::::::::::::::::::::::::::::::::::::: */
-                        
-                        /* check for LayoutsExternalLocation */
-                        if( structKeyExists(configStruct,"LayoutsExternalLocation") and configStruct["LayoutsExternalLocation"] neq "" ){
-                                /* Verify the locations, do relative to the app mapping first */
-                                if( directoryExists(controller.getAppRootPath() & configStruct["LayoutsExternalLocation"]) ){
-                                        configStruct["LayoutsExternalLocation"] = "/" & ConfigStruct["AppMapping"] & "/" & configStruct["LayoutsExternalLocation"];
-                                }
-                                else if( not directoryExists(expandPath(configStruct["LayoutsExternalLocation"])) ){
-                                        $throw("LayoutsExternalLocation could not be found.","The directories tested was relative and expanded using #configStruct['LayoutsExternalLocation']#. Please verify your setting.","XMLParser.ConfigXMLParsingException");
-                                }
-                                /* Cleanup */
-                                if ( right(configStruct["LayoutsExternalLocation"],1) eq "/" ){
-                                         configStruct["LayoutsExternalLocation"] = left(configStruct["LayoutsExternalLocation"],len(configStruct["LayoutsExternalLocation"])-1);
-                                }
-                        }else{
-                                configStruct["LayoutsExternalLocation"] = "";
-                        }
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: MAIL SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
-                        
+                </cfscript>
+        </cffunction>
+
+        <!--- parseYourSettings --->
+        <cffunction name="parseYourSettings" output="false" access="public" returntype="void" hint="Parse Your Settings">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        //Your Settings To Load
+                        var YourSettingNodes = XMLSearch(arguments.xml, "//YourSettings/Setting");
+                        var i=1;
+                        var tester = "";
+                        
+                        if ( ArrayLen(YourSettingNodes) ){
+                                //Insert Your Settings to Config Struct
+                                for (i=1; i lte ArrayLen(YourSettingNodes); i=i+1){
+                                        /* Get Setting with PlaceHolding */
+                                        tester = arguments.utility.placeHolderReplacer(trim(YourSettingNodes[i].XMLAttributes["value"]),ConfigStruct);
+                                        //Test for JSON
+                                        if( reFindNocase(instance.jsonRegex,tester) ){
+                                                ConfigStruct[YourSettingNodes[i].XMLAttributes["name"]] = getPlugin("JSON").decode(replace(tester,"'","""","all"));
+                                        }
+                                        else
+                                                ConfigStruct[YourSettingNodes[i].XMLAttributes["name"]] = tester;
+                                }
+                        }
+                </cfscript>
+        </cffunction>
+
+        <!--- parseLocalization --->
+        <cffunction name="parseMailSettings" output="false" access="public" returntype="void" hint="Parse Mail Settings">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfargument name="isOverride" type="boolean" required="false" default="false" hint="Flag to denote if overriding or first time runner."/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
                         //Mail Settings
-                        MailSettingsNodes = XMLSearch(configXML, instance.searchMailSettings);
+                        var MailSettingsNodes = XMLSearch(arguments.xml,"//MailServerSettings");
+                        
                         //Check if empty
                         if ( ArrayLen(MailSettingsNodes) gt 0 and ArrayLen(MailSettingsNodes[1].XMLChildren) gt 0){
-
                                 //Checks
                                 if ( structKeyExists(MailSettingsNodes[1], "MailServer") )
-                                        StructInsert(ConfigStruct, "MailServer", trim(MailSettingsNodes[1].MailServer.xmlText) );
+                                        ConfigStruct.MailServer = trim(MailSettingsNodes[1].MailServer.xmlText);
                                 else
-                                        StructInsert(ConfigStruct,"MailServer","");
+                                        ConfigStruct.MailServer = "";
 
                                 //Mail username
                                 if ( structKeyExists(MailSettingsNodes[1], "MailUsername") )
-                                        StructInsert(ConfigStruct, "MailUsername", trim(MailSettingsNodes[1].MailUsername.xmlText) );
+                                        ConfigStruct.MailUsername = trim(MailSettingsNodes[1].MailUsername.xmlText);
                                 else
-                                        StructInsert(ConfigStruct,"MailUsername","");
+                                        ConfigStruct.MailUsername = "";
 
                                 //Mail password
                                 if ( structKeyExists(MailSettingsNodes[1], "MailPassword") )
-                                        StructInsert(ConfigStruct, "MailPassword", trim(MailSettingsNodes[1].MailPassword.xmlText) );
+                                        ConfigStruct.MailPassword = trim(MailSettingsNodes[1].MailPassword.xmlText);
                                 else
-                                        StructInsert(ConfigStruct,"MailPassword","");
+                                        ConfigStruct.MailPassword = "";
 
                                 //Mail Port
                                 if ( structKeyExists(MailSettingsNodes[1], "MailPort") ){
                                         if (trim(MailSettingsNodes[1].MailPort.xmlText) neq "")
-                                                StructInsert(ConfigStruct, "MailPort", trim(MailSettingsNodes[1].MailPort.xmlText) );
+                                                ConfigStruct.MailPort = trim(MailSettingsNodes[1].MailPort.xmlText);
                                         else
-                                                StructInsert(ConfigStruct, "MailPort", 25 );
+                                                ConfigStruct.MailPort = 25;
                                 }
                                 else
-                                        StructInsert(ConfigStruct, "MailPort", 25 );
-                        }
-                        else{
-                                StructInsert(ConfigStruct,"MailServer","");
-                                StructInsert(ConfigStruct,"MailUsername","");
-                                StructInsert(ConfigStruct,"MailPassword","");
-                                StructInsert(ConfigStruct,"MailPort",25);
-                        }
-
-                        /* ::::::::::::::::::::::::::::::::::::::::: I18N SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
-                        
+                                        ConfigStruct.MailPort = 25;
+                        }
+                        else if (NOT arguments.isOverride){
+                                ConfigStruct.MailServer = "";
+                                ConfigStruct.MailUsername = "";
+                                ConfigStruct.MailPassword = "";
+                                ConfigStruct.MailPort = 25;
+                        }
+                </cfscript>
+        </cffunction>
+
+        <!--- parseLocalization --->
+        <cffunction name="parseLocalization" output="false" access="public" returntype="void" hint="Parse localization">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfargument name="isOverride" type="boolean" required="false" default="false" hint="Flag to denote if overriding or first time runner."/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
                         //i18N Settings
-                        i18NSettingNodes = XMLSearch(configXML, instance.searchi18NSettings);
+                        var i18NSettingNodes = XMLSearch(arguments.xml,"//i18N");
+                        var i=1;
+                        var DefaultLocale = "";
+                        
                         //Check if empty
                         if ( ArrayLen(i18NSettingNodes) gt 0 and ArrayLen(i18NSettingNodes[1].XMLChildren) gt 0){
                                 //Parse i18N Settings
                                 for (i=1; i lte ArrayLen(i18NSettingNodes[1].XMLChildren); i=i+1){
-                                        
                                         //Set the Resource Bundle if Using it.
                                         if ( i18NSettingNodes[1].XMLChildren[i].XMLName eq "DefaultResourceBundle" and len(trim(i18NSettingNodes[1].XMLChildren[i].XMLText)) neq 0 ){
@@ -696 +717 @@
                                         }
                                         //Insert to structure.
-                                        StructInsert(ConfigStruct, trim(i18NSettingNodes[1].XMLChildren[i].XMLName),trim(i18NSettingNodes[1].XMLChildren[i].XMLText));
+                                        ConfigStruct[trim(i18NSettingNodes[1].XMLChildren[i].XMLName)] = trim(i18NSettingNodes[1].XMLChildren[i].XMLText);
                                 }
                                 
                                 //set i18n
-                                StructInsert(ConfigStruct,"using_i18N",true);
-                                
-                                /* Empty Checks */
+                                ConfigStruct["using_i18N"] = true;
+                                
+                                // Empty Checks
                                 if ( not structKeyExists(ConfigStruct, "DefaultResourceBundle") ){
-                                        StructInsert(ConfigStruct,"DefaultResourceBundle","");
+                                        ConfigStruc.DefaultResourceBundle = "";
                                 }
                                 if ( not structKeyExists(ConfigStruct, "UknownTranslation") ){
-                                        StructInsert(ConfigStruct,"UknownTranslation","");
-                                }
-                        }
-                        else{
-                                StructInsert(ConfigStruct,"DefaultResourceBundle","");
-                                StructInsert(ConfigStruct,"DefaultLocale","");
-                                StructInsert(ConfigStruct,"LocaleStorage","");
-                                StructInsert(ConfigStruct,"UknownTranslation","");
-                                StructInsert(ConfigStruct,"using_i18N",false);
-                        }
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: BUG MAIL SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
-                        
-                        //Bug Tracer Reports
-                        BugEmailNodes = XMLSearch(configXML, instance.searchBugTracer);
-                        for (i=1; i lte ArrayLen(BugEmailNodes); i=i+1){
-                                BugEmails = BugEmails & trim(BugEmailNodes[i].XMLText);
-                                if ( i neq ArrayLen(BugEmailNodes) )
-                                        BugEmails = BugEmails & ",";
-                        }
-                        //Insert Into Config
-                        StructInsert(ConfigStruct, "BugEmails", BugEmails);
-
-                        /* ::::::::::::::::::::::::::::::::::::::::: ENVIRONMENT SETTING :::::::::::::::::::::::::::::::::::::::::::: */
-                        
-                        StructInsert(ConfigStruct,"Environment","PRODUCTION");
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: WS SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                                        ConfigStruct.UknownTranslation = "";
+                                }
+                        }
+                        else if (NOT arguments.isOverride){
+                                ConfigStruct.DefaultResourceBundle = "";
+                                ConfigStruct.DefaultLocale = "";
+                                ConfigStruct.LocaleStorage = "";
+                                ConfigStruct.UknownTranslation = "";
+                                ConfigStruct["using_i18N"] = false;
+                        }
+                </cfscript>
+        </cffunction>
+
+        <!--- parseBugTracers --->
+        <cffunction name="parseBugTracers" output="false" access="public" returntype="void" hint="Parse bug emails">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfargument name="isOverride" type="boolean" required="false" default="false" hint="Flag to denote if overriding or first time runner."/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        var BugEmailNodes = XMLSearch(arguments.xml,"//BugTracerReports/BugEmail");
+                        var i=1;
+                        var BugEmails = "";
+                        
+                        if( arrayLen(BugEmailNodes) ){
+                                for (i=1; i lte ArrayLen(BugEmailNodes); i=i+1){
+                                        BugEmails = BugEmails & trim(BugEmailNodes[i].XMLText);
+                                        if ( i neq ArrayLen(BugEmailNodes) )
+                                                BugEmails = BugEmails & ",";
+                                }
+                                //Insert Into Config
+                                ConfigStruct.BugEmails = BugEmails;
+                        }
+                        else if( NOT arguments.isOverride ){
+                                ConfigStruct.BugEmails = "";
+                        }
+                </cfscript>
+        </cffunction>
+
+        <!--- parseWebservices --->
+        <cffunction name="parseWebservices" output="false" access="public" returntype="void" hint="Parse webservices">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfargument name="isOverride" type="boolean" required="false" default="false" hint="Flag to denote if overriding or first time runner."/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        var WebServiceNodes = "";
+                        var i=1;
                         
                         //Get Web Services From Config.
-                        WebServiceNodes = XMLSearch(configXML, instance.searchWS);
+                        WebServiceNodes = XMLSearch(arguments.xml,"//WebServices/WebService");
                         if ( ArrayLen(WebServiceNodes) ){
-                                //New Web Service Array
+                                // Init webservices holder structure
+                                configStruct.webservices = structnew();
                                 for (i=1; i lte ArrayLen(WebServiceNodes); i=i+1){
-                                        if ( not StructKeyExists(ProWS, trim(WebServiceNodes[i].XMLAttributes["name"])) ){
-                                                //Production Web Services
-                                                StructInsert(ProWS, WebServiceNodes[i].XMLAttributes["name"], Trim(WebServiceNodes[i].XMLAttributes["URL"]));
-                                                //Check for Dev URL and the ws name is not in the DevWS struct and DevURL is not empty
-                                                if ( StructKeyExists(WebServiceNodes[i].XMLAttributes, "DevURL") and
-                                                         not StructKeyExists(DevWS, Trim(WebServiceNodes[i].XMLAttributes["name"])) and
-                                                         WebServiceNodes[i].XMLAttributes["DevURL"] neq "")
-                                                        StructInsert(DevWS, WebServiceNodes[i].XMLAttributes["name"], Trim(WebServiceNodes[i].XMLAttributes["DevURL"]));
-                                                else
-                                                        StructInsert(DevWS, WebServiceNodes[i].XMLAttributes["name"], Trim(WebServiceNodes[i].XMLAttributes["URL"]));
-                                        } //end ProWS Key Exists
-                                } //end for WebService Nodes
-                                StructInsert(WebServicesStruct,"DEV",DevWS);
-                                StructInsert(WebServicesStruct,"PRO",ProWS);
-                        }// end ArrayLen( WebServiceNodes)
-                        StructInsert(ConfigStruct,"WebServices",WebServicesStruct);
-
-                        /* ::::::::::::::::::::::::::::::::::::::::: DATASOURCES SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                                        configStruct.webservices[WebServiceNodes[i].XMLAttributes["name"]] = trim(WebServiceNodes[i].XMLAttributes["URL"]);
+                                }                               
+                        }
+                        else if( NOT arguments.isOverride ){
+                                configStruct.webservices = structnew();
+                        }
+                </cfscript>
+        </cffunction>
+
+        <!--- parseDatasources --->
+        <cffunction name="parseDatasources" output="false" access="public" returntype="void" hint="Parse Datsources">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfargument name="isOverride" type="boolean" required="false" default="false" hint="Flag to denote if overriding or first time runner."/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        var DatasourcesNodes = "";
+                        var i=1;
+                        var DSNStruct = "";
                         
                         //Datasources Support
-                        DatasourcesNodes = XMLSearch(configXML, instance.searchDatasources);
+                        DatasourcesNodes = XMLSearch(arguments.xml,"//Datasources/Datasource");
                         if ( ArrayLen(DatasourcesNodes) ){
                                 //Create Structures
+                                ConfigStruct.Datasources = structnew();
                                 for(i=1;i lte ArrayLen(DatasourcesNodes); i=i+1){
                                         DSNStruct = structNew();
 
-                                        //Required Entries
                                         if ( not structKeyExists(DatasourcesNodes[i].XMLAttributes, "Alias") or len(Trim(DatasourcesNodes[i].XMLAttributes["Alias"])) eq 0 )
-                                                $throw("This datasource entry's alias cannot be blank","","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
+                                                $throw("This datasource entry's alias cannot be blank","","XMLParser.ConfigXMLParsingException");
                                         else
-                                                StructInsert(DSNStruct,"Alias", Trim(DatasourcesNodes[i].XMLAttributes["Alias"]));
+                                                DSNStruct.Alias = Trim(DatasourcesNodes[i].XMLAttributes["Alias"]);
+                                        
                                         if ( not structKeyExists(DatasourcesNodes[i].XMLAttributes, "Name") or len(Trim(DatasourcesNodes[i].XMLAttributes["Name"])) eq 0 )
-                                                $throw("This datasource entry's name cannot be blank","","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
+                                                $throw("This datasource entry's name cannot be blank","","XMLParser.ConfigXMLParsingException");
                                         else
-                                                StructInsert(DSNStruct,"Name", Trim(DatasourcesNodes[i].XMLAttributes["Name"]));
+                                                DSNStruct.Name = Trim(DatasourcesNodes[i].XMLAttributes["Name"]);
 
                                         //Optional Entries.
                                         if ( structKeyExists(DatasourcesNodes[i].XMLAttributes, "dbtype") )
-                                                StructInsert(DSNStruct,"DBType", Trim(DatasourcesNodes[i].XMLAttributes["dbtype"]));
+                                                DSNStruct.DBType = Trim(DatasourcesNodes[i].XMLAttributes["dbtype"]);
                                         else
-                                                StructInsert(DSNStruct,"DBType","");
+                                                DSNStruct.DBType = "";
+                                                
                                         if ( structKeyExists(DatasourcesNodes[i].XMLAttributes, "Username") )
-                                                StructInsert(DSNStruct,"Username", Trim(DatasourcesNodes[i].XMLAttributes["username"]));
+                                                DSNStruct.Username = Trim(DatasourcesNodes[i].XMLAttributes["username"]);
                                         else
-                                                StructInsert(DSNStruct,"Username","");
+                                                DSNStruct.Username = "";
+                                                
                                         if ( structKeyExists(DatasourcesNodes[i].XMLAttributes, "password") )
-                                                StructInsert(DSNStruct,"Password", Trim(DatasourcesNodes[i].XMLAttributes["password"]));
+                                                DSNStruct.Password = Trim(DatasourcesNodes[i].XMLAttributes["password"]);
                                         else
-                                                StructInsert(DSNStruct,"Password","");
-
-                                        //Insert to structure
-                                        if ( not structKeyExists(DatasourcesStruct,DSNStruct.Alias) )
-                                                StructInsert(DatasourcesStruct, DSNStruct.Alias , DSNStruct);
-                                        else
-                                                $throw("The datasource alias: #dsnStruct.Alias# has already been declared.","","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
-                                }
-                        }
-                        StructInsert(ConfigStruct, "Datasources", DatasourcesStruct);
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: LAYOUT VIEW FOLDER SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
-                        
+                                                DSNStruct.Password  = "";
+
+                                        //Insert to structure with Alias as key
+                                        ConfigStruct.Datasources[DSNStruct.Alias] = DSNStruct;
+                                }
+                        }
+                        else if( NOT arguments.isOverride ){
+                                ConfigStruct.Datasources = structnew();
+                        }                               
+                </cfscript>
+        </cffunction>
+
+        <!--- parseLayoutsViews --->
+        <cffunction name="parseLayoutsViews" output="false" access="public" returntype="void" hint="Parse Layouts And Views">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        var DefaultLayout = "";
+                        var DefaultView = "";
+                        var LayoutNodes = "";
+                        var Layout = "";
+                        var i=1;
+                        var j=1;
+                        var Collections = createObject("java", "java.util.Collections"); 
+                        var     LayoutViewStruct = Collections.synchronizedMap(CreateObject("java","java.util.LinkedHashMap").init());
+                        var     LayoutFolderStruct = Collections.synchronizedMap(CreateObject("java","java.util.LinkedHashMap").init());
+                
                         //Layout into Config
-                        DefaultLayout = XMLSearch(configXML,instance.searchDefaultLayout);
+                        DefaultLayout = XMLSearch(arguments.xml,"//Layouts/DefaultLayout");
                         //validate Default Layout.
                         if ( ArrayLen(DefaultLayout) eq 0 )
-                                $throw("There was no default layout element found.","","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
+                                $throw("There was no default layout element found.","","XMLParser.ConfigXMLParsingException");
                         if ( ArrayLen(DefaultLayout) gt 1 )
-                                $throw("There were more than 1 DefaultLayout elements found. There can only be one.","","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
+                                $throw("There were more than 1 DefaultLayout elements found. There can only be one.","","XMLParser.ConfigXMLParsingException");
                         //Insert Default Layout
-                        StructInsert(ConfigStruct,"DefaultLayout",Trim(DefaultLayout[1].XMLText));
+                        ConfigStruct.DefaultLayout = Trim(DefaultLayout[1].XMLText);
                         
                         //Default View into Config
-                        DefaultView = XMLSearch(configXML,instance.searchDefaultView);
+                        DefaultView = XMLSearch(arguments.xml,"//Layouts/DefaultView");
                         //validate Default Layout.
                         if ( ArrayLen(DefaultView) eq 0 ){
@@ -819 +884 @@
                         }
                         else if ( ArrayLen(DefaultView) gt 1 ){
-                                $throw("There were more than 1 DefaultView elements found. There can only be one.","","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
+                                $throw("There were more than 1 DefaultView elements found. There can only be one.","","XMLParser.ConfigXMLParsingException");
                         }
                         else{
@@ -827 +892 @@
                         
                         //Get View Layouts
-                        LayoutNodes = XMLSearch(configXML, instance.searchLayouts);
+                        LayoutNodes = XMLSearch(arguments.xml,"//Layouts/Layout");
                         for (i=1; i lte ArrayLen(LayoutNodes); i=i+1){
                                 //Get Layout for the views
                                 Layout = Trim(LayoutNodes[i].XMLAttributes["file"]);
                                 for(j=1; j lte ArrayLen(LayoutNodes[i].XMLChildren); j=j+1){
-                                        
                                         //Check for View
                                         if( LayoutNodes[i].XMLChildren[j].XMLName eq "View" ){
                                                 //Check for Key, if it doesn't exist then create
                                                 if ( not StructKeyExists(LayoutViewStruct, lcase(Trim(LayoutNodes[i].XMLChildren[j].XMLText))) )
-                                                        StructInsert(LayoutViewStruct, lcase(Trim(LayoutNodes[i].XMLChildren[j].XMLText)), Layout);
+                                                        LayoutViewStruct[lcase(Trim(LayoutNodes[i].XMLChildren[j].XMLText))] = Layout;
                                         }
                                         //Check for Folder
@@ -843 +907 @@
                                                 //Check for Key, if it doesn't exist then create
                                                 if ( not StructKeyExists(LayoutFolderStruct, lcase(Trim(LayoutNodes[i].XMLChildren[j].XMLText))) )
-                                                        StructInsert(LayoutFolderStruct, lcase(Trim(LayoutNodes[i].XMLChildren[j].XMLText)), Layout);
+                                                        LayoutFolderStruct[lcase(Trim(LayoutNodes[i].XMLChildren[j].XMLText))] = Layout;
                                         }
                                         
                                 }//end for loop for the layout children
                         }//end for loop of all layout nodes
-                        StructInsert(ConfigStruct,"ViewLayouts",LayoutViewStruct);
-                        StructInsert(ConfigStruct,"FolderLayouts",LayoutFolderStruct);
-                        
-                        /* :::::::::::::::::::::::::::::::::::::::::  OVERRIDE SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
+                        
+                        ConfigStruct.ViewLayouts = LayoutViewStruct;
+                        ConfigStruct.FolderLayouts = LayoutFolderStruct;
+                </cfscript>
+        </cffunction>
+
+        <!--- parseCacheSettings --->
+        <cffunction name="parseCacheSettings" output="false" access="public" returntype="void" hint="Parse Cache Settings">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        var CacheSettingNodes  = "";
+                        var fwSettingsStruct = controller.getColdboxSettings();
                         
                         //Cache Override Settings
-                        CacheSettingNodes = XMLSearch(configXML, instance.searchCache);
-                        //Create CacheSettings Structure
-                        structInsert(ConfigStruct,"CacheSettings",structNew());
+                        CacheSettingNodes = XMLSearch(arguments.xml,"//Cache");
+                        ConfigStruct.CacheSettings = structnew();
+                        
                         //Check if empty
                         if ( ArrayLen(CacheSettingNodes) gt 0 and ArrayLen(CacheSettingNodes[1].XMLChildren) gt 0){
-
                                 //Checks For Default Timeout
                                 if ( structKeyExists(CacheSettingNodes[1], "ObjectDefaultTimeout") and isNumeric(CacheSettingNodes[1].ObjectDefaultTimeout.xmlText) )
-                                        StructInsert(ConfigStruct.CacheSettings, "ObjectDefaultTimeout", trim(CacheSettingNodes[1].ObjectDefaultTimeout.xmlText) );
+                                        ConfigStruct.CacheSettings.ObjectDefaultTimeout = trim(CacheSettingNodes[1].ObjectDefaultTimeout.xmlText);
                                 else
-                                        $throw("Invalid object timeout. Please see schema.","Value=#CacheSettingNodes[1].ObjectDefaultTimeout.xmlText#","ColdBox.plugins.XMLParser.InvalidCacheObjectDefaultTimeout");
+                                        $throw("Invalid object timeout. Please see schema.","Value=#CacheSettingNodes[1].ObjectDefaultTimeout.xmlText#","XMLParser.InvalidCacheObjectDefaultTimeout");
 
                                 //Check ObjectDefaultLastAccessTimeout
                                 if ( structKeyExists(CacheSettingNodes[1], "ObjectDefaultLastAccessTimeout") and isNumeric(CacheSettingNodes[1].ObjectDefaultLastAccessTimeout.xmlText))
-                                        StructInsert(ConfigStruct.CacheSettings, "ObjectDefaultLastAccessTimeout", trim(CacheSettingNodes[1].ObjectDefaultLastAccessTimeout.xmlText) );
+                                        ConfigStruct.CacheSettings.ObjectDefaultLastAccessTimeout = trim(CacheSettingNodes[1].ObjectDefaultLastAccessTimeout.xmlText);
                                 else
-                                        $throw("Invalid object last access timeout. Please see schema.","Value=#CacheSettingNodes[1].ObjectDefaultLastAccessTimeout.xmlText#","ColdBox.plugins.XMLParser.InvalidObjectDefaultLastAccessTimeout");
+                                        $throw("Invalid object last access timeout. Please see schema.","Value=#CacheSettingNodes[1].ObjectDefaultLastAccessTimeout.xmlText#","XMLParser.InvalidObjectDefaultLastAccessTimeout");
 
                                 //Check ReapFrequency
                                 if ( structKeyExists(CacheSettingNodes[1], "ReapFrequency") and isNumeric(CacheSettingNodes[1].ReapFrequency.xmlText))
-                                        StructInsert(ConfigStruct.CacheSettings, "ReapFrequency", trim(CacheSettingNodes[1].ReapFrequency.xmlText) );
+                                        ConfigStruct.CacheSettings.ReapFrequency = trim(CacheSettingNodes[1].ReapFrequency.xmlText);
                                 else
-                                        $throw("Invalid reaping frequency. Please see schema.","Value=#CacheSettingNodes[1].ReapFrequency.xmlText#","ColdBox.plugins.XMLParser.InvalidReapFrequency");
+                                        $throw("Invalid reaping frequency. Please see schema.","Value=#CacheSettingNodes[1].ReapFrequency.xmlText#","XMLParser.InvalidReapFrequency");
 
                                 //Check MaxObjects
                                 if ( structKeyExists(CacheSettingNodes[1], "MaxObjects") and isNumeric(CacheSettingNodes[1].MaxObjects.xmlText)){
-                                        StructInsert(ConfigStruct.CacheSettings, "MaxObjects", trim(CacheSettingNodes[1].MaxObjects.xmlText) );
+                                        ConfigStruct.CacheSettings.MaxObjects = trim(CacheSettingNodes[1].MaxObjects.xmlText);
                                 }
                                 else
-                                        $throw("Invalid Max Objects. Please see schema.","Value=#CacheSettingNodes[1].MaxObjects.xmlText#","ColdBox.plugins.XMLParser.InvalidMaxObjects");
+                                        $throw("Invalid Max Objects. Please see schema.","Value=#CacheSettingNodes[1].MaxObjects.xmlText#","XMLParser.InvalidMaxObjects");
 
                                 //Check FreeMemoryPercentageThreshold
                                 if ( structKeyExists(CacheSettingNodes[1], "FreeMemoryPercentageThreshold") and isNumeric(CacheSettingNodes[1].FreeMemoryPercentageThreshold.xmlText)){
-                                        StructInsert(ConfigStruct.CacheSettings, "FreeMemoryPercentageThreshold", trim(CacheSettingNodes[1].FreeMemoryPercentageThreshold.xmlText) );
+                                        ConfigStruct.CacheSettings.FreeMemoryPercentageThreshold = trim(CacheSettingNodes[1].FreeMemoryPercentageThreshold.xmlText);
                                 }
                                 else
-                                        $throw("Invalid Free Memory Percentage Threshold. Please see schema.","Value=#CacheSettingNodes[1].FreeMemoryPercentageThreshold.xmlText#","ColdBox.plugins.XMLParser.InvalidFreeMemoryPercentageThreshold");
+                                        $throw("Invalid Free Memory Percentage Threshold. Please see schema.","Value=#CacheSettingNodes[1].FreeMemoryPercentageThreshold.xmlText#","XMLParser.InvalidFreeMemoryPercentageThreshold");
 
                                 //Check for CacheUseLastAccessTimeouts
                                 if ( structKeyExists(CacheSettingNodes[1], "UseLastAccessTimeouts") and isBoolean(CacheSettingNodes[1].UseLastAccessTimeouts.xmlText) ){
-                                        StructInsert(ConfigStruct.CacheSettings, "UseLastAccessTimeouts", trim(CacheSettingNodes[1].UseLastAccessTimeouts.xmlText) );
+                                        ConfigStruct.CacheSettings.UseLastAccessTimeouts = trim(CacheSettingNodes[1].UseLastAccessTimeouts.xmlText);
                                 }
                                 else{
-                                        StructInsert(ConfigStruct.CacheSettings, "UseLastAccessTimeouts", fwSettingsStruct.CacheUseLastAccessTimeouts );
+                                        ConfigStruct.CacheSettings.UseLastAccessTimeouts = fwSettingsStruct.CacheUseLastAccessTimeouts;
                                 }       
                                 
                                 //Check for CacheEvictionPolicy
                                 if ( structKeyExists(CacheSettingNodes[1], "EvictionPolicy") ){
-                                        StructInsert(ConfigStruct.CacheSettings, "EvictionPolicy", trim(CacheSettingNodes[1].EvictionPolicy.xmlText) );
+                                        ConfigStruct.CacheSettings.EvictionPolicy = trim(CacheSettingNodes[1].EvictionPolicy.xmlText);
                                 }
                                 else{
-                                        StructInsert(ConfigStruct.CacheSettings, "EvictionPolicy", fwSettingsStruct.CacheEvictionPolicy );
+                                        ConfigStruct.CacheSettings.EvictionPolicy = fwSettingsStruct.CacheEvictionPolicy;
                                 }                       
                                 //Set Override to true.
@@ -913 +987 @@
                                 ConfigStruct.CacheSettings.Override = false;
                         }
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: DEBUGGER SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
-                        
-                        /* DEBUGGER SETTING NODES */
-                        DebuggerSettingNodes = XMLSearch(configXML, instance.searchDebuggerSettings);
-                        //Create debugger settings Structure
-                        structInsert(ConfigStruct,"DebuggerSettings",structNew());
+                </cfscript>
+        </cffunction>   
+
+        <!--- parseDebuggerSettings --->
+        <cffunction name="parseDebuggerSettings" output="false" access="public" returntype="void" hint="Parse Debugger Settings">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfargument name="isOverride" type="boolean" required="false" default="false" hint="Flag to denote if overriding or first time runner."/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        var DebuggerSettingNodes = "";
+                        
+                        DebuggerSettingNodes = XMLSearch(arguments.xml,"//DebuggerSettings");
+                        
                         //Check if empty
-                        if ( ArrayLen(DebuggerSettingNodes) gt 0 and ArrayLen(DebuggerSettingNodes[1].XMLChildren) gt 0){
-                                /* PersistentRequestProfiler */
-                                if ( structKeyExists(DebuggerSettingNodes[1], "PersistentRequestProfiler") and isBoolean(DebuggerSettingNodes[1].PersistentRequestProfiler.xmlText) )
-                                        StructInsert(ConfigStruct.DebuggerSettings, "PersistentRequestProfiler", trim(DebuggerSettingNodes[1].PersistentRequestProfiler.xmlText) );
-                                /* maxPersistentRequestProfilers */
-                                if ( structKeyExists(DebuggerSettingNodes[1], "maxPersistentRequestProfilers") and isNumeric(DebuggerSettingNodes[1].maxPersistentRequestProfilers.xmlText) )
-                                        StructInsert(ConfigStruct.DebuggerSettings, "maxPersistentRequestProfilers", trim(DebuggerSettingNodes[1].maxPersistentRequestProfilers.xmlText) );
-                                /* maxRCPanelQueryRows */
-                                if ( structKeyExists(DebuggerSettingNodes[1], "maxRCPanelQueryRows") and isNumeric(DebuggerSettingNodes[1].maxRCPanelQueryRows.xmlText) )
-                                        StructInsert(ConfigStruct.DebuggerSettings, "maxRCPanelQueryRows", trim(DebuggerSettingNodes[1].maxRCPanelQueryRows.xmlText) );
-                                
-                                /* TracerPanel */
+                        if ( ArrayLen(DebuggerSettingNodes) ){
+                                // PersistentRequestProfiler
+                                if ( structKeyExists(DebuggerSettingNodes[1], "PersistentRequestProfiler") and isBoolean(DebuggerSettingNodes[1].PersistentRequestProfiler.xmlText) ){
+                                        ConfigStruct.DebuggerSettings.PersistentRequestProfiler = trim(DebuggerSettingNodes[1].PersistentRequestProfiler.xmlText);
+                                }
+                                // maxPersistentRequestProfilers
+                                if ( structKeyExists(DebuggerSettingNodes[1], "maxPersistentRequestProfilers") and isNumeric(DebuggerSettingNodes[1].maxPersistentRequestProfilers.xmlText) ){
+                                        ConfigStruct.DebuggerSettings.maxPersistentRequestProfilers = trim(DebuggerSettingNodes[1].maxPersistentRequestProfilers.xmlText);
+                                }
+                                // maxRCPanelQueryRows */
+                                if ( structKeyExists(DebuggerSettingNodes[1], "maxRCPanelQueryRows") and isNumeric(DebuggerSettingNodes[1].maxRCPanelQueryRows.xmlText) ){
+                                        ConfigStruct.DebuggerSettings.maxRCPanelQueryRows = trim(DebuggerSettingNodes[1].maxRCPanelQueryRows.xmlText);
+                                }
+                                // TracerPanel
                                 if ( structKeyExists(DebuggerSettingNodes[1], "TracerPanel") ){
                                         debugPanelAttributeInsert(ConfigStruct.DebuggerSettings,"TracerPanel",DebuggerSettingNodes[1].TracerPanel.xmlAttributes);
                                 }
-                                /* InfoPanel */
+                                // InfoPanel
                                 if ( structKeyExists(DebuggerSettingNodes[1], "InfoPanel") ){
                                         debugPanelAttributeInsert(ConfigStruct.DebuggerSettings,"InfoPanel",DebuggerSettingNodes[1].InfoPanel.xmlAttributes);
                                 }
-                                /* CachePanel */
+                                // CachePanel
                                 if ( structKeyExists(DebuggerSettingNodes[1], "CachePanel") ){
                                         debugPanelAttributeInsert(ConfigStruct.DebuggerSettings,"CachePanel",DebuggerSettingNodes[1].CachePanel.xmlAttributes);
                                 }
-                                /* RCPanel */
+                                // RCPanel
                                 if ( structKeyExists(DebuggerSettingNodes[1], "RCPanel") ){
                                         debugPanelAttributeInsert(ConfigStruct.DebuggerSettings,"RCPanel",DebuggerSettingNodes[1].RCPanel.xmlAttributes);
-                                }       
-                                
+                                }                                       
                                 //Set Override to true.
                                 ConfigStruct.DebuggerSettings.Override = true;                  
                         }
-                        else{
-                                ConfigStruct.DebuggerSettings.Override = false;
-                        }
-                                                
-                        /* ::::::::::::::::::::::::::::::::::::::::: INTERCEPTOR SETTINGS :::::::::::::::::::::::::::::::::::::::::::: */
-                        
-                        /* Interceptor Preparation. */
-                        StructInsert( ConfigStruct, "InterceptorConfig", structnew() );
-                        StructInsert( ConfigStruct.InterceptorConfig, "Interceptors", arraynew(1) );
-                        
-                        /* Start by throwOnInvalidStates */
-                        StructInsert( ConfigStruct.InterceptorConfig, "throwOnInvalidStates", true );
-                        //Search for the override
-                        InterceptorBase = XMLSearch(configXML,instance.searchInterceptorBase);
-                        if ( ArrayLen(InterceptorBase) neq 0 and structKeyExists(InterceptorBase[1].XMLAttributes, "throwOnInvalidStates") ){
-                                ConfigStruct.InterceptorConfig['throwOnInvalidStates'] = InterceptorBase[1].XMLAttributes.throwOnInvalidStates;
-                        }
-                        
-                                
-                        /* Start by Custom Interception Point */
-                        CustomInterceptionPoints = XMLSearch(configXML,instance.searchInterceptorCustomPoints);
-                        //validate Custom Interception Point
-                        if ( ArrayLen(CustomInterceptionPoints) eq 0 )
-                                StructInsert(ConfigStruct.InterceptorConfig,"CustomInterceptionPoints","");
-                        else if ( ArrayLen(CustomInterceptionPoints) gt 1 )
-                                $throw("There were more than 1 CustomInterceptionPoints elements found. There can only be one.","","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
-                        else
-                                StructInsert(ConfigStruct.InterceptorConfig,"CustomInterceptionPoints",oUtilities.placeHolderReplacer(Trim(CustomInterceptionPoints[1].XMLText),ConfigStruct));
-                        
-                        /* Parse all Interceptor Nodes now. */
-                        InterceptorNodes = XMLSearch(configXML, instance.searchInterceptors);
-                        for (i=1; i lte ArrayLen(InterceptorNodes); i=i+1){
-                                //Interceptor Struct
-                                InterceptorStruct = structnew();
-                                //get Class
-                                InterceptorStruct.class = oUtilities.placeHolderReplacer(Trim(InterceptorNodes[i].XMLAttributes["class"]),ConfigStruct);
-                                //Prepare Properties
-                                InterceptorStruct.properties = structnew();
-                        
-                                //Parse Interceptor Properties
-                                if ( ArrayLen(InterceptorNodes[i].XMLChildren) ){
-                                        for(j=1; j lte ArrayLen(InterceptorNodes[i].XMLChildren); j=j+1){
-                                                //Property Complex Check
-                                                tempProperty = oUtilities.placeHolderReplacer(Trim( InterceptorNodes[i].XMLChildren[j].XMLText ),ConfigStruct);
-                                                //Check for Complex Setup
-                                                if( reFindNocase(instance.jsonRegex,tempProperty) ){
-                                                        StructInsert( InterceptorStruct.properties, Trim(InterceptorNodes[i].XMLChildren[j].XMLAttributes["name"]), getPlugin('JSON').decode(replace(tempProperty,"'","""","all")) );
-                                                }
-                                                else{
-                                                        StructInsert( InterceptorStruct.properties, Trim(InterceptorNodes[i].XMLChildren[j].XMLAttributes["name"]), tempProperty );
-                                                }
-                                        }//end loop of properties
-                                }//end if no properties
-                                
-                                //Add to Array
-                                ArrayAppend( ConfigStruct.InterceptorConfig.Interceptors, InterceptorStruct );
-                                
-                        }//end interceptor nodes
-                        
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: LOGBOX Configuration :::::::::::::::::::::::::::::::::::::::::::: */
-                        parseLogBox(configXML,configStruct,oUtilities);
-                        
-                        /* ::::::::::::::::::::::::::::::::::::::::: CONFIG FILE LAST MODIFIED SETTING :::::::::::::::::::::::::::::::::::::::::::: */
-                        StructInsert(ConfigStruct, "ConfigTimeStamp", oUtilities.FileLastModified(ConfigFileLocation));
-                        /* ::::::::::::::::::::::::::::::::::::::::: XSD VALIDATION :::::::::::::::::::::::::::::::::::::::::::: */
-                                                
-                        //Determine which CF version for XML Parsing method
-                        if ( fwSettingsStruct["xmlValidateActive"] ){
-                                //Finally Validate With XSD
-                                xmlvalidation = XMLValidate(configXML, getController().getSetting("ConfigFileSchemaLocation", true));
-                                //Validate Errors
-                                if(NOT xmlvalidation.status){
-                                        for(i = 1; i lte ArrayLen(xmlvalidation.errors); i = i + 1){
-                                                errorDetails = errorDetails & xmlvalidation.errors[i] & chr(10) & chr(13);
-                                        }
-                                        //Throw the error.
-                                        $throw("<br>The config.xml file does not validate with the framework's schema.","The error details are:<br/> #errorDetails#","ColdBox.plugins.XMLParser.ConfigXMLParsingException");
-                                }// if invalid status
-                        }//if xml validation is on
-                        
-                }//end of try
-                catch( Any Exception ){
-                        $throw("#Exception.Message# & #Exception.Detail#",Exception.tagContext.toString(), "ColdBox.plugins.XMLParser.ConfigXMLParsingException");
-                }
-                
-                //finish
-                return ConfigStruct;
-                </cfscript>
-        </cffunction>
-
-<!------------------------------------------- PRIVATE ------------------------------------------->
-                        
+                        else if (NOT arguments.isOverride){
+                                ConfigStruct.DebuggerSettings = structnew();
+                                ConfigStruct.DebuggerSettings.Override = false;                 
+                        }
+                </cfscript>
+        </cffunction>           
+        
+        <!--- parseInterceptors --->
+        <cffunction name="parseInterceptors" output="false" access="public" returntype="void" hint="Parse Interceptors">
+                <cfargument name="xml"          type="any" required="true" hint="The xml object"/>
+                <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
+                <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfargument name="isOverride" type="boolean" required="false" default="false" hint="Flag to denote if overriding or first time runner."/>
+                <cfscript>
+                        var ConfigStruct = arguments.config;
+                        var InterceptorBase = "";
+                        var CustomInterceptionPoints = "";
+                        var InterceptorNodes = "";
+                        var i=1;
+                        var j=1;
+                        var InterceptorStruct = "";
+                        var tempProperty = "";
+                        
+                        //Search for Interceptors
+                        InterceptorBase = XMLSearch(arguments.xml,"//Interceptors");
+                        if( arrayLen(InterceptorBase) ){
+                                // Interceptor Preparation.
+                                ConfigStruct.InterceptorConfig = structnew();
+                                ConfigStruct.InterceptorConfig.Interceptors = arrayNew(1);
+                                ConfigStruct.InterceptorConfig.throwOnInvalidStates = true;
+                                ConfigStruct.InterceptorConfig.CustomInterceptionPoints = "";
+                                
+                                // Invalid States
+                                if ( structKeyExists(InterceptorBase[1].XMLAttributes, "throwOnInvalidStates") ){
+                                        ConfigStruct.InterceptorConfig['throwOnInvalidStates'] = InterceptorBase[1].XMLAttributes.throwOnInvalidStates;
+                                }
+                                
+                                // Custom Interception Points
+                                CustomInterceptionPoints = XMLSearch(arguments.xml,"//Interceptors/CustomInterceptionPoints");
+                                if ( ArrayLen(CustomInterceptionPoints) gt 1 ){
+                                        $throw("There were more than 1 CustomInterceptionPoints elements found. There can only be one.","","XMLParser.ConfigXMLParsingException");
+                                }
+                                else if( arraylen(CustomInterceptionPoints) ){
+                                        ConfigStruct.InterceptorConfig.CustomInterceptionPoints = arguments.utility.placeHolderReplacer(Trim(CustomInterceptionPoints[1].XMLText),ConfigStruct);
+                                }
+                                
+                                //Parse all Interceptor Nodes now.
+                                InterceptorNodes = XMLSearch(arguments.xml,"//Interceptors/Interceptor");
+                                for (i=1; i lte ArrayLen(InterceptorNodes); i=i+1){
+                                        //Interceptor Struct
+                                        InterceptorStruct = structnew();
+                                        //get Class
+                                        InterceptorStruct.class = arguments.utility.placeHolderReplacer(Trim(InterceptorNodes[i].XMLAttributes["class"]),ConfigStruct);
+                                        //Prepare Properties
+                                        InterceptorStruct.properties = structnew();
+                                        //Parse Interceptor Properties
+                                        if ( ArrayLen(InterceptorNodes[i].XMLChildren) ){
+                                                for(j=1; j lte ArrayLen(InterceptorNodes[i].XMLChildren); j=j+1){
+                                                        //Property Complex Check
+                                                        tempProperty = arguments.utility.placeHolderReplacer(Trim( InterceptorNodes[i].XMLChildren[j].XMLText ),ConfigStruct);
+                                                        //Check for Complex Setup
+                                                        if( reFindNocase(instance.jsonRegex,tempProperty) ){
+                                                                StructInsert( InterceptorStruct.properties, Trim(InterceptorNodes[i].XMLChildren[j].XMLAttributes["name"]), getPlugin('JSON').decode(replace(tempProperty,"'","""","all")) );
+                                                        }
+                                                        else{
+                                                                StructInsert( InterceptorStruct.properties, Trim(InterceptorNodes[i].XMLChildren[j].XMLAttributes["name"]), tempProperty );
+                                                        }
+                                                }//end loop of properties
+                                        }//end if no properties                                 
+                                        //Add to Array
+                                        ArrayAppend( ConfigStruct.InterceptorConfig.Interceptors, InterceptorStruct );
+                                }//end interceptor nodes
+                                
+                        }// end if interceptors found
+                        else if (NOT arguments.isOverride){
+                                // Interceptor Defaults.
+                                ConfigStruct.InterceptorConfig = structnew();
+                                ConfigStruct.InterceptorConfig.Interceptors = arrayNew(1);
+                                ConfigStruct.InterceptorConfig.throwOnInvalidStates = true;
+                                ConfigStruct.InterceptorConfig.CustomInterceptionPoints = "";                           
+                        }
+                </cfscript>
+        </cffunction>
+        
         <!--- parseLogBox --->
         <cffunction name="parseLogBox" output="false" access="public" returntype="void" hint="Parse LogBox">
@@ -1050 +1124 @@
                 <cfargument name="config"       type="struct" required="true" hint="The config struct"/>
                 <cfargument name="utility"  type="any" required="true" hint="The utility object"/>
+                <cfargument name="isOverride" type="boolean" required="false" default="false" hint="Flag to denote if overriding or first time runner."/>
                 <cfscript>
                         var logboxXML = xmlSearch(arguments.xml,"//LogBox");
@@ -1057 +1132 @@
                         
                         if( arrayLen(logboxXML) ){
-                                // Get config object
+                                // Get config object From controller's logbox
                                 logBoxConfig = controller.getLogBox().getConfig();
-                                // Reset it
+                                // Reset the configuration
                                 logBoxConfig.reset();
                                 // Parse and load new configuration data
@@ -1079 +1154 @@
                                 arguments.config["LogBoxConfig"] = memento;
                         }
-                        else{
+                        else if( NOT arguments.isOverride){
                                 arguments.config["LogBoxConfig"] = structnew();
                         }
@@ -1085 +1160 @@
         </cffunction>           
                                         
+<!------------------------------------------- PRIVATE ------------------------------------------>
+
         <!--- Debug Panel attribute insert --->
         <cffunction name="debugPanelAttributeInsert" access="private" returntype="void" hint="Insert a key into a panel attribute" output="false" >
@@ -1093 +1170 @@
                 <!--- ************************************************************* --->
                 <cfscript>
-                        /* Show Key */
+                        // Show Key
                         if( structKeyExists(arguments.panelXML,"show") ){
-                                StructInsert(arguments.config, "show#arguments.Panel#", trim(arguments.panelXML.show) );
+                                arguments.config["show#arguments.Panel#"] = trim(arguments.panelXML.show);
                         }       
-                        /* Expanded Key */
+                        // Expanded Key
                         if( structKeyExists(arguments.panelXML,"expanded") ){
-                                StructInsert(arguments.config, "expanded#arguments.Panel#", trim(arguments.panelXML.expanded) );
+                                arguments.config["expanded#arguments.Panel#"] = trim(arguments.panelXML.expanded);
                         }               
                 </cfscript>

coldbox/trunk/system/services/DebuggerService.cfc

@@ -166 +166 @@
                 <cfset var RenderedDebugging = "">
                 <cfset var Event = controller.getRequestService().getContext()>
+                <cfset var rc = event.getCollection()>
 
                 <!--- Set local Variables --->
@@ -195 +196 @@
         <cffunction name="renderCachePanel" access="public" hint="Renders the caching panel." output="false" returntype="Any">
                 <cfset var event = controller.getRequestService().getContext()>
+                <cfset var rc = event.getCollection()>
                 <cfset var RenderedDebugging = "">
 
@@ -223 +225 @@
         <cffunction name="renderCacheDumper" access="public" hint="Renders the caching key value dumper." output="false" returntype="Any">
                 <cfset var event = controller.getRequestService().getContext()>
+                <cfset var rc = event.getCollection()>
                 <cfset var cachekey = URLDecode(event.getValue('key',''))>
                 <cfset var cacheValue = controller.getColdboxOCM().get(cachekey)>